dato 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc70f9d4de2606b98ecce757e3f8e3120c5bc012
-  data.tar.gz: a18ad2fad965780d04847a4525cfeb9489608514
+  metadata.gz: d6df40edef1f8ec088780bf5465eed032d37f853
+  data.tar.gz: b9a2c1fecc384e608aa7fd483fa8af4ad3a7058b
 SHA512:
-  metadata.gz: 01e3d72680dfa9b1a0317d5b62669c9d62dde980a36f6ef6167360d09c97c6b11c2755ab58c25983fe561b599ec44d2d7d340cbe5c494e4a38aef167cf328a98
-  data.tar.gz: 89424a1a2fb47d901eafb9c7b2bf55aa80b88152351447cf33d773ca7682abaedba01d573da4cebf267699d3be7db1810ae1c8c4671cf42f6a3e54e6ea6ab81f
+  metadata.gz: 96981103eb1441d212ad4932a3b595a1dca7f1b01fc47bfe4a78a385c96e612dcd685efab2603d8b82501f003f0389766f65b7aeba8081561c5114272392b8a8
+  data.tar.gz: 1b782b8acade363c81060cc31c29ca34fc93a7730f2d4b8df2363308986d6ff160d3d8e5d6e5f2cf84d5590eb505125f3ddc25fa00afcb032518c68df2039e5d

data/.rubocop.yml

@@ -14,11 +14,16 @@ Metrics/ModuleLength:
   Enabled: false
 
 Metrics/AbcSize:
-  Max: 18
+  Max: 20
 
 Metrics/LineLength:
   Exclude:
   - "spec/**/*"
   - "lib/dato/site/repo/*"
   - "lib/dato/account/repo/*"
+  - "lib/dato/account/repo/*"
   - "dato.gemspec"
+
+Metrics/ParameterLists:
+  Exclude:
+  - "lib/dato/local/field_type/*"

data/Rakefile

@@ -20,7 +20,7 @@ task :regenerate do
   BuildClient.new(
     open('https://site-api.datocms.com/docs/account-api-hyperschema.json').read,
     'account',
-    %w(session item)
+    %w(session account#create account#reset_password)
   ).build
 end
 

data/dato.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'diff_dirs'
 
   spec.add_runtime_dependency 'faraday', ['>= 0.9.0']
   spec.add_runtime_dependency 'faraday_middleware', ['>= 0.9.0']

data/lib/dato/account/client.rb

@@ -42,6 +42,8 @@ module Dato
 
       def request(*args)
         connection.send(*args).body.with_indifferent_access
+      rescue Faraday::ConnectionFailed => e
+        raise e
       rescue Faraday::ClientError => e
         raise ApiError, e
       end

data/lib/dato/account/repo/account.rb

@@ -5,16 +5,6 @@ module Dato
   module Account
     module Repo
       class Account < Base
-        def create(resource_attributes)
-          body = JsonApiSerializer.new(
-            type: :account,
-            attributes: %i(email password),
-            required_attributes: %i(email password)
-          ).serialize(resource_attributes)
-
-          post_request '/account', body
-        end
-
         def update(resource_attributes)
           body = JsonApiSerializer.new(
             type: :account,
@@ -27,16 +17,6 @@ module Dato
         def find
           get_request '/account'
         end
-
-        def reset_password(resource_attributes)
-          body = JsonApiSerializer.new(
-            type: :account,
-            attributes: %i(email),
-            required_attributes: %i(email)
-          ).serialize(resource_attributes)
-
-          post_request '/account/reset_password', body
-        end
       end
     end
   end

data/lib/dato/account/repo/site.rb

@@ -16,7 +16,7 @@ module Dato
         def create(resource_attributes)
           body = JsonApiSerializer.new(
             type: :site,
-            attributes: %i(domain name notes template)
+            attributes: %i(domain internal_subdomain name notes template)
           ).serialize(resource_attributes)
 
           post_request '/sites', body
@@ -25,7 +25,7 @@ module Dato
         def update(site_id, resource_attributes)
           body = JsonApiSerializer.new(
             type: :site,
-            attributes: %i(domain name notes)
+            attributes: %i(domain internal_subdomain name notes)
           ).serialize(resource_attributes, site_id)
 
           put_request "/sites/#{site_id}", body

data/lib/dato/dump/cli.rb

@@ -12,7 +12,16 @@ module Dato
       option :token, default: ENV['DATO_API_TOKEN'], required: true
       def dump
         config_file = File.expand_path(options[:config])
-        Runner.new(config_file, options[:token]).run
+
+        client = Dato::Site::Client.new(
+          options[:token],
+          extra_headers: {
+            'X-Reason' => 'dump',
+            'X-SSG' => SsgDetector.new(Dir.pwd).detect
+          }
+        )
+
+        Runner.new(config_file, client).run
       end
     end
   end

data/lib/dato/dump/format.rb

@@ -14,10 +14,10 @@ module Dato
       end
 
       def self.converter_for(format)
-        case format
+        case format.to_sym
         when :toml
           Format::Toml
-        when :yaml
+        when :yaml, :yml
           Format::Yaml
         end
       end

data/lib/dato/dump/runner.rb

@@ -2,23 +2,25 @@
 require 'dato/dump/dsl/root'
 require 'dato/dump/operation/root'
 require 'dato/dump/ssg_detector'
+require 'dato/local/loader'
 
 module Dato
   module Dump
     class Runner
-      attr_reader :config_path, :api_token
+      attr_reader :config_path, :client, :destination_path
 
-      def initialize(config_path, api_token)
+      def initialize(config_path, client, destination_path = Dir.pwd)
         @config_path = config_path
-        @api_token = api_token
+        @client = client
+        @destination_path = destination_path
       end
 
       def run
-        site.load
+        loader.load
 
         Dsl::Root.new(
           File.read(config_path),
-          site.items_repo,
+          loader.items_repo,
           operation
         )
 
@@ -26,25 +28,11 @@ module Dato
       end
 
       def operation
-        @operation ||= Operation::Root.new(Dir.pwd)
+        @operation ||= Operation::Root.new(destination_path)
       end
 
-      def site
-        @site ||= Dato::Local::Site.new(client)
-      end
-
-      def client
-        @client ||= Dato::Site::Client.new(
-          api_token,
-          extra_headers: {
-            'X-Reason' => 'dump',
-            'X-SSG' => generator
-          }
-        )
-      end
-
-      def generator
-        SsgDetector.new(Dir.pwd).detect
+      def loader
+        @loader ||= Dato::Local::Loader.new(client)
       end
     end
   end

data/lib/dato/local/field_type/file.rb

@@ -31,6 +31,14 @@ module Dato
         def url(*args)
           file.to_url(*args)
         end
+
+        def to_hash
+          {
+            format: format,
+            size: size,
+            url: url
+          }
+        end
       end
     end
   end

data/lib/dato/local/field_type/global_seo.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+require 'dato/local/field_type/seo'
+
+module Dato
+  module Local
+    module FieldType
+      class GlobalSeo
+        attr_reader :site_name
+        attr_reader :title_suffix
+        attr_reader :twitter_account
+        attr_reader :facebook_page_url
+
+        def self.parse(value, _repo)
+          new(
+            value[:site_name],
+            value[:title_suffix],
+            value[:twitter_account],
+            value[:facebook_page_url],
+            value[:fallback_seo]
+          )
+        end
+
+        def initialize(
+          site_name,
+          title_suffix,
+          twitter_account,
+          facebook_page_url,
+          fallback_seo
+        )
+          @site_name = site_name
+          @title_suffix = title_suffix
+          @twitter_account = twitter_account
+          @facebook_page_url = facebook_page_url
+          @fallback_seo = fallback_seo
+        end
+
+        def fallback_seo
+          @fallback_seo && Seo.parse(@fallback_seo, nil)
+        end
+
+        def to_hash
+          {
+            site_name: site_name,
+            title_suffix: title_suffix,
+            twitter_account: twitter_account,
+            facebook_page_url: facebook_page_url,
+            fallback_seo: fallback_seo && fallback_seo.to_hash
+          }
+        end
+      end
+    end
+  end
+end

data/lib/dato/local/field_type/image.rb

@@ -26,6 +26,13 @@ module Dato
         def file
           super.ch('DPR', 'Width').auto('compress', 'format')
         end
+
+        def to_hash
+          super.merge(
+            width: width,
+            height: height
+          )
+        end
       end
     end
   end

data/lib/dato/local/field_type/lat_lon.rb

@@ -17,6 +17,13 @@ module Dato
         def values
           [latitude, longitude]
         end
+
+        def to_hash
+          {
+            latitude: latitude,
+            longitude: longitude
+          }
+        end
       end
     end
   end

data/lib/dato/local/field_type/links.rb

@@ -2,9 +2,13 @@
 module Dato
   module Local
     module FieldType
-      class Links
+      class Links < Array
         def self.parse(ids, repo)
-          ids.map { |id| repo.find(id) }
+          new(ids.map { |id| repo.find(id) })
+        end
+
+        def to_hash
+          map(&:to_hash)
         end
       end
     end

data/lib/dato/local/field_type/seo.rb

@@ -18,6 +18,14 @@ module Dato
         def image
           @image && Image.parse(@image, nil)
         end
+
+        def to_hash
+          {
+            title: title,
+            description: description,
+            image: image && image.to_hash
+          }
+        end
       end
     end
   end

data/lib/dato/local/field_type/video.rb

@@ -6,49 +6,64 @@ module Dato
   module Local
     module FieldType
       class Video
-        def self.parse(value, _repo)
-          new(value)
-        end
-
-        def initialize(attributes)
-          @attributes = attributes
-        end
-
-        def url
-          @attributes[:url]
-        end
-
-        def thumbnail_url
-          @attributes[:thumbnail_url]
-        end
-
-        def title
-          @attributes[:title]
-        end
+        attr_reader :url
+        attr_reader :thumbnail_url
+        attr_reader :title
+        attr_reader :width
+        attr_reader :height
+        attr_reader :provider
+        attr_reader :provider_url
+        attr_reader :provider_uid
 
-        def width
-          @attributes[:width]
-        end
-
-        def height
-          @attributes[:height]
-        end
-
-        def provider
-          @attributes[:provider]
-        end
-
-        def provider_url
-          @attributes[:provider_url]
+        def self.parse(value, _repo)
+          new(
+            value[:url],
+            value[:thumbnail_url],
+            value[:title],
+            value[:width],
+            value[:height],
+            value[:provider],
+            value[:provider_url],
+            value[:provider_uid]
+          )
         end
 
-        def provider_uid
-          @attributes[:provider_uid]
+        def initialize(
+          url,
+          thumbnail_url,
+          title,
+          width,
+          height,
+          provider,
+          provider_url,
+          provider_uid
+        )
+          @url            = url
+          @thumbnail_url  = thumbnail_url
+          @title          = title
+          @width          = width
+          @height         = height
+          @provider       = provider
+          @provider_url   = provider_url
+          @provider_uid   = provider_uid
         end
 
         def iframe_embed(width = nil, height = nil)
           VideoEmbed.embed(url, { width: width, height: height }.compact)
         end
+
+        def to_hash
+          {
+            url: url,
+            thumbnail_url: thumbnail_url,
+            title: title,
+            width: width,
+            height: height,
+            provider: provider,
+            provider_url: provider_url,
+            provider_uid: provider_uid
+          }
+        end
       end
     end
   end

data/lib/dato/local/item.rb

@@ -73,20 +73,25 @@ module Dato
       end
       alias inspect to_s
 
-      def title_attribute
-        title_field = fields.find do |field|
-          field.field_type == 'string' &&
-            field.appeareance[:type] == 'title'
-        end
-        title_field && title_field.api_key
-      end
-
-      def respond_to_missing?(method, include_private = false)
-        field = fields.find { |f| f.api_key.to_sym == method }
-        if field
-          true
-        else
-          super
+      def to_hash
+        base = {
+          id: id,
+          item_type: item_type.api_key,
+          slug: slug(prefix_with_id: false),
+          slug_with_prefix: slug,
+          updated_at: updated_at
+        }
+
+        base[:position] = position if item_type.sortable
+
+        @attributes ||= fields.each_with_object(base) do |field, result|
+          value = send(field.api_key)
+
+          result[field.api_key.to_sym] = if value.respond_to?(:to_hash)
+                                           value.to_hash
+                                         else
+                                           value
+                                         end
         end
       end
 
@@ -126,6 +131,23 @@ module Dato
         end
         raise NoMethodError, message.join("\n")
       end
+
+      def respond_to_missing?(method, include_private = false)
+        field = fields.find { |f| f.api_key.to_sym == method }
+        if field
+          true
+        else
+          super
+        end
+      end
+
+      def title_attribute
+        title_field = fields.find do |field|
+          field.field_type == 'string' &&
+            field.appeareance[:type] == 'title'
+        end
+        title_field && title_field.api_key
+      end
     end
   end
 end

data/lib/dato/local/items_repo.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'active_support/core_ext/string'
 require 'dato/local/item'
+require 'dato/local/site'
 
 module Dato
   module Local
@@ -28,6 +29,28 @@ module Dato
         end
       end
 
+      def site
+        Site.new(entities_repo.find_entities_of_type('site').first)
+      end
+
+      def available_locales
+        site.locales.map(&:to_sym)
+      end
+
+      def item_types
+        entities_repo.find_entities_of_type('item_type')
+      end
+
+      def items_of_type(item_type)
+        method, singleton = item_type_methods[item_type]
+
+        if singleton
+          [@collections_by_type[method]]
+        else
+          @collections_by_type[method]
+        end
+      end
+
       private
 
       def build_cache!
@@ -38,13 +61,13 @@ module Dato
       def build_item_type_methods!
         @item_type_methods = {}
 
-        singleton_keys = singleton_item_type_entities.map(&:api_key)
-        collection_keys = collection_item_type_entities.map(&:api_key)
-                                                       .map(&:pluralize)
+        singleton_keys = singleton_item_types.map(&:api_key)
+        collection_keys = collection_item_types.map(&:api_key)
+                                               .map(&:pluralize)
 
         clashing_keys = singleton_keys & collection_keys
 
-        item_type_entities.each do |item_type|
+        item_types.each do |item_type|
           singleton = item_type.singleton
           pluralized_api_key = item_type.api_key.pluralize
           method = singleton ? item_type.api_key : pluralized_api_key
@@ -59,14 +82,14 @@ module Dato
       end
 
       def build_collections_by_type!
-        item_type_entities.each do |item_type|
+        item_types.each do |item_type|
           method, singleton = item_type_methods[item_type]
 
           @collections_by_type[method] = if singleton
-                                        nil
-                                      else
-                                        ItemCollection.new
-                                      end
+                                           nil
+                                         else
+                                           ItemCollection.new
+                                         end
         end
 
         item_entities.each do |item_entity|
@@ -83,20 +106,16 @@ module Dato
         end
       end
 
-      def item_type_entities
-        entities_repo.find_entities_of_type('item_type')
-      end
-
       def item_entities
         entities_repo.find_entities_of_type('item')
       end
 
-      def singleton_item_type_entities
-        item_type_entities.select(&:singleton)
+      def singleton_item_types
+        item_types.select(&:singleton)
       end
 
-      def collection_item_type_entities
-        item_type_entities - singleton_item_type_entities
+      def collection_item_types
+        item_types - singleton_item_types
       end
 
       def method_missing(method, *arguments, &block)

data/lib/dato/local/loader.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+require 'dato/local/entities_repo'
+require 'dato/local/items_repo'
+
+module Dato
+  module Local
+    class Loader
+      attr_reader :client
+      attr_reader :entities_repo
+      attr_reader :items_repo
+
+      def initialize(client)
+        @client = client
+        @entities_repo = EntitiesRepo.new
+        @items_repo = ItemsRepo.new(@entities_repo)
+      end
+
+      def load
+        @entities_repo = EntitiesRepo.new(site, all_items)
+        @items_repo = ItemsRepo.new(@entities_repo)
+      end
+
+      private
+
+      def site
+        include = [
+          'item_types',
+          'item_types.fields'
+        ]
+        client.request(:get, '/site', include: include)
+      end
+
+      def all_items
+        items_per_page = 500
+        base_response = client.request(:get, '/items', 'page[limit]' => 1)
+
+        pages = (base_response[:meta][:total_count] / items_per_page.to_f).ceil
+        base_response[:data] = []
+
+        pages.times do |page|
+          base_response[:data] += client.request(
+            :get,
+            '/items',
+            'page[offset]' => items_per_page * page,
+            'page[limit]' => items_per_page
+          )[:data]
+        end
+
+        base_response
+      end
+    end
+  end
+end

data/lib/dato/local/site.rb

@@ -1,56 +1,60 @@
 # frozen_string_literal: true
-require 'dato/local/entities_repo'
-require 'dato/local/items_repo'
+require 'forwardable'
+require 'active_support/inflector/transliterate'
+require 'active_support/hash_with_indifferent_access'
 
 module Dato
   module Local
     class Site
-      attr_reader :client
-      attr_reader :entities_repo
-      attr_reader :items_repo
-
-      def initialize(client)
-        @client = client
-        @entities_repo = EntitiesRepo.new
-        @items_repo = ItemsRepo.new(@entities_repo)
+      extend Forwardable
+
+      attr_reader :entity
+      def_delegators :entity, :id, :name, :locales, :theme_hue, :domain,
+                     :internal_domain, :no_index
+
+      def initialize(entity)
+        @entity = entity
       end
 
-      def load
-        @entities_repo = EntitiesRepo.new(site, all_items)
-        @items_repo = ItemsRepo.new(@entities_repo)
+      def global_seo
+        read_attribute(:global_seo, FieldType::GlobalSeo, locales.size > 1)
       end
 
-      def entity
-        @entities_repo.find_entities_of_type('site').first
+      def favicon
+        read_attribute(:favicon, FieldType::Image, false)
       end
 
-      private
+      def to_s
+        "#<Site id=#{id} site_name=#{site_name}>"
+      end
+      alias inspect to_s
 
-      def site
-        include = [
-          'item_types',
-          'item_types.fields'
+      def to_hash
+        attributes = [
+          :id, :name, :locales, :theme_hue, :domain, :internal_domain,
+          :no_index, :global_seo, :favicon
         ]
-        client.request(:get, '/site', include: include)
-      end
 
-      def all_items
-        items_per_page = 500
-        base_response = client.request(:get, '/items', 'page[limit]' => 1)
+        attributes.each_with_object({}) do |attribute, result|
+          value = send(attribute)
+          result[attribute] = if value.respond_to?(:to_hash)
+                                value.to_hash
+                              else
+                                value
+                              end
+        end
+      end
 
-        pages = (base_response[:meta][:total_count] / items_per_page.to_f).ceil
-        base_response[:data] = []
+      private
 
-        pages.times do |page|
-          base_response[:data] += client.request(
-            :get,
-            '/items',
-            'page[offset]' => items_per_page * page,
-            'page[limit]' => items_per_page
-          )[:data]
-        end
+      def read_attribute(method, type_klass, localized)
+        value = if localized
+                  (entity.send(method) || {})[I18n.locale]
+                else
+                  entity.send(method)
+                end
 
-        base_response
+        value && type_klass.parse(value, @items_repo)
       end
     end
   end

data/lib/dato/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dato
-  VERSION = '0.1.20'
+  VERSION = '0.1.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diff_dirs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -330,6 +344,7 @@ files:
 - lib/dato/local/field_type/date_time.rb
 - lib/dato/local/field_type/file.rb
 - lib/dato/local/field_type/float.rb
+- lib/dato/local/field_type/global_seo.rb
 - lib/dato/local/field_type/image.rb
 - lib/dato/local/field_type/integer.rb
 - lib/dato/local/field_type/lat_lon.rb
@@ -342,6 +357,7 @@ files:
 - lib/dato/local/item.rb
 - lib/dato/local/items_repo.rb
 - lib/dato/local/json_api_entity.rb
+- lib/dato/local/loader.rb
 - lib/dato/local/site.rb
 - lib/dato/site/client.rb
 - lib/dato/site/repo/base.rb