middleman-dato 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf42b267edc6af312358c54a0145ccf1e611776b3de2be3d3c33b2b406e737c4
-  data.tar.gz: a4301b2c72c288ae6361d049e7a294c5b3c736875141ac95e01643c50fa28fe4
+  metadata.gz: 37bcda4f75d96c086b9b8c8535d1651456188a37cedf06b60a8e30a5b90b13fe
+  data.tar.gz: 4d419f7b8eebfd6f78478049b9d1dd6ed45ca5bc1bbddedbb5704dc4de41df14
 SHA512:
-  metadata.gz: 4b4eefb78b507862ddf6843cedd2c77304ce2120854e4b1fb6bbe93ed0abb29c2ddc6a93392b644fa5180926014da71396899be2562b22c8caabf714ca309091
-  data.tar.gz: 8475655bcf6d789c4fbd079475a9f388a3b4b74c8fb4c0b188554731dbe83b7eb7fb312a6dd765eab74a165e772565d5c7c3aab0263a32a97c2b1829edbaf11c
+  metadata.gz: 763c7a22ab3cec893cde2355b2f2a0de97956a1c5563941c301fe6072b3795b54f52a9f3f9d52baeaa7b6a5196751deedac0c76f6ddb465ea7c99123d26dd099
+  data.tar.gz: efb996ea06a122e37d46ae15ff80e478ee2f4210854071d25a393a1c2e13fb8341fa7850f7015edd2fb75dd36c81a75b0a1adadb5fe5f175025fa883bb4d20d3

data/lib/middleman_dato/middleman_extension.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
+
 require 'middleman-core'
 require 'middleman-core/version'
 require 'dato/site/client'
 require 'dato/local/loader'
-require 'dato/watch/site_change_watcher'
-require 'middleman_dato/watcher'
 require 'dato/utils/seo_tags_builder'
 require 'dato/utils/favicon_tags_builder'
 require 'dotenv'
@@ -34,17 +33,14 @@ module MiddlemanDato
         options_hash[:preview]
       )
 
-      @loader.load
+      loader.load
 
       app.after_configuration do
         if options_hash[:live_reload] && !app.build?
-          Watcher.instance.watch(app, loader, loader.items_repo.site.id)
-        end
-      end
-
-      app.before_shutdown do
-        if options_hash[:live_reload] && !app.build?
-          Watcher.instance.shutdown(app)
+          loader.watch do
+            puts "DatoCMS content changed!"
+            app.sitemap.rebuild_resource_list!(:touched_dato_content)
+          end
         end
       end
     end

data/lib/middleman_dato/version.rb

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

data/middleman-dato.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('coveralls')
 
   s.add_runtime_dependency 'middleman-core', ['>= 4.1.10']
-  s.add_runtime_dependency 'dato', ['>= 0.3.2']
+  s.add_runtime_dependency 'dato', ['>= 0.7.0']
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'dotenv', ['<= 2.1']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-dato
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,6 @@ files:
 - lib/middleman-dato.rb
 - lib/middleman_dato/middleman_extension.rb
 - lib/middleman_dato/version.rb
-- lib/middleman_dato/watcher.rb
 - middleman-dato.gemspec
 - spec/spec_helper.rb
 homepage: http://cantierecreativo.net

data/lib/middleman_dato/watcher.rb

@@ -1,44 +0,0 @@
-require 'singleton'
-
-module MiddlemanDato
-  class Watcher
-    include Singleton
-
-    def initialize
-      @site_id = nil
-      @apps = []
-      @watcher = nil
-    end
-
-    def watch(app, loader, site_id)
-      @app = app
-      @loader = loader
-
-      if site_id != @site_id
-        if @watcher && @watcher.connected?
-          @apps = []
-          @watcher.disconnect!
-        end
-
-        @apps = [ app.object_id ]
-        @site_id = site_id
-        @watcher = Dato::Watch::SiteChangeWatcher.new(site_id).connect do
-          print "DatoCMS content changed, refreshing data..."
-          @loader.load
-          puts " done!"
-          @app.sitemap.rebuild_resource_list!(:touched_dato_content)
-        end
-      else
-        @apps[@apps.size - 1] = app.object_id
-      end
-    end
-
-    def shutdown(app)
-      if @watcher && @watcher.connected? && @apps == [ app.object_id ]
-        @watcher.disconnect!
-      end
-
-      @apps.delete(app.object_id)
-    end
-  end
-end