rack-livereload 0.3.15 → 0.3.17

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 9d7123144df9a852f48e7d4874cd4e2fa0d23657ecf61de34d8606d2b3c1c62d
+  data.tar.gz: a3cad0cf894c0f73b49d0e158d03d46c4677bee5fe7cccb5b6b037aabf48980d
+SHA512:
+  metadata.gz: 1b13c7bebc5da0079b56885f66e81260673fa6a343581e383e9e5904bc3bd9af3c6058869d2885f9d457c21294c24fb00d6133faf7b3789fce1f2d21ffa2e4a5
+  data.tar.gz: 4da3c3b25cacc908d99e169a902b4002bfb3ba737edbb58f695b4d9eb42d054609eacd027bfa0c1e579d085068a5352de62c47dcbf714f72c33a4c1e27da4d3c

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 .bundle
 Gemfile.lock
+gemfiles/*.lock
 pkg/*
 *.orig
+tmp/

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/.travis.yml

@@ -1,11 +1,17 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.5.1
 branches:
   only:
     - master
 gemfile:
-  - gemfiles/rails30.gemfile
-  - gemfiles/rails31.gemfile
-  - gemfiles/rails32.gemfile
+  - gemfiles/rails32.gemfile
+  - gemfiles/rails40.gemfile
+  - gemfiles/rails51.gemfile
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails51.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails51.gemfile

data/Appraisals

@@ -1,11 +1,7 @@
-appraise 'rails30' do
-  gem 'rails', '~> 3.0.0'
+appraise 'rails32' do
+  gem 'rails', '~> 3.2.0'
 end
 
-appraise 'rails31' do
-  gem 'rails', '~> 3.1.0'
+appraise 'rails40' do
+  gem 'rails', '~> 4.0.0'
 end
-
-appraise 'rails32' do
-  gem 'rails', '~> 3.2.0'
-end

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :cli => '-c' do
+guard 'rspec', :cmd => 'rspec -c' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
@@ -15,3 +15,15 @@ guard 'cucumber' do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})          { 'features' }
 end
+
+guard :bundler do
+  require 'guard/bundler'
+  require 'guard/bundler/verify'
+  helper = Guard::Bundler::Verify.new
+
+  files = ['Gemfile']
+  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
+
+  # Assume files are symlinked from somewhere
+  files.each { |file| watch(helper.real_path(file)) }
+end

data/README.md

@@ -1,48 +1,67 @@
-<a href="http://travis-ci.org/johnbintz/rack-livereload"><img src="https://secure.travis-ci.org/johnbintz/rack-livereload.png" /></a>
-[![Code Climate](https://codeclimate.com/github/johnbintz/rack-livereload.png)](https://codeclimate.com/github/johnbintz/rack-livereload)
+# Rack::LiveReload
 
-Hey, you've got [LiveReload](http://www.livereload.com/) in my [Rack](http://rack.rubyforge.org/)!
+<a href="http://travis-ci.org/onesupercoder/rack-livereload"><img src="https://secure.travis-ci.org/onesupercoder/rack-livereload.png" /></a>
+[![Code Climate](https://codeclimate.com/github/onesupercoder/rack-livereload.png)](https://codeclimate.com/github/onesupercoder/rack-livereload)
+
+Hey, you've got [LiveReload](http://livereload.com/) in my [Rack](http://rack.rubyforge.org/)!
 No need for browser extensions anymore! Just plug it in your middleware stack and go!
 Even supports browsers without WebSockets!
 
 Use this with [guard-livereload](http://github.com/guard/guard-livereload) for maximum fun!
 
-## Install
+## Installation
 
-`gem install rack-livereload`
+### Rails
 
-## Using in...
+Add the gem to your Gemfile.
 
-### Rails
+```ruby
+gem "rack-livereload", group: :development
+```
 
+Then add the middleware to your Rails middleware stack by editing your `config/environments/development.rb`.
 
-In `config/environments/development.rb`:
+```ruby
+# config/environments/development.rb
 
-``` ruby
 MyApp::Application.configure do
-  config.middleware.insert_after(ActionDispatch::Static, Rack::LiveReload)
-
-  # ...or, change some options...
-
-  config.middleware.insert_before(
-    Rack::Lock, Rack::LiveReload,
-    :min_delay => 500,
-    :max_delay => 10000,
-    :port => 56789,
-    :host => 'myhost.cool.wow',
-    :ignore => [ %r{dont/modify\.html$} ]
-  )
+  # Add Rack::LiveReload to the bottom of the middleware stack with the default options:
+  config.middleware.insert_after ActionDispatch::Static, Rack::LiveReload
+
+  # or, if you're using better_errors:
+  config.middleware.insert_before Rack::Lock, Rack::LiveReload
+
+  # ...
 end
 ```
 
-### config.ru/Sinatra
+#### Tweaking the options
+
+```ruby
+# Specifying Rack::LiveReload options.
+config.middleware.use(Rack::LiveReload,
+  min_delay        : 500,    # default 1000
+  max_delay        : 10_000, # default 60_000
+  live_reload_port : 56789,  # default 35729
+  host             : 'myhost.cool.wow',
+  ignore           : [ %r{dont/modify\.html$} ]
+)
+```
+
+In addition, Rack::LiveReload's position within middleware stack can be
+specified by inserting it relative to an exsiting middleware via
+`insert_before` or `insert_after`. See the [Rails on Rack: Adding a
+Middleware](http://guides.rubyonrails.org/rails_on_rack.html#adding-a-middleware)
+section for more detail.
+
+### Sinatra / config.ru
 
 ``` ruby
 require 'rack-livereload'
 
 use Rack::LiveReload
 # ...or...
-use Rack::LiveReload, :min_delay => 500, ...
+use Rack::LiveReload, min_delay: 500, ...
 ```
 
 ## How it works
@@ -70,13 +89,13 @@ your browser doesn't need it. The SWF WebSocket implementor won't be loaded unle
 WebSockets support or if you force it in the middleware stack:
 
 ``` ruby
-use Rack::LiveReload, :force_swf => true
+use Rack::LiveReload, force_swf: true
 ```
 
 If you don't want any of the web-sockets-js code included at all, use the `no_swf` option:
 
 ``` ruby
-use Rack::LiveReload, :no_swf => true
+use Rack::LiveReload, no_swf: true
 ```
 
 Once more browsers support WebSockets than don't, this option will be reversed and you'll have

data/features/step_definitions/then/i_should_not_have_livereload_code.rb

@@ -1,4 +1,4 @@
 Then /^I should not have any Rack::LiveReload code$/ do
-  @response.body.should_not include("rack/livereload.js")
+  expect(@response.body).not_to include("rack/livereload.js")
 end
 

data/gemfiles/{rails30.gemfile → rails40.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 3.0.0"
+gem "rails", "~> 4.0.0"
 
 gemspec :path=>"../"

data/gemfiles/rails51.gemfile

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem "rails", "~> 5.1.6"
+
+gemspec :path=>"../"

data/lib/rack/livereload/body_processor.rb

@@ -9,8 +9,12 @@ module Rack
 
       attr_reader :content_length, :new_body, :livereload_added
 
+      def protocol
+        @options[:protocol] || "http"
+      end
+
       def livereload_local_uri
-        "http://localhost:#{@options[:live_reload_port]}/livereload.js"
+        "#{protocol}://localhost:#{@options[:live_reload_port]}/livereload.js"
       end
 
       def initialize(body, options)
@@ -45,7 +49,7 @@ module Rack
           begin
             http.send_request('GET', uri.path)
             @use_vendored = false
-          rescue ::Timeout::Error, Errno::ECONNREFUSED, EOFError
+          rescue ::Timeout::Error, Errno::ECONNREFUSED, EOFError, IOError
             @use_vendored = true
           rescue => e
             $stderr.puts e.inspect

data/lib/rack/livereload/processing_skip_analyzer.rb

@@ -16,7 +16,7 @@ module Rack
       end
 
       def skip_processing?
-        !html? || chunked? || inline? || ignored? || bad_browser?
+        !html? || chunked? || inline? || ignored? || bad_browser? || !get?
       end
 
       def chunked?
@@ -28,7 +28,8 @@ module Rack
       end
 
       def ignored?
-        @options[:ignore] and @options[:ignore].any? { |filter| @env['PATH_INFO'][filter] }
+        path = @env['QUERY_STRING'].empty? ? @env['PATH_INFO'] : "#{@env['PATH_INFO']}?#{@env['QUERY_STRING']}"
+        @options[:ignore] and @options[:ignore].any? { |filter| path[filter] }
       end
 
       def bad_browser?
@@ -38,6 +39,10 @@ module Rack
       def html?
         @headers['Content-Type'] =~ %r{text/html}
       end
+
+      def get?
+        @env['REQUEST_METHOD'] == 'GET'
+      end
     end
   end
 end

data/lib/rack-livereload.rb

@@ -1,6 +1,6 @@
 require "rack/livereload"
 
 class Rack::LiveReload
-  VERSION = '0.3.15'
+  VERSION = '0.3.17'
 end
 

data/rack-livereload.gemspec

@@ -7,7 +7,8 @@ Gem::Specification.new do |s|
   s.version     = Rack::LiveReload::VERSION
   s.authors     = ["John Bintz"]
   s.email       = ["john@coswellproductions.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/onesupercoder/rack-livereload"
+  s.license     = "MIT"
   s.summary     = %q{Insert LiveReload into your app easily as Rack middleware}
   s.description = %q{Insert LiveReload into your app easily as Rack middleware}
 
@@ -20,7 +21,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
-  s.add_development_dependency "cucumber"
+  s.add_development_dependency "cucumber", "< 3"
   s.add_development_dependency "httparty"
   s.add_development_dependency "sinatra"
   s.add_development_dependency "shotgun"
@@ -31,9 +32,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "guard-cucumber"
   s.add_development_dependency "guard-livereload"
+  s.add_development_dependency "guard-bundler"
   s.add_development_dependency "webmock"
-  s.add_development_dependency "nokogiri"
-  s.add_development_dependency 'appraisal', '~> 0.4'
+  s.add_development_dependency "nokogiri", ("< 1.6" if RUBY_VERSION < "1.9") # Nokogiri >= 1.6 requires Ruby >= 1.9
+  s.add_development_dependency 'appraisal', '~> 2.2.0'
   s.add_runtime_dependency "rack"
 end
 

data/spec/rack/livereload/body_processor_spec.rb

@@ -15,7 +15,7 @@ describe Rack::LiveReload::BodyProcessor do
     end
 
     it 'responds false when no head tag' do
-      regex.match("<header></header>").should be_false
+      regex.match("<header></header>").should be_falsey
     end
   end
 

data/spec/rack/livereload/processing_skip_analyzer_spec.rb

@@ -14,54 +14,50 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do
 
   describe '#skip_processing?' do
     it "should skip processing" do
-      subject.skip_processing?.should be_true
+      subject.skip_processing?.should be_truthy
     end
   end
 
-  describe '#bad_browser?' do
-    let(:user_agent) { described_class::BAD_USER_AGENTS.first.source }
-
-    it { should be_bad_browser }
-  end
-
-  context 'ignored' do
+  describe '#ignored?' do
     let(:options) { { :ignore => [ %r{file} ] } }
 
-    context 'not root' do
-      let(:env) { { 'PATH_INFO' => '/this/file' } }
+    context 'path contains ignore pattern' do
+      let(:env) { { 'PATH_INFO' => '/this/file', 'QUERY_STRING' => '' } }
 
       it { should be_ignored }
     end
 
-    context 'root' do
-      let(:env) { { 'PATH_INFO' => '/' } }
+    context 'root path' do
+      let(:env) { { 'PATH_INFO' => '/', 'QUERY_STRING' => '' } }
 
       it { should_not be_ignored }
     end
   end
 
-  context 'not text/html' do
-    let(:headers) { { 'Content-Type' => 'application/pdf' } }
-
-    it { should_not be_html }
-  end
+  describe '#chunked?' do
+    context 'regular response' do
+      it { should_not be_chunked }
+    end
 
-  context 'chunked response' do
-    let(:headers) { { 'Transfer-Encoding' => 'chunked' } }
+    context 'chunked response' do
+      let(:headers) { { 'Transfer-Encoding' => 'chunked' } }
 
-    it { should be_chunked }
+      it { should be_chunked }
+    end
   end
 
+  describe '#inline?' do
+    context 'inline disposition' do
+      let(:headers) { { 'Content-Disposition' => 'inline; filename=my_inlined_file' } }
 
-  context 'inline disposition' do
-    let(:headers) { { 'Content-Disposition' => 'inline; filename=my_inlined_file' } }
-
-    it { should be_inline }
+      it { should be_inline }
+    end
   end
 
   describe '#ignored?' do
     let(:path_info) { 'path info' }
-    let(:env) { { 'PATH_INFO' => path_info } }
+    let(:query_string) { 'query_string' }
+    let(:env) { { 'PATH_INFO' => path_info, 'QUERY_STRING' => query_string } }
 
     context 'no ignore set' do
       it { should_not be_ignored }
@@ -72,6 +68,70 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do
 
       it { should be_ignored }
     end
+
+    context 'ignore set including query_string' do
+      let(:options) { { :ignore => [ %r{#{path_info}\?#{query_string}} ] } }
+
+      it { should be_ignored }
+    end
+  end
+
+  describe '#bad_browser?' do
+    context 'Firefox' do
+      it { should_not be_bad_browser }
+    end
+
+    context 'BAD browser' do
+      let(:user_agent) { described_class::BAD_USER_AGENTS.first.source }
+
+      it { should be_bad_browser }
+    end
+  end
+
+  describe '#html?' do
+    context 'HTML content' do
+      let(:headers) { { 'Content-Type' => 'text/html' } }
+
+      it { should be_html }
+    end
+
+    context 'PDF content' do
+      let(:headers) { { 'Content-Type' => 'application/pdf' } }
+
+      it { should_not be_html }
+    end
+  end
+
+  describe '#get?' do
+    context 'GET request' do
+      let(:env) { { 'REQUEST_METHOD' => 'GET' } }
+
+      it { should be_get }
+    end
+
+    context 'PUT request' do
+      let(:env) { { 'REQUEST_METHOD' => 'PUT' } }
+
+      it { should_not be_get }
+    end
+
+    context 'POST request' do
+      let(:env) { { 'REQUEST_METHOD' => 'POST' } }
+
+      it { should_not be_get }
+    end
+
+    context 'DELETE request' do
+      let(:env) { { 'REQUEST_METHOD' => 'DELETE' } }
+
+      it { should_not be_get }
+    end
+
+    context 'PATCH request' do
+      let(:env) { { 'REQUEST_METHOD' => 'PATCH' } }
+
+      it { should_not be_get }
+    end
   end
 end
 

data/spec/rack/livereload_spec.rb

@@ -7,7 +7,9 @@ describe Rack::LiveReload do
 
   subject { middleware }
 
-  its(:app) { should == app }
+  it 'should be an app' do
+    middleware.app.should be == app
+  end
 
   let(:env) { {} }
   let(:options) { {} }
@@ -20,7 +22,7 @@ describe Rack::LiveReload do
     end
 
     it 'should return the js file' do
-      middleware._call(env).should be_true
+      middleware._call(env).should be_truthy
     end
   end
 end