middleman-dato 0.5.16.3 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90364e1664ab25fcb0821b6c6cd7c4cc02ab000b
-  data.tar.gz: 4e18c0c175573fccddef5a59051afb9f6714a5f8
+  metadata.gz: ed184400d9101ac6c8134233d09301e542e4ceee
+  data.tar.gz: 4af9ab976d777ab6206ad2db4c26ee27d4f735ba
 SHA512:
-  metadata.gz: 3dc80ca3144dbfe5232212b10e4bd4311de731871da6926209956022b25a3d6a0481b68b84526bd02ac1cecc7ffdda3e30ef059227d3194c00ce6e8d016f2e67
-  data.tar.gz: 1995fbab8652f6f25fbad723c495387898dd8ad3ead051ea270a75399b181fff0adc0d7c31260c7c2888448b85b154d56e4512b1fb4ffda138947996a982b56d
+  metadata.gz: 7b04769408e1ab40e01c6b41bc197ad03b8e0972c7ec95b49477ca99ada58532fa9548ac5dd67584eef904ace6e1ec4dd64b88179c0e75ef8f63c7311328ca5f
+  data.tar.gz: 4d75c15a402f2e8dfc71951707776a3c600db383918b8c8de80362f3e2e536682e9be13a8faffd0e4aeaf22a9bb272a553fc101fe01ae7a63e1bdc3e742a9cfc

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  TargetRubyVersion: 2.3
+
 Style/Documentation:
   Enabled: false
 

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 
 rvm:
-  - "2.0.0"
   - "2.1.1"
   - "2.2.0"
   - "2.3.0"

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # If you do not have OpenSSL installed, update
 # the following line to use "http://" instead
 source 'https://rubygems.org'

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/lib/middleman-dato.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 require 'middleman-core'
+require 'middleman_dato/middleman_extension'
 
 Middleman::Extensions.register(:dato) do
-  require 'middleman_dato/middleman_extension'
   MiddlemanDato::MiddlemanExtension
 end

data/lib/middleman_dato/meta_tags/article_modified_time.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/og_meta_tag'
 require 'time'
 

data/lib/middleman_dato/meta_tags/article_publisher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/og_meta_tag'
 require 'time'
 

data/lib/middleman_dato/meta_tags/base.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 require 'forwardable'
-require 'middleman_dato/field_type/seo'
+require 'dato/local/field_type/seo'
 
 module MiddlemanDato
   module MetaTags
@@ -52,7 +53,7 @@ module MiddlemanDato
 
       def fallback_seo
         @fallback_seo ||= begin
-          FieldType::Seo.parse(global_seo[:fallback_seo], nil) if global_seo
+          Dato::Local::FieldType::Seo.parse(global_seo[:fallback_seo], nil) if global_seo
         end
       end
 

data/lib/middleman_dato/meta_tags/description.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/base'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/favicon.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module MiddlemanDato
   module MetaTags
     class Favicon
@@ -14,7 +15,7 @@ module MiddlemanDato
       end
 
       def image
-        MiddlemanDato::FieldType::Image.parse(favicon, nil) if favicon.present?
+        Dato::Local::FieldType::Image.parse(favicon, nil) if favicon.present?
       end
 
       def url(width, height = nil)
@@ -27,8 +28,7 @@ module MiddlemanDato
           builder.tag(:link,
                       rel: 'apple-touch-icon',
                       sizes: "#{size}x#{size}",
-                      href: url(size)
-                     )
+                      href: url(size))
         end
       end
 
@@ -38,8 +38,7 @@ module MiddlemanDato
                       rel: 'icon',
                       type: "image/#{image.format}",
                       href: url(size),
-                      sizes: "#{size}x#{size}"
-                     )
+                      sizes: "#{size}x#{size}")
         end
       end
 
@@ -47,12 +46,10 @@ module MiddlemanDato
         APPLICATION_SIZES.map do |size|
           builder.tag(:meta,
                       name: "msapplication-square#{size}x#{size}logo",
-                      content: url(size)
-                     )
+                      content: url(size))
         end + [builder.tag(:meta,
                            name: 'msapplication-wide310x150logo',
-                           content: url(310, 150)
-                          )]
+                           content: url(310, 150))]
       end
 
       def main_tags
@@ -61,8 +58,7 @@ module MiddlemanDato
           builder.tag(:meta, name: 'theme-color', content: theme_color),
           builder.tag(:meta,
                       name: 'msapplication-TileColor',
-                      content: theme_color
-                     )
+                      content: theme_color)
         ]
       end
 

data/lib/middleman_dato/meta_tags/image.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/base'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/og_locale.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/og_meta_tag'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/og_meta_tag.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/base'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/og_site_name.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/og_meta_tag'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/og_type.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/og_meta_tag'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/robots.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/base'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/title.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/base'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/twitter_card.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/twitter_meta_tag'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/twitter_meta_tag.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/base'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/twitter_site.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/twitter_meta_tag'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags/url.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/base'
 
 module MiddlemanDato

data/lib/middleman_dato/meta_tags_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'middleman_dato/meta_tags/title'
 require 'middleman_dato/meta_tags/description'
 require 'middleman_dato/meta_tags/image'

data/lib/middleman_dato/middleman_extension.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 require 'middleman-core'
 require 'middleman-core/version'
 require 'semantic'
+require 'dato/site/client'
+require 'dato/local/site'
 require 'middleman_dato/meta_tags_builder'
-require 'middleman_dato/site'
 require 'middleman_dato/meta_tags/favicon'
 
 module MiddlemanDato
@@ -11,7 +13,7 @@ module MiddlemanDato
 
     option :domain, nil, 'Site domain (legacy)'
     option :token, nil, 'Site API token'
-    option :api_host, 'https://site-api.datocms.com', 'Site API host'
+    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
@@ -21,11 +23,11 @@ module MiddlemanDato
     def initialize(app, options_hash = {}, &block)
       super
 
-      @site = site = MiddlemanDato::Site.new(options)
-      @site.refresh!
+      @site = site = Dato::Local::Site.new(client)
+      @site.load
 
       app.before do
-        site.refresh! if !build? && !ENV.fetch('DISABLE_DATO_REFRESH', false)
+        site.load if !build? && !ENV.fetch('DISABLE_DATO_REFRESH', false)
         true
       end
 
@@ -34,6 +36,13 @@ module MiddlemanDato
       end
     end
 
+    def client
+      @client ||= Dato::Site::Client.new(
+        options[:token],
+        base_url: options[:api_base_url]
+      )
+    end
+
     def dato
       site.items_repo
     end

data/lib/middleman_dato/version.rb

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

data/middleman-dato.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'middleman_dato/version'
 
@@ -20,9 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency('middleman-core', ['>= 3.3.12'])
-  s.add_runtime_dependency('faraday', ['>= 0.9.0'])
-  s.add_runtime_dependency('faraday_middleware', ['>= 0.9.0'])
-  s.add_runtime_dependency('imgix', ['>= 0.3.1'])
-  s.add_runtime_dependency('video_embed')
+  s.add_runtime_dependency('dato', ['>= 0.1.6'])
   s.add_runtime_dependency('semantic')
+  s.add_runtime_dependency('activesupport')
 end

data/spec/middleman_dato/meta_tags/article_modified_time_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 module MiddlemanDato

data/spec/middleman_dato/meta_tags/favicon_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'active_support/core_ext/hash/indifferent_access'
 
@@ -62,12 +63,12 @@ module MiddlemanDato
         end
 
         context 'else' do
-          let(:image_obj) { double('MiddlemanDato::FieldType::Image', format: image_format) }
+          let(:image_obj) { double('Dato::Local::FieldType::Image', format: image_format) }
 
-          it 'return the image parsed with MiddlemanDato::FieldType::Image' do
-            allow(MiddlemanDato::FieldType::Image).to receive(:parse).and_return(image_obj)
+          it 'return the image parsed with Dato::Local::FieldType::Image' do
+            allow(Dato::Local::FieldType::Image).to receive(:parse).and_return(image_obj)
             image = meta_tag.image
-            expect(MiddlemanDato::FieldType::Image).to have_received(:parse)
+            expect(Dato::Local::FieldType::Image).to have_received(:parse)
               .with(favicon, nil)
             expect(image).to eq image_obj
           end
@@ -75,7 +76,7 @@ module MiddlemanDato
       end
 
       describe '#url' do
-        let(:image) { instance_double('MiddlemanDato::FieldType::Image', file: file) }
+        let(:image) { instance_double('Dato::Local::FieldType::Image', file: file) }
         let(:file) { instance_double('Imgix::Path') }
         let(:width) { 1 }
         let(:height) { 2 }
@@ -133,7 +134,7 @@ module MiddlemanDato
 
       describe '#build_apple_icon_tags' do
         let(:result) { meta_tag.build_icon_tags }
-        let(:image) { instance_double('MiddlemanDato::FieldType::Image', format: format) }
+        let(:image) { instance_double('Dato::Local::FieldType::Image', format: format) }
         let(:format) { 'png' }
         let(:image_url) { '/path/to/image' }
 
@@ -160,7 +161,7 @@ module MiddlemanDato
 
       describe '#build_application_tags' do
         let(:result) { meta_tag.build_application_tags }
-        let(:image) { instance_double('MiddlemanDato::FieldType::Image', format: format) }
+        let(:image) { instance_double('Dato::Local::FieldType::Image', format: format) }
         let(:format) { 'png' }
         let(:image_url) { '/path/to/image' }
 

data/spec/middleman_dato/meta_tags/image_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 module MiddlemanDato

data/spec/middleman_dato/meta_tags/og_locale_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 module MiddlemanDato

data/spec/spec_helper.rb

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
 require 'simplecov'
-require 'active_support/dependencies'
-require 'i18n'
-
 SimpleCov.start do
   add_filter '/spec/'
 end
 
-I18n.available_locales = [:it, :en, :ru]
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+puts File.expand_path('../../lib', __FILE__)
 
-ActiveSupport::Dependencies.autoload_paths.unshift(
-  File.join(__dir__, '../lib')
-)
+require 'i18n'
+require 'middleman-dato'
+
+I18n.available_locales = [:it, :en, :ru]
 
 Dir['spec/support/**/*.rb'].each do |f|
   require_relative '../' + f

data/spec/support/mock_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class MockBuilder
   def tag(*args)
     args

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-dato
 version: !ruby/object:Gem::Version
-  version: 0.5.16.3
+  version: 0.5.17
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -25,49 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.3.12
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: dato
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: imgix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: video_embed
+  name: semantic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: semantic
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,25 +82,6 @@ files:
 - README.md
 - Rakefile
 - lib/middleman-dato.rb
-- lib/middleman_dato/client.rb
-- lib/middleman_dato/entities_repo.rb
-- lib/middleman_dato/field_type/boolean.rb
-- lib/middleman_dato/field_type/date.rb
-- lib/middleman_dato/field_type/date_time.rb
-- lib/middleman_dato/field_type/file.rb
-- lib/middleman_dato/field_type/float.rb
-- lib/middleman_dato/field_type/image.rb
-- lib/middleman_dato/field_type/integer.rb
-- lib/middleman_dato/field_type/lat_lon.rb
-- lib/middleman_dato/field_type/link.rb
-- lib/middleman_dato/field_type/links.rb
-- lib/middleman_dato/field_type/seo.rb
-- lib/middleman_dato/field_type/string.rb
-- lib/middleman_dato/field_type/text.rb
-- lib/middleman_dato/field_type/video.rb
-- lib/middleman_dato/item.rb
-- lib/middleman_dato/items_repo.rb
-- lib/middleman_dato/json_api_entity.rb
 - lib/middleman_dato/meta_tags/article_modified_time.rb
 - lib/middleman_dato/meta_tags/article_publisher.rb
 - lib/middleman_dato/meta_tags/base.rb
@@ -147,18 +100,8 @@ files:
 - lib/middleman_dato/meta_tags/url.rb
 - lib/middleman_dato/meta_tags_builder.rb
 - lib/middleman_dato/middleman_extension.rb
-- lib/middleman_dato/site.rb
 - lib/middleman_dato/version.rb
 - middleman-dato.gemspec
-- spec/middleman_dato/entities_repo_spec.rb
-- spec/middleman_dato/field_type/file_spec.rb
-- spec/middleman_dato/field_type/image_spec.rb
-- spec/middleman_dato/field_type/lat_lon_spec.rb
-- spec/middleman_dato/field_type/seo_spec.rb
-- spec/middleman_dato/field_type/video_spec.rb
-- spec/middleman_dato/item_spec.rb
-- spec/middleman_dato/items_repo_spec.rb
-- spec/middleman_dato/json_api_entity_spec.rb
 - spec/middleman_dato/meta_tags/article_modified_time_spec.rb
 - spec/middleman_dato/meta_tags/favicon_spec.rb
 - spec/middleman_dato/meta_tags/image_spec.rb
@@ -189,18 +132,10 @@ signing_key:
 specification_version: 4
 summary: Fetches data from a Dato site
 test_files:
-- spec/middleman_dato/entities_repo_spec.rb
-- spec/middleman_dato/field_type/file_spec.rb
-- spec/middleman_dato/field_type/image_spec.rb
-- spec/middleman_dato/field_type/lat_lon_spec.rb
-- spec/middleman_dato/field_type/seo_spec.rb
-- spec/middleman_dato/field_type/video_spec.rb
-- spec/middleman_dato/item_spec.rb
-- spec/middleman_dato/items_repo_spec.rb
-- spec/middleman_dato/json_api_entity_spec.rb
 - spec/middleman_dato/meta_tags/article_modified_time_spec.rb
 - spec/middleman_dato/meta_tags/favicon_spec.rb
 - spec/middleman_dato/meta_tags/image_spec.rb
 - spec/middleman_dato/meta_tags/og_locale_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_builder.rb
+has_rdoc: