middleman-livereload 3.0.1 → 3.1.0

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 .rvmrc
 .DS_Store
 .rbenv-version
+.ruby-version

data/Gemfile

@@ -1,6 +1,6 @@
-source :rubygems
+source 'https://rubygems.org'
 
-git "git://github.com/middleman/middleman.git", :branch => "3.0-stable" do
+git "git://github.com/middleman/middleman.git", :branch => "master" do
   # gem "middleman"
   gem "middleman-core"
   # gem "middleman-more"

data/README.md

@@ -12,12 +12,39 @@ middleman init MY_PROJECT
 ```
 
 If you already have a Middleman project:
-Add `middleman-livereload` to your `Gemfile`, and open your `config.rb` and add:
+Add `middleman-livereload` to your `Gemfile`
+```
+gem "middleman-livereload", "~>3.0.1"
+```
 
+Then open your `config.rb` and add:
 ```
 activate :livereload
 ```
 
+# Configuration
+
+The extension supports a number of options that can be given to the `activate` statement. E.g.:
+```
+activate :livereload, :apply_js_live => false, :grace_period => 0.5
+```
+
+## :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'`.
+
+## :apply_js_live and :apply_css_live
+
+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.
+
 # Community
 
 The official community forum is available at:
@@ -34,4 +61,4 @@ The best way to get quick responses to your issues and swift fixes to your bugs
 
 # Donate
 
-[![Click here to lend your support to Middleman](https://www.pledgie.com/campaigns/15807.png)](http://www.pledgie.com/campaigns/15807)
+[![Click here to lend your support to Middleman](https://www.pledgie.com/campaigns/15807.png)](http://www.pledgie.com/campaigns/15807)

data/lib/middleman-livereload.rb

@@ -2,6 +2,11 @@ require "middleman-core"
 require "middleman-livereload/version"
   
 ::Middleman::Extensions.register(:livereload) do
-  require "middleman-livereload/extension"
-  ::Middleman::LiveReload
-end
+  if defined?(::Middleman::Extension)
+    require "middleman-livereload/extension_3_1"
+    ::Middleman::LiveReloadExtension
+  else
+    require "middleman-livereload/extension_3_0"
+    ::Middleman::LiveReload
+  end
+end

data/lib/middleman-livereload/extension_3_0.rb

@@ -0,0 +1,59 @@
+require 'rack/livereload'
+require 'middleman-livereload/reactor'
+
+module Middleman
+  module LiveReload
+    class << self
+      @@reactor = nil
+
+      def registered(app, options={})
+        options = {
+          :api_version => '1.6',
+          :host => '0.0.0.0',
+          :port => '35729',
+          :apply_js_live => true,
+          :apply_css_live => true,
+          :grace_period => 0
+        }.merge(options)
+
+        app.ready do
+          # Doesn't make sense in build
+          if environment != :build
+            if @@reactor
+              @@reactor.app = self
+            else
+              @@reactor = Reactor.new(options, self)
+            end
+
+            files.changed do |file|
+              next if ignore_manager.ignored?(file)
+
+              sleep options[:grace_period]
+              sitemap.ensure_resource_list_updated!
+
+              begin
+                file_url = sitemap.file_to_path(file)
+                file_resource = sitemap.find_resource_by_path(file_url)
+                reload_path = file_resource.destination_path
+              rescue
+                reload_path = "#{Dir.pwd}/#{file}"
+              end
+              @@reactor.reload_browser(reload_path)
+            end
+
+            files.deleted do |file|
+              next if ignore_manager.ignored?(file)
+
+              sleep options[:grace_period]
+              sitemap.ensure_resource_list_updated!
+              @@reactor.reload_browser("#{Dir.pwd}/#{file}")
+            end
+
+            use ::Rack::LiveReload, :port => options[:port].to_i, :host => options[:host]
+          end
+        end
+      end
+      alias :included :registered
+    end
+  end
+end

data/lib/middleman-livereload/extension_3_1.rb

@@ -0,0 +1,63 @@
+require 'rack/livereload'
+require 'middleman-livereload/reactor'
+
+module Middleman
+  class LiveReloadExtension < Extension
+    option :host, '0.0.0.0', 'Host to bind LiveReload API server to'
+    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'
+
+    def initialize(app, options_hash={}, &block)
+      super
+
+      # Doesn't make sense in build
+      return if app.environment == :build
+
+      @reactor = nil
+
+      grace_period = options.grace_period
+      port = options.port.to_i
+      host = options.host
+      options_hash = options.to_h
+
+      app.ready do
+        if @reactor
+          @reactor.app = self
+        else
+          @reactor = ::Middleman::LiveReload::Reactor.new(options_hash, self)
+        end
+
+        files.changed do |file|
+          next if ignore_manager.ignored?(file)
+
+          sleep(grace_period) if grace_period > 0
+          sitemap.ensure_resource_list_updated!
+          puts "Changed! #{file}"
+
+          begin
+            file_url = sitemap.file_to_path(file)
+            file_resource = sitemap.find_resource_by_path(file_url)
+            reload_path = file_resource.destination_path
+          rescue
+            reload_path = "#{Dir.pwd}/#{file}"
+          end
+          @reactor.reload_browser(reload_path)
+        end
+
+        files.deleted do |file|
+          next if ignore_manager.ignored?(file)
+
+          sleep(grace_period) if grace_period > 0
+          sitemap.ensure_resource_list_updated!
+          puts "Deleted! #{file}"
+
+          @reactor.reload_browser("#{Dir.pwd}/#{file}")
+        end
+
+        use ::Rack::LiveReload, :port => port, :host => host
+      end
+    end
+  end
+end

data/lib/middleman-livereload/{extension.rb → reactor.rb}

@@ -1,55 +1,11 @@
-require 'rack/livereload'
 require 'em-websocket'
 require 'multi_json'
 
 module Middleman
   module LiveReload
-    class << self
-      def registered(app, options={})
-        options = {
-          :api_version => '1.6',
-          :host => '0.0.0.0',
-          :port => '35729',
-          :apply_js_live => true,
-          :apply_css_live => true,
-          :grace_period => 0
-        }.merge(options)
-
-        app.ready do
-          # Doesn't make sense in build
-          if environment != :build
-            reactor = Reactor.new(options, self)
-
-            files.changed do |file|
-              sitemap.ensure_resource_list_updated!
-              
-              begin
-                file_url = sitemap.file_to_path(file)
-                file_resource = sitemap.find_resource_by_path(file_url)
-                reload_path = file_resource.destination_path
-              rescue
-                reload_path = "#{Dir.pwd}/#{file}"
-              end
-              
-              reactor.reload_browser(reload_path)
-            end
-            
-            files.deleted do |file|
-              sitemap.ensure_resource_list_updated!
-              reactor.reload_browser("#{Dir.pwd}/#{file}")
-            end
-
-            use ::Rack::LiveReload, :port => options[:port].to_i, :host => options[:host]
-          end
-        end
-      end
-      alias :included :registered
-    end
-
     class Reactor
       attr_reader :thread, :web_sockets, :app
-      delegate :logger, :to => :app
-      
+
       def initialize(options, app)
         @app = app
         @web_sockets = []
@@ -57,6 +13,14 @@ module Middleman
         @thread      = start_threaded_reactor(options)
       end
 
+      def app= app
+        Thread.exclusive { @app = app }
+      end
+
+      def logger
+        Thread.exclusive { @app.logger }
+      end
+
       def stop
         thread.kill
       end
@@ -70,7 +34,7 @@ module Middleman
             :apply_js_live  => @options[:apply_js_live],
             :apply_css_live => @options[:apply_css_live]
           }])
-          
+
           @web_sockets.each { |ws| ws.send(data) }
         end
       end
@@ -82,7 +46,7 @@ module Middleman
             EventMachine.start_server(options[:host], options[:port], EventMachine::WebSocket::Connection, {}) do |ws|
               ws.onopen do
                 begin
-                  ws.send "!!ver:#{options[:api_version]}"
+                  ws.send "!!ver:1.6"
                   @web_sockets << ws
                   logger.debug "== LiveReload browser connected"
                 rescue

data/lib/middleman-livereload/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module LiveReload
-    VERSION = "3.0.1"
+    VERSION = "3.1.0"
   end
 end

data/middleman-livereload.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
   
-  s.add_dependency("middleman-core", ["~> 3.0.2"])
+  s.add_dependency("middleman-core", [">= 3.0.2"])
   s.add_runtime_dependency('rack-livereload')
   s.add_runtime_dependency('em-websocket', ['>= 0.2.0'])
   s.add_runtime_dependency('multi_json', ['~> 1.0'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-livereload
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
@@ -89,7 +89,9 @@ files:
 - features/.gitkeep
 - fixtures/.gitkeep
 - lib/middleman-livereload.rb
-- lib/middleman-livereload/extension.rb
+- lib/middleman-livereload/extension_3_0.rb
+- lib/middleman-livereload/extension_3_1.rb
+- lib/middleman-livereload/reactor.rb
 - lib/middleman-livereload/version.rb
 - lib/middleman_extension.rb
 - middleman-livereload.gemspec
@@ -107,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4276955731458512067
+      hash: -1556732277774144508
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,10 +118,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4276955731458512067
+      hash: -1556732277774144508
 requirements: []
 rubyforge_project: middleman-livereload
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Adds LiveReload to Middleman