middleman-dato 0.5.21 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b008f9bccc24a41e945faf2c65273f6ab891d2a
-  data.tar.gz: cf23ca940c03b9b9992e45e383a7f7460dc4ba9e
+  metadata.gz: 39961ee58f8e78c310c6e74c0935888d585ef0b2
+  data.tar.gz: b9f0de2858c19f6d0e11ea71c4888817e2917f51
 SHA512:
-  metadata.gz: c20960abe2114cdfcf1e59066dd11267cbecd369579ee16e133570bf9a41aae0e66a4eca345fbfec5c99ffe7bd68b5f01cc0090e999770b82a249b5ae0769535
-  data.tar.gz: fc208ec76ead29592a5ac6a684e44fcd9ea1ec260d8fb246e5d659dee1abb26a5440e6d0193ba80a431cf0ff9c773878df0305d01d5d2a3daba6463473d56300
+  metadata.gz: 39a17747be349e1eb2a2991bf28a988cd98f26f91353902dc156043a9791ccf8e81ee95b4e65838b61b358e7454a2d6988adb4b0f40f649ed60c231f26ddac18
+  data.tar.gz: e43d3521370b13ee39e15ae2b3b75dbe070aef857b3a06682380ee753f248a290e0900ddf0cc3e035f506a2a4a2577398fa818ef6931ff35f30c4313736f58fb

data/lib/middleman_dato/middleman_extension.rb

@@ -3,13 +3,13 @@ require 'middleman-core'
 require 'middleman-core/version'
 require 'semantic'
 require 'dato/site/client'
-require 'dato/local/site'
+require 'dato/local/loader'
 require 'middleman_dato/meta_tags_builder'
 require 'middleman_dato/meta_tags/favicon'
 
 module MiddlemanDato
   class MiddlemanExtension < ::Middleman::Extension
-    attr_reader :site
+    attr_reader :loader
 
     option :domain, nil, 'Site domain (legacy)'
     option :token, nil, 'Site API token'
@@ -23,11 +23,11 @@ module MiddlemanDato
     def initialize(app, options_hash = {}, &block)
       super
 
-      @site = site = Dato::Local::Site.new(client)
-      @site.load
+      @loader = loader = Dato::Local::Loader.new(client)
+      @loader.load
 
       app.before do
-        site.load if !build? && !ENV.fetch('DISABLE_DATO_REFRESH', false)
+        loader.load if !build? && !ENV.fetch('DISABLE_DATO_REFRESH', false)
         true
       end
 
@@ -48,36 +48,47 @@ module MiddlemanDato
     end
 
     def dato
-      site.items_repo
+      loader.items_repo
     end
 
     module InstanceMethods
       def dato
-        extensions[:dato].site.items_repo
+        extensions[:dato].loader.items_repo
       end
     end
 
     helpers do
       def dato
-        extensions[:dato].site.items_repo
+        extensions[:dato].loader.items_repo
       end
 
       def dato_meta_tags(item)
+        site_entity = extensions[:dato].loader
+          .entities_repo
+          .find_entities_of_type('site')
+          .first
+
         builder = MetaTagsBuilder.new(
           self,
           extensions[:dato].options[:base_url],
-          extensions[:dato].site.entity,
+          site_entity,
           item
         )
         builder.meta_tags
       end
 
       def dato_favicon_meta_tags(options = {})
+        site_entity = extensions[:dato].loader
+          .entities_repo
+          .find_entities_of_type('site')
+          .first
+
         options[:theme_color] ||= '#ffffff'
         options[:app_name] ||= ''
+
         favicon_builder = MetaTags::Favicon.new(
           self,
-          extensions[:dato].site.entity,
+          site_entity,
           options[:theme_color]
         )
         favicon_builder.build

data/lib/middleman_dato/version.rb

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

data/middleman-dato.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency('middleman-core', ['>= 3.3.12'])
-  s.add_runtime_dependency('dato', ['>= 0.1.18'])
+  s.add_runtime_dependency('dato', ['>= 0.1.21'])
   s.add_runtime_dependency('semantic')
   s.add_runtime_dependency('activesupport')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-dato
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.22
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.21
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement