middleman-dato 0.5.24 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ea2407f7c1f9ac3fcaca5adcb47bc2f6ac3785f
-  data.tar.gz: 98d081e1bb716dad649277d023d8acb389b1e1ff
+  metadata.gz: fccad677bb46da054f82c529dc8110920e000eaf
+  data.tar.gz: c7e2494548c6bd5b2df136be13c07cfe5bce10ee
 SHA512:
-  metadata.gz: ca3280632ab6d349820407a098d57a53369a7e142dedeabc6009109104c55582da26f9c15fd9104711c1f8e61f1c71d80678baaed1fcd3700d47d13e8ffe7885
-  data.tar.gz: 58f973e3e4490aa575518e4b86f006bf940a9daf3397d701f00292531774d1596ecfa95c9e96e1396dff73b3d79d634f12367e22e55c594a85bf2a92b4d7deb2
+  metadata.gz: 62252d9f6e85a376f73a453a55ea1b054194903ca50fd54400082264c063d3490900ddab413c68f518731291f355c801368150940b02d41a176513ea3ac39aa5
+  data.tar.gz: 8d3b64ca62c474b8b44fb38447d363eb699308e3fe23835c5efd6a4dc122956a763849be2098925a993b870fbef2cd0dd3b14d0f21d674fbfead1866ddda0d25

data/lib/middleman_dato/middleman_extension.rb

@@ -1,13 +1,57 @@
 # frozen_string_literal: true
 require 'middleman-core'
 require 'middleman-core/version'
-require 'semantic'
 require 'dato/site/client'
 require 'dato/local/loader'
 require 'middleman_dato/meta_tags_builder'
 require 'middleman_dato/meta_tags/favicon'
+require 'pusher-client'
 
 module MiddlemanDato
+  class Watcher
+    include Singleton
+    attr_reader :event_queue
+
+    def initialize
+      PusherClient.logger.level = Logger::WARN
+      @site_id = nil
+      @apps = []
+    end
+
+    def watch(app, loader, site_id)
+      @app = app
+      @loader = loader
+
+      if site_id != @site_id
+        if @socket && @socket.connected
+          @apps = []
+          @socket.disconnect
+        end
+
+        @apps = [ app.object_id ]
+        @site_id = site_id
+        @socket = PusherClient::Socket.new('75e6ef0fe5d39f481626', secure: true)
+        @socket.subscribe("site-#{site_id}")
+        @socket.bind('site:change') do
+          print "DatoCMS content changed, refreshing data..."
+          @loader.load
+          puts " done!"
+          @app.sitemap.rebuild_resource_list!(:touched_dato_content)
+        end
+        @socket.connect(true)
+      else
+        @apps[@apps.size - 1] = app.object_id
+      end
+    end
+
+    def shutdown(app)
+      if @socket && @socket.connected && @apps == [ app.object_id ]
+        @socket.disconnect
+      end
+      @apps.delete(app.object_id)
+    end
+  end
+
   class MiddlemanExtension < ::Middleman::Extension
     attr_reader :loader
 
@@ -16,9 +60,8 @@ module MiddlemanDato
     option :api_base_url, 'https://site-api.datocms.com', 'Site API host'
     option :base_url, nil, 'Website base URL'
 
-    if Semantic::Version.new(Middleman::VERSION).major >= 4
-      expose_to_config dato: :dato
-    end
+    expose_to_config dato: :dato_collector
+    expose_to_application dato_items_repo: :items_repo
 
     def initialize(app, options_hash = {}, &block)
       super
@@ -26,13 +69,16 @@ module MiddlemanDato
       @loader = loader = Dato::Local::Loader.new(client)
       @loader.load
 
-      app.before do
-        loader.load if !build? && !ENV.fetch('DISABLE_DATO_REFRESH', false)
-        true
+      app.after_configuration do
+        if !app.build?
+          Watcher.instance.watch(app, loader, loader.items_repo.site.id)
+        end
       end
 
-      if Semantic::Version.new(Middleman::VERSION).major <= 3
-        app.send :include, InstanceMethods
+      app.before_shutdown do
+        if !app.build?
+          Watcher.instance.shutdown(app)
+        end
       end
     end
 
@@ -47,7 +93,13 @@ module MiddlemanDato
       )
     end
 
-    def dato
+    def dato_collector
+      app.extensions[:collections].live_collector do |app, resources|
+        app.dato_items_repo
+      end
+    end
+
+    def items_repo
       loader.items_repo
     end
 

data/lib/middleman_dato/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module MiddlemanDato
-  VERSION = '0.5.24'
+  VERSION = '0.6.0'
 end

data/middleman-dato.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('coveralls')
 
-  s.add_runtime_dependency('middleman-core', ['>= 3.3.12'])
-  s.add_runtime_dependency('dato', ['>= 0.1.22'])
-  s.add_runtime_dependency('semantic')
+  s.add_runtime_dependency('middleman-core', ['>= 4.1.10'])
+  s.add_runtime_dependency('dato', ['>= 0.2.4'])
   s.add_runtime_dependency('activesupport')
+  s.add_runtime_dependency('pusher-client')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-dato
 version: !ruby/object:Gem::Version
-  version: 0.5.24
+  version: 0.6.0
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -30,30 +30,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.12
+        version: 4.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.12
+        version: 4.1.10
 - !ruby/object:Gem::Dependency
   name: dato
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
-  name: semantic
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: pusher-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="