dato 0.3.31 → 0.4.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eafde098e5144f4fc178a6b9619b3e9239100919
-  data.tar.gz: dfa6a06f8973b7b50333725b7fce6f7b71e8fdc2
+  metadata.gz: f85c8c3d4e34d55aa8964841977e367a733be9a6
+  data.tar.gz: 5f28df9e2518781045640b7f6cd5a98f4f4cd6c1
 SHA512:
-  metadata.gz: 6ea39c71e65dbc8df2dc91112537b6807fef7c23d44ee40eeace71d2b515da94fe6a58ecce38c84a36276ea1b8c2131c7bd7854520f61bf2cc3b444df69d59ca
-  data.tar.gz: 76a896629e3ab896ea8fd56fd419b37d7c4678d5e0985674c572c300bd35314e936a232bab31fe99fa35ae92076c1b19febc3a2959148caac9cdd2a29634bd07
+  metadata.gz: 3e272ffbaccb62c8ce4f738ba2868adbfa6f200af79ae74d36833f10b7ffee3a82008cc7c047331ba097e1262e3debc2ffa9c77a320b29e0f837cc35f47cfd75
+  data.tar.gz: 32a7c6185fad31b06d5a2ce34c78c36c7ad287a3ed2dcb1ff23e0b4ee4d249a17e4dac0d4867c32482150a6d56a6064d60e9b41f335caeb241b128b598380574

data/lib/dato/cli.rb

@@ -14,10 +14,12 @@ module Dato
     desc 'dump', 'dumps DatoCMS content into local files'
     option :config, default: 'dato.config.rb'
     option :token, default: ENV['DATO_API_TOKEN'], required: true
+    option :draft, default: false, type: :boolean
     option :watch, default: false, type: :boolean
     def dump
       config_file = File.expand_path(options[:config])
       watch_mode = options[:watch]
+      draft_mode = options[:draft]
 
       client = Dato::Site::Client.new(
         options[:token],
@@ -44,7 +46,7 @@ module Dato
 
         sleep
       else
-        Dump::Runner.new(config_file, client).run
+        Dump::Runner.new(config_file, client, draft_mode).run
       end
     end
 
@@ -69,20 +71,6 @@ module Dato
       exit 0
     end
 
-    desc 'migrate-slugs', 'migrates a Site so that it uses slug fields'
-    option :token, default: ENV['DATO_API_TOKEN'], required: true
-    option :skip_id_prefix, type: :boolean
-    def migrate_slugs
-      client = Dato::Site::Client.new(
-        options[:token],
-        extra_headers: {
-          'X-Reason' => 'migrate-slugs'
-        }
-      )
-
-      MigrateSlugs::Runner.new(client, options[:skip_id_prefix]).run
-    end
-
     no_tasks do
       def watch_config_file(config_file, &block)
         Listen.to(

data/lib/dato/dump/runner.rb

@@ -7,10 +7,11 @@ require 'dato/local/loader'
 module Dato
   module Dump
     class Runner
-      attr_reader :config_path, :client, :destination_path
+      attr_reader :config_path, :client, :destination_path, :draft_mode
 
-      def initialize(config_path, client, destination_path = Dir.pwd)
+      def initialize(config_path, client, draft_mode, destination_path = Dir.pwd)
         @config_path = config_path
+        @draft_mode = draft_mode
         @client = client
         @destination_path = destination_path
       end
@@ -39,7 +40,7 @@ module Dato
       end
 
       def loader
-        @loader ||= Dato::Local::Loader.new(client)
+        @loader ||= Dato::Local::Loader.new(client, draft_mode)
       end
     end
   end

data/lib/dato/json_api_deserializer.rb

@@ -13,7 +13,10 @@ module Dato
 
     def deserialize_resource(data)
       result = { id: data[:id] }
-      result.merge!(data[:attributes])
+
+      if data[:attributes]
+        result.merge!(data[:attributes])
+      end
 
       relationships = data.delete(:relationships)
 

data/lib/dato/local/loader.rb

@@ -8,9 +8,11 @@ module Dato
       attr_reader :client
       attr_reader :entities_repo
       attr_reader :items_repo
+      attr_reader :draft_mode
 
-      def initialize(client)
+      def initialize(client, draft_mode = false)
         @client = client
+        @draft_mode = draft_mode
         @entities_repo = EntitiesRepo.new
         @items_repo = ItemsRepo.new(@entities_repo)
       end
@@ -23,15 +25,16 @@ module Dato
       private
 
       def site
-        include = [
-          'item_types',
-          'item_types.fields'
-        ]
+        include = ['item_types', 'item_types.fields']
         client.request(:get, '/site', include: include)
       end
 
       def all_items
-        client.items.all({}, deserialize_response: false, all_pages: true)
+        client.items.all(
+          { version: draft_mode ? 'current' : 'published' },
+          deserialize_response: false,
+          all_pages: true
+        )
       end
     end
   end

data/lib/dato/site/paginator.rb

@@ -6,7 +6,7 @@ module Dato
       end
 
       def response
-        items_per_page = 100
+        items_per_page = 500
 
         base_response = @client.request(
           :get, @base_endpoint, @filters.dup.merge('page[limit]' => items_per_page)

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

@@ -28,7 +28,8 @@ module Dato
             :created_at,
             :is_valid,
             :item_type,
-            :published_version
+            :published_version,
+            :current_version
           )
 
           body = JsonApiSerializer.new(
@@ -39,6 +40,14 @@ module Dato
           put_request "/items/#{item_id}", body
         end
 
+        def publish(item_id)
+          put_request "/items/#{item_id}/publish", {}
+        end
+
+        def unpublish(item_id)
+          put_request "/items/#{item_id}/unpublish", {}
+        end
+
         def all(filters = {}, options = {})
           options.symbolize_keys!
 

data/lib/dato/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dato
-  VERSION = '0.3.31'
+  VERSION = '0.4.0.pre'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.3.31
+  version: 0.4.0.pre
 platform: ruby
 authors:
 - Stefano Verna
@@ -420,7 +420,6 @@ files:
 - lib/dato/local/json_api_entity.rb
 - lib/dato/local/loader.rb
 - lib/dato/local/site.rb
-- lib/dato/migrate_slugs/runner.rb
 - lib/dato/site/client.rb
 - lib/dato/site/paginator.rb
 - lib/dato/site/repo/access_token.rb
@@ -470,9 +469,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/lib/dato/migrate_slugs/runner.rb

@@ -1,155 +0,0 @@
-# frozen_string_literal: true
-require 'dato/json_api_deserializer'
-require 'active_support/inflector/transliterate'
-
-module Dato
-  module MigrateSlugs
-    class Runner
-      attr_reader :client, :skip_id_prefix
-
-      def initialize(client, skip_id_prefix)
-        @client = client
-        @skip_id_prefix = skip_id_prefix
-      end
-
-      def run
-        print 'Fetching site informations... '
-        title_fields
-        puts "\e[32m✓\e[0m"
-
-        title_fields.each do |title_field|
-          item_type = item_types.find do |i|
-            i['id'] == title_field['item_type']
-          end
-
-          print "Adding slug field to Item type `#{item_type['name']}`... "
-          add_slug_field(title_field)
-          puts "\e[32m✓\e[0m"
-
-          items = items_for(title_field['item_type'])
-          print "Generating slugs for #{items.count} items"
-
-          items.each do |item|
-            update_item(title_field, item)
-            print '.'
-          end
-          puts "\e[32m✓\e[0m"
-
-          puts
-        end
-      end
-
-      def simple_slugify(item, title, suffix)
-        return nil unless title
-
-        slug = title.parameterize[0..50].gsub(/(^\-|\-$)/, '')
-        skip_id_prefix ? "#{slug}#{suffix}" : "#{item['id']}-#{slug}#{suffix}"
-      end
-
-      def slugify(item, title, suffix)
-        if title.is_a?(Hash)
-          Hash[
-            title.map do |locale, value|
-              [locale, simple_slugify(item, value, suffix)]
-            end
-          ]
-        else
-          simple_slugify(item, title, suffix)
-        end
-      end
-
-      def update_item(title_field, item)
-        title = item[title_field['api_key']]
-        counter = 0
-
-        loop do
-          begin
-            slug = slugify(item, title, counter.zero? ? '' : "-#{counter}")
-            return client.items.update(item['id'], item.merge(slug: slug))
-          rescue ApiError => e
-            error = e.body['data'][0]
-
-            if error['id'] == 'INVALID_FIELD' &&
-               error['attributes']['details']['field'] == 'slug' &&
-               error['attributes']['details']['code'] == 'VALIDATION_UNIQUE'
-
-              counter += 1
-            else
-              raise e
-            end
-          end
-        end
-      end
-
-      def items_for(item_type_id)
-        items_per_page = 500
-        base_response = client.request(
-          :get,
-          '/items',
-          'page[limit]' => 500,
-          'filter[type]' => item_type_id
-        )
-
-        extra_pages = (
-          base_response[:meta][:total_count] / items_per_page.to_f
-        ).ceil - 1
-
-        extra_pages.times do |page|
-          base_response[:data] += client.request(
-            :get,
-            '/items',
-            'page[offset]' => items_per_page * (page + 1),
-            'page[limit]' => items_per_page
-          )[:data]
-        end
-
-        JsonApiDeserializer.new.deserialize(base_response)
-      end
-
-      def add_slug_field(field)
-        validators = {
-          unique: {}
-        }
-
-        validators[:required] = {} if field['validators']['required']
-
-        slug_field = client.fields.create(
-          field['item_type'],
-          field_type: 'slug',
-          appeareance: { title_field_id: field['id'] },
-          validators: validators,
-          position: 99,
-          api_key: 'slug',
-          label: 'Slug',
-          hint: '',
-          localized: field['localized']
-        )
-
-        client.fields.update(
-          slug_field['id'],
-          position: field['position'] + 1
-        )
-      end
-
-      def title_fields
-        @title_fields ||= item_types.map do |item_type|
-          fields = client.fields.all(item_type['id'])
-
-          any_slug_present = fields.any? do |f|
-            f['field_type'] == 'slug' || f['api_key'] == 'slug'
-          end
-
-          next if any_slug_present
-          fields.find do |field|
-            field['field_type'] == 'string' &&
-              field['appeareance']['type'] == 'title'
-          end
-        end.compact
-      end
-
-      def item_types
-        @item_types ||= client.item_types.all
-      end
-    end
-  end
-end