github-migration/rack-livereload
1
0
Fork 0
Code Issues 11 Pull Requests 4 Packages Projects Releases Wiki Activity

Fixed ignore to work with full URI #68

Open
skyeagle wants to merge 1 commits from unknown repository into master
pull from: unknown repository
merge into: github-migration:master
Conversation 0 Commits 1 Files Changed 2 +9 -9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/rack/livereload/processing_skip_analyzer.rb
View File

@ -28,8 +28,9 @@ module Rack
end end
def ignored? def ignored?
path = @env['QUERY_STRING'].empty? ? @env['PATH_INFO'] : "#{@env['PATH_INFO']}?#{@env['QUERY_STRING']}" @options[:ignore] and @options[:ignore].any? do |filter|
@options[:ignore] and @options[:ignore].any? { |filter| path[filter] } @env['REQUEST_URI'][filter]
end
end end
def bad_browser? def bad_browser?

13
spec/rack/livereload/processing_skip_analyzer_spec.rb
View File

@ -22,13 +22,13 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do
let(:options) { { :ignore => [ %r{file} ] } } let(:options) { { :ignore => [ %r{file} ] } }
context 'path contains ignore pattern' do context 'path contains ignore pattern' do
let(:env) { { 'PATH_INFO' => '/this/file', 'QUERY_STRING' => '' } } let(:env) { { 'REQUEST_URI' => '/this/file', 'QUERY_STRING' => '' } }
it { should be_ignored } it { should be_ignored }
end end
context 'root path' do context 'root path' do
let(:env) { { 'PATH_INFO' => '/', 'QUERY_STRING' => '' } } let(:env) { { 'REQUEST_URI' => '/', 'QUERY_STRING' => '' } }
it { should_not be_ignored } it { should_not be_ignored }
end end
@ -55,22 +55,21 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do
end end
describe '#ignored?' do describe '#ignored?' do
let(:path_info) { 'path info' } let(:request_uri) { 'request_path?query_string' }
let(:query_string) { 'query_string' } let(:env) { { 'REQUEST_URI' => request_uri } }
let(:env) { { 'PATH_INFO' => path_info, 'QUERY_STRING' => query_string } }
context 'no ignore set' do context 'no ignore set' do
it { should_not be_ignored } it { should_not be_ignored }
end end
context 'ignore set' do context 'ignore set' do
let(:options) { { :ignore => [ %r{#{path_info}} ] } } let(:options) { { :ignore => [ /request_path/ ] } }
it { should be_ignored } it { should be_ignored }
end end
context 'ignore set including query_string' do context 'ignore set including query_string' do
let(:options) { { :ignore => [ %r{#{path_info}\?#{query_string}} ] } } let(:options) { { :ignore => [ /query_string/ ] } }
it { should be_ignored } it { should be_ignored }
end end