middleman-livereload 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d7f2b2d80a0bd438ad35d13181634ca78a1c3c
-  data.tar.gz: 5288c9a6786e10676266cdaf5b200531faa6b805
+  metadata.gz: cbd5aa0303f27dae24aae66a4265112a9966f7d9
+  data.tar.gz: 48e425f51c4689cbd8c261ed71374196fec5d16d
 SHA512:
-  metadata.gz: 58b1015a0b4f213d216aa4cbc4b3eb9cd4891d37e73df780de3bfbfbc2ffa722d5c1de84bf43ef275f63a1102afd35ac5df04243f0d2429b397e98c0e6ba5230
-  data.tar.gz: cc60944983102e433c1068996e82db87bbc47107603d326a3b86ef7054c43ecb7124d1be37229172d92a20be94a22ea4bb6c5be3f7c95b8cf1d0d84a7eab40a6
+  metadata.gz: 1c4d9d0aec8d00cc9e8a1ae45449cfd234dabab32872bdefd416d96c3678542d2b6c2e407fd5403ecc3d6b6a7658720405568993cb14c663efcf98f4285854a4
+  data.tar.gz: 55c2201e8ae54496d9daa663d5fe74f1255d59e371fd47b48920bbbfb794c2a0618c1ddc8bb897212a8b649e33828003c7b8e8d6e4023a291bc411a71ad620ec

data/CHANGELOG.md

@@ -0,0 +1,33 @@
+3.3.0
+===
+
+* Explicitly use the vendored livereload.js - otherwise it will attempt to load it from a location that doesn't exist.
+* Remove `:grace_period` setting, which was unnecessary.
+* Properly ignore changes to files that should not cause a reload, and pay attention to some files that used to be ignored but shouldn't have been.
+* Send logging to the logger rather than STDOUT.
+* No longer rely on MultiJson.
+* Require Ruby 1.9.3 or greater.
+
+3.2.1
+===
+
+* Loosen dependency on `middleman-core`.
+
+3.2.0
+===
+
+* Only run in `:development` environment.
+* No longer compatible with Middleman < 3.2
+
+3.1.1
+===
+
+* Added `:no_swf` option to disable Flash websockets polyfill.
+
+3.1.0
+===
+
+* Compatibility with Middleman 3.1+ style extension API.
+* Ignore ignored sitemap files.
+* Preserve the reactor thread across preview server reloads.
+* Implement a `:grace_period` setting.

data/README.md

@@ -13,7 +13,7 @@ middleman init MY_PROJECT
 
 If you already have a Middleman project: Add `gem "middleman-livereload", "~> 3.1.0"` to your `Gemfile` and run `bundle install`
 
-####Windows users: 
+#### Windows users:
 You currently need to add `gem "em-websocket", github: "igrigorik/em-websocket"` to your `Gemfile` and run `bundle install`
 Also be sure to specify the correct hostname `activate :livereload, :host => 'localhost'`
 
@@ -26,13 +26,9 @@ activate :livereload
 The extension supports a number of options that can be given to the `activate` statement. Eg:
 
 ```
-activate :livereload, :apply_js_live => false, :grace_period => 0.5
+activate :livereload, :apply_js_live => false
 ```
 
-#### `:api_version`
-
-Livereload API version, default `'1.6'`.
-
 #### `:host` and `:port`
 
 Livereload's listener host/port, these options get passed to ::Rack::LiveReload  middleware. Defaults:`'0.0.0.0'` and `'35729'`.
@@ -41,10 +37,6 @@ Livereload's listener host/port, these options get passed to ::Rack::LiveReload
 
 Whether live reload should attempt to reload javascript / css 'in-place', without complete reload of the page. Both default to `true`.
 
-#### `:grace_period`
-
-A delay middleman-livereload should wait before reacting on file change / deletion notification (sec). Default is 0.
-
 #### `:no_swf`
 
 Disable Flash polyfil for browsers that support native WebSockets.

data/lib/middleman-livereload/extension_3_1.rb

@@ -7,17 +7,15 @@ module Middleman
     option :port, '35729', 'Port to bind the LiveReload API server to'
     option :apply_js_live, true, 'Apply JS changes live, without reloading'
     option :apply_css_live, true, 'Apply CSS changes live, without reloading'
-    option :grace_period, 0, 'Time (in seconds) to wait before reloading'
     option :no_swf, false, 'Disable Flash WebSocket polyfill for browsers that support native WebSockets'
 
     def initialize(app, options_hash={}, &block)
       super
 
-      return if app.environment != :development
+      return unless app.environment == :development
 
       @reactor = nil
 
-      grace_period = options.grace_period
       port = options.port.to_i
       host = options.host
       no_swf = options.no_swf
@@ -31,33 +29,34 @@ module Middleman
         end
 
         files.changed do |file|
-          next if ignore_manager.ignored?(file)
+          next if files.send(:ignored?, file)
 
-          sleep(grace_period) if grace_period > 0
-          sitemap.ensure_resource_list_updated!
-          puts "Changed! #{file}"
+          logger.debug "LiveReload: File changed - #{file}"
 
-          begin
-            file_url = sitemap.file_to_path(file)
+          reload_path = "#{Dir.pwd}/#{file}"
+
+          file_url = sitemap.file_to_path(file)
+          if file_url
             file_resource = sitemap.find_resource_by_path(file_url)
-            reload_path = file_resource.destination_path
-          rescue
-            reload_path = "#{Dir.pwd}/#{file}"
+            if file_resource
+              reload_path = file_resource.url
+            end
           end
+
           @reactor.reload_browser(reload_path)
         end
 
         files.deleted do |file|
-          next if ignore_manager.ignored?(file)
+          next if files.send(:ignored?, file)
 
-          sleep(grace_period) if grace_period > 0
-          sitemap.ensure_resource_list_updated!
-          puts "Deleted! #{file}"
+          logger.debug "LiveReload: File deleted - #{file}"
 
           @reactor.reload_browser("#{Dir.pwd}/#{file}")
         end
 
-        use ::Rack::LiveReload, :port => port, :host => host, :no_swf => no_swf
+        # Use the vendored livereload.js source rather than trying to get it from Middleman
+        # https://github.com/johnbintz/rack-livereload#which-livereload-script-does-it-use
+        use ::Rack::LiveReload, :port => port, :host => host, :no_swf => no_swf, :source => :vendored
       end
     end
   end

data/lib/middleman-livereload/reactor.rb

@@ -1,5 +1,5 @@
 require 'em-websocket'
-require 'multi_json'
+require 'json'
 
 module Middleman
   module LiveReload
@@ -29,7 +29,7 @@ module Middleman
         paths = Array(paths)
         logger.info "== LiveReloading path: #{paths.join(' ')}"
         paths.each do |path|
-          data = MultiJson.encode(['refresh', {
+          data = JSON.dump(['refresh', {
             :path           => path,
             :apply_js_live  => @options[:apply_js_live],
             :apply_css_live => @options[:apply_css_live]
@@ -50,8 +50,8 @@ module Middleman
                   @web_sockets << ws
                   logger.debug "== LiveReload browser connected"
                 rescue
-                  $stderr.puts $!
-                  $stderr.puts $!.backtrace
+                  logger.error $!
+                  logger.error $!.backtrace
                 end
               end
 

data/lib/middleman-livereload/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module LiveReload
-    VERSION = "3.2.1"
+    VERSION = "3.3.0"
   end
 end

data/middleman-livereload.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files -z`.split("\0")
   s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
+  s.required_ruby_version = '>= 1.9.3'
   s.add_dependency("middleman-core", ["~> 3.2"])
   s.add_runtime_dependency('rack-livereload', ['~> 0.3.15'])
   s.add_runtime_dependency('em-websocket', ['~> 0.5.0'])
-  s.add_runtime_dependency('multi_json', ['~> 1.8.4'])
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-livereload
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Thomas Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
 description: LiveReload support for Middleman
 email:
 - me@tdreyno.com
@@ -75,6 +61,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
@@ -100,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='