middleman-dato 0.8.0.pre → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3be36475cd3c9d75a01ba2530a4f5fdcef51611e
-  data.tar.gz: d7862f16f2c3f697cefce9d1f53272bfb9e01e37
+SHA256:
+  metadata.gz: 14dc83a3c03593fa661f17504f49124d193b56cf6d851289a78e6f09ddccc66b
+  data.tar.gz: 2d07e39d17d648d5624570167451cb3c552b36aad41ed1aa7260286c9b5aff4a
 SHA512:
-  metadata.gz: 8e8e6e872853dcdfa1fe4cf95d0321016873324894cf24e8c338e437515a04cb3f1433b8107489142f9f3238cdfba5c13a29eb92143d30acf05edd0b1560c416
-  data.tar.gz: a23d0884ff531e4c322db48193b156bc232167574fcc6345e3dde79b742706ce1c7885fc90c36872b22a42e820756d6f0aa2d0abcb7990777e70173ad4ccae2d
+  metadata.gz: 4ecd6cc01862bc26227219c39cfe056669577860c8ebcbf4c9bc8cfb70ba43acc5002ad15d1d9d5d258a8e53bfca85b5dfa8b929fc8cf652d907e880a7ff62f4
+  data.tar.gz: 5ba4ffd3009976c5057dda14c4372230307050fdd3b6010718c1d63722049d6c657e4078a9b8f47eab183af8866900ebd9024a1ef2ef236654518743b26ad1c3

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Cantiere Creativo SRL
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# DatoCMS extension for DatoCMS
+# DatoCMS extension for Middleman
 
 [![Coverage Status](https://coveralls.io/repos/github/datocms/middleman-dato/badge.svg?branch=master)](https://coveralls.io/github/datocms/middleman-dato?branch=master) [![Build Status](https://travis-ci.org/datocms/middleman-dato.svg?branch=master)](https://travis-ci.org/datocms/middleman-dato) [![Gem Version](https://badge.fury.io/rb/middleman-dato.svg)](https://badge.fury.io/rb/middleman-dato)
 

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'
@@ -13,10 +12,11 @@ module MiddlemanDato
   class MiddlemanExtension < ::Middleman::Extension
     attr_reader :loader
 
-    option :token, ENV['DATO_API_TOKEN'], 'Site API token'
-    option :api_base_url, 'https://site-api.datocms.com', 'Site API host'
+    option :token, ENV['DATO_API_TOKEN'], 'Project API token'
+    option :api_base_url, 'https://site-api.datocms.com', 'API Base URL'
     option :live_reload, true, 'Live reload of content coming from DatoCMS'
-    option :draft_mode, false, 'Show draft (unpublished) versions of your content'
+    option :preview, false, 'Show latest (unpublished) version of your content'
+    option :environment, nil, 'Environment to fetch data from'
 
     option :base_url, nil, 'Website base URL (deprecated)'
     option :domain, nil, 'Site domain (deprecated)'
@@ -27,22 +27,21 @@ module MiddlemanDato
     def initialize(app, options_hash = {}, &block)
       super
 
+      return if app.mode?(:config)
+
       @loader = loader = Dato::Local::Loader.new(
         client,
-        options_hash[:draft_mode]
+        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
@@ -61,6 +60,7 @@ module MiddlemanDato
       @client ||= Dato::Site::Client.new(
         token,
         base_url: options[:api_base_url],
+        environment: options[:environment],
         extra_headers: {
           'X-Reason' => 'dump',
           'X-SSG' => 'middleman'

data/lib/middleman_dato/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module MiddlemanDato
-  VERSION = '0.8.0.pre'
+  VERSION = '0.10.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.16']
   s.add_runtime_dependency 'activesupport'
-  s.add_runtime_dependency 'dotenv'
+  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.0.pre
+  version: 0.10.0
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2020-10-13 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.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.7.16
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 description: Fetches data from a Dato site
 email:
 - s.verna@cantierecreativo.net
@@ -93,12 +93,12 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - 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
@@ -115,14 +115,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fetches data from a Dato site
-test_files:
-- spec/spec_helper.rb
+test_files: []

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