middleman-livereload 3.0.0 → 3.0.1

data/Gemfile

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

data/lib/middleman-livereload/extension.rb

@@ -18,12 +18,28 @@ module Middleman
         app.ready do
           # Doesn't make sense in build
           if environment != :build
-            reactor = Reactor.new(options)
+            reactor = Reactor.new(options, self)
 
-            files.changed { |file| reactor.reload_browser(file) }
-            files.deleted { |file| reactor.reload_browser(file) }
+            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
+            use ::Rack::LiveReload, :port => options[:port].to_i, :host => options[:host]
           end
         end
       end
@@ -31,9 +47,11 @@ module Middleman
     end
 
     class Reactor
-      attr_reader :thread, :web_sockets
-
-      def initialize(options)
+      attr_reader :thread, :web_sockets, :app
+      delegate :logger, :to => :app
+      
+      def initialize(options, app)
+        @app = app
         @web_sockets = []
         @options     = options
         @thread      = start_threaded_reactor(options)
@@ -45,14 +63,14 @@ module Middleman
 
       def reload_browser(paths = [])
         paths = Array(paths)
-        puts "Reloading browser: #{paths.join(' ')}"
+        logger.info "== LiveReloading path: #{paths.join(' ')}"
         paths.each do |path|
           data = MultiJson.encode(['refresh', {
-            :path           => "#{Dir.pwd}/#{path}",
+            :path           => path,
             :apply_js_live  => @options[:apply_js_live],
             :apply_css_live => @options[:apply_css_live]
           }])
-          # UI.debug data
+          
           @web_sockets.each { |ws| ws.send(data) }
         end
       end
@@ -60,13 +78,13 @@ module Middleman
       def start_threaded_reactor(options)
         Thread.new do
           EventMachine.run do
-            puts "LiveReload #{options[:api_version]} is waiting for a browser to connect."
+            logger.info "== LiveReload is waiting for a browser to connect"
             EventMachine.start_server(options[:host], options[:port], EventMachine::WebSocket::Connection, {}) do |ws|
               ws.onopen do
                 begin
                   ws.send "!!ver:#{options[:api_version]}"
                   @web_sockets << ws
-                  puts "Browser connected."
+                  logger.debug "== LiveReload browser connected"
                 rescue
                   $stderr.puts $!
                   $stderr.puts $!.backtrace
@@ -74,12 +92,12 @@ module Middleman
               end
 
               ws.onmessage do |msg|
-                puts "Browser URL: #{msg}"
+                logger.debug "LiveReload Browser URL: #{msg}"
               end
 
               ws.onclose do
                 @web_sockets.delete ws
-                puts "Browser disconnected."
+                logger.debug "== LiveReload browser disconnected"
               end
             end
           end

data/lib/middleman-livereload/version.rb

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

data/middleman-livereload.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Thomas Reynolds"]
   s.email       = ["me@tdreyno.com"]
-  s.homepage    = "https://github.com/tdreyno/middleman-livereload"
+  s.homepage    = "https://github.com/middleman/middleman-livereload"
   s.summary     = %q{Adds LiveReload to Middleman}
   s.description = %q{Adds LiveReload to Middleman}
 
@@ -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.0"])
+  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,85 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: middleman-livereload
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 0
-  - 0
-  version: 3.0.0
+version: !ruby/object:Gem::Version
+  version: 3.0.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Thomas Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-09 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+date: 2012-12-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: middleman-core
-  requirement: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.2
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  name: rack-livereload
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+- !ruby/object:Gem::Dependency
+  name: rack-livereload
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
-  name: em-websocket
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-websocket
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: *id004
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Adds LiveReload to Middleman
-email: 
+email:
 - me@tdreyno.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -91,36 +93,37 @@ files:
 - lib/middleman-livereload/version.rb
 - lib/middleman_extension.rb
 - middleman-livereload.gemspec
-has_rdoc: true
-homepage: https://github.com/tdreyno/middleman-livereload
+homepage: https://github.com/middleman/middleman-livereload
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+      hash: -4276955731458512067
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -4276955731458512067
 requirements: []
-
 rubyforge_project: middleman-livereload
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adds LiveReload to Middleman
-test_files: 
+test_files:
 - features/.gitkeep
 - fixtures/.gitkeep
+has_rdoc: