middleman-livereload 3.4.3 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ece19ba9427a4425ead19caeebdc025089a0859
-  data.tar.gz: 8e820627aa497df57edecaf1b92c9e5c960eb147
+  metadata.gz: 17886dee2b4da416d13f35ac3347ca3fbb04354b
+  data.tar.gz: 6c80de20bd9283d6bc98e651b14098785400665d
 SHA512:
-  metadata.gz: f05277bb6eb3b65054be15cc6f1735412a223252575f2648b871478ff8564ff7569da26a3d5040b3260267d35e64ee337f02a7004166cd8ce9c0f2255f73de39
-  data.tar.gz: ce46f5b7287f3ca87240d1613ba21b36e0b628fd5dec114d1362df111c14d1a10d1a9dbdf6a23c06904e9284c028aa006870cf82b7b9f2fd3fa04ed05bd8b2e4
+  metadata.gz: d28b1acd59729a32d62dbe35f82caa9f70319e0d8e0317b273301701dee3552222ef1e3ad9d87110bb061e9bce66cfc74bafed1588703ce878169598843452c7
+  data.tar.gz: 4b510ae86724689d597e9b97cc96d337901ea574efe3bac705aef5294a1f85d1e2ee32f8db8bef1b6b53d6939b832c9b7e4bc7b07d49951fa47293490f36c562

data/README.md

@@ -11,7 +11,7 @@ gem install middleman
 middleman init MY_PROJECT
 ```
 
-If you already have a Middleman project: Add `gem "middleman-livereload", "~> 3.3.0"` to your `Gemfile` and run `bundle install`
+If you already have a Middleman project: Add `gem "middleman-livereload", "~> 3.4.3"` to your `Gemfile` and run `bundle install`
 
 ## Configuration
 
@@ -29,6 +29,10 @@ activate :livereload, apply_js_live: false
 
 Livereload's listener host/port, these options get passed to ::Rack::LiveReload  middleware. Defaults:`'0.0.0.0'` and `'35729'`.
 
+#### `:js_host` and `:js_port`
+
+Similar to the `:host` and `:port` options, but allow you to specify a different host and port at the frontend Javascript level than at the backend EventMachine level. Useful when running behind a proxy or on a Docker VM. Defaults to `:host` and `:port`.
+
 #### `: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`.
@@ -43,6 +47,16 @@ Disable Flash polyfil for browsers that support native WebSockets.
 
 Array of patterns for paths that must be ignored. These files will not be injected with the LiveReload script.
 
+#### `:livereload_css_target`
+
+CSS file to reload when detecting @imported partial was modified. Default `stylesheets/all.css`).  
+To opt out set `livereload_css_target: nil`.
+
+#### `:livereload_css_pattern`
+
+Regexp matching filenames that should trigger reload of :livereload_css_target when changed. Default: `Regexp.new('_.*\.css')`.
+
+
 ## Build & Dependency Status
 
 [![Gem Version](https://badge.fury.io/rb/middleman-livereload.png)][gem]

data/lib/middleman-livereload/extension_3_1.rb

@@ -3,12 +3,16 @@ require 'middleman-livereload/reactor'
 
 module Middleman
   class LiveReloadExtension < Extension
-    option :port, '35729', 'Port to bind the LiveReload API server to'
+    option :port, '35729', 'Port to bind the LiveReload API server to listen to'
     option :apply_js_live, true, 'Apply JS changes live, without reloading'
     option :apply_css_live, true, 'Apply CSS changes live, without reloading'
     option :no_swf, false, 'Disable Flash WebSocket polyfill for browsers that support native WebSockets'
     option :host, Socket.ip_address_list.find(->{ Addrinfo.ip 'localhost' }, &:ipv4_private?).ip_address, 'Host to bind LiveReload API server to'
     option :ignore, [], 'Array of patterns for paths that must be ignored'
+    option :js_port, nil, 'Port to connect the LiveReload Javascript to (if different than :port)'
+    option :js_host, nil, 'Host to connect LiveReload Javascript to (if different than :host)'
+    option :livereload_css_target, 'stylesheets/all.css', 'CSS file to load when a @imported CSS partials are modified'
+    option :livereload_css_pattern, Regexp.new('_.*\.css'), 'Regexp matching filenames that trigger live reloading target'
 
     def initialize(app, options_hash={}, &block)
       super
@@ -23,9 +27,13 @@ module Middleman
 
       port = options.port.to_i
       host = options.host
+      js_port = options.js_port || port
+      js_host = options.js_host || host
       no_swf = options.no_swf
       ignore = options.ignore
       options_hash = options.to_h
+      livereload_css_target = options.livereload_css_target
+      livereload_css_pattern = options.livereload_css_pattern
 
       app.ready do
         if @reactor
@@ -49,6 +57,13 @@ module Middleman
             end
           end
 
+          # handle imported partials
+          # load target file instead of triggering full page refresh
+          if livereload_css_pattern.match(file) and not livereload_css_target.nil?
+            logger.info("LiveReload: CSS import changed, reloading target")
+            reload_path = livereload_css_target
+          end
+
           @reactor.reload_browser(reload_path)
         end
 
@@ -62,7 +77,7 @@ module Middleman
 
         # 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, ignore: ignore
+        use ::Rack::LiveReload, port: js_port, host: js_host, no_swf: no_swf, source: :vendored, ignore: ignore
       end
     end
   end

data/lib/middleman-livereload/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module LiveReload
-    VERSION = "3.4.3"
+    VERSION = "3.4.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-livereload
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: LiveReload support for Middleman