dato 0.5.1 → 0.6.0

data/lib/dato/site/client.rb

@@ -1,51 +1,14 @@
 # frozen_string_literal: true
-require 'faraday'
-require 'faraday_middleware'
-require 'json'
-require 'active_support/core_ext/hash/indifferent_access'
-
-require 'dato/version'
-
-require 'dato/site/repo/field'
-require 'dato/site/repo/item_type'
-require 'dato/site/repo/menu_item'
-require 'dato/site/repo/site'
-require 'dato/site/repo/upload_request'
-require 'dato/site/repo/user'
-require 'dato/site/repo/item'
-require 'dato/site/repo/role'
-require 'dato/site/repo/access_token'
-require 'dato/site/repo/upload'
-
+require 'dato/api_client'
 require 'dato/upload/file'
 require 'dato/upload/image'
-require 'dato/api_error'
-
-require 'cacert'
 
 module Dato
   module Site
     class Client
-      REPOS = {
-        fields: Repo::Field,
-        item_types: Repo::ItemType,
-        menu_items: Repo::MenuItem,
-        site: Repo::Site,
-        upload_requests: Repo::UploadRequest,
-        users: Repo::User,
-        items: Repo::Item,
-        roles: Repo::Role,
-        access_tokens: Repo::AccessToken,
-        uploads: Repo::Upload
-      }.freeze
+      include ApiClient
 
-      attr_reader :token, :base_url, :schema, :extra_headers
-
-      def initialize(token, options = {})
-        @token = token
-        @base_url = options[:base_url] || 'https://site-api.datocms.com'
-        @extra_headers = options[:extra_headers] || {}
-      end
+      json_schema 'site-api'
 
       def upload_file(path_or_url)
         file = Upload::File.new(self, path_or_url)
@@ -56,57 +19,6 @@ module Dato
         file = Upload::Image.new(self, path_or_url)
         file.upload
       end
-
-      REPOS.each do |method_name, repo_klass|
-        define_method method_name do
-          instance_variable_set(
-            "@#{method_name}",
-            instance_variable_get("@#{method_name}") ||
-            repo_klass.new(self)
-          )
-        end
-      end
-
-      def request(*args)
-        connection.send(*args).body.with_indifferent_access
-      rescue Faraday::SSLError => e
-        raise e if ENV['SSL_CERT_FILE'] == Cacert.pem
-
-        Cacert.set_in_env
-        request(*args)
-      rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
-        puts e.message
-        raise e
-      rescue Faraday::ClientError => e
-        error = ApiError.new(e)
-        puts '===='
-        puts error.message
-        puts '===='
-        raise error
-      end
-
-      private
-
-      def connection
-        options = {
-          url: base_url,
-          headers: extra_headers.merge(
-            'Accept' => 'application/json',
-            'Content-Type' => 'application/json',
-            'Authorization' => "Bearer #{@token}",
-            'User-Agent' => "ruby-client v#{Dato::VERSION}",
-            'X-Api-Version' => "2"
-          )
-        }
-
-        @connection ||= Faraday.new(options) do |c|
-          c.request :json
-          c.response :json, content_type: /\bjson$/
-          c.response :raise_error
-          c.use FaradayMiddleware::FollowRedirects
-          c.adapter :net_http
-        end
-      end
     end
   end
 end

data/lib/dato/upload/file.rb

@@ -45,7 +45,7 @@ module Dato
       end
 
       def upload
-        upload_request = client.upload_requests.create(filename: filename)
+        upload_request = client.upload_request.create(filename: filename)
         uri = URI.parse(upload_request[:url])
 
         request = Net::HTTP::Put.new(

data/lib/dato/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -370,10 +370,7 @@ files:
 - exe/dato
 - lib/dato.rb
 - lib/dato/account/client.rb
-- lib/dato/account/repo/account.rb
-- lib/dato/account/repo/base.rb
-- lib/dato/account/repo/deploy_event.rb
-- lib/dato/account/repo/site.rb
+- lib/dato/api_client.rb
 - lib/dato/api_error.rb
 - lib/dato/cli.rb
 - lib/dato/dump/dsl/add_to_data_file.rb
@@ -420,21 +417,9 @@ files:
 - lib/dato/local/json_api_entity.rb
 - lib/dato/local/loader.rb
 - lib/dato/local/site.rb
+- lib/dato/paginator.rb
+- lib/dato/repo.rb
 - lib/dato/site/client.rb
-- lib/dato/site/paginator.rb
-- lib/dato/site/repo/access_token.rb
-- lib/dato/site/repo/base.rb
-- lib/dato/site/repo/deploy_event.rb
-- lib/dato/site/repo/field.rb
-- lib/dato/site/repo/item.rb
-- lib/dato/site/repo/item_type.rb
-- lib/dato/site/repo/menu_item.rb
-- lib/dato/site/repo/role.rb
-- lib/dato/site/repo/search_result.rb
-- lib/dato/site/repo/site.rb
-- lib/dato/site/repo/upload.rb
-- lib/dato/site/repo/upload_request.rb
-- lib/dato/site/repo/user.rb
 - lib/dato/upload/file.rb
 - lib/dato/upload/image.rb
 - lib/dato/utils/favicon_tags_builder.rb

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

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-require 'dato/account/repo/base'
-
-module Dato
-  module Account
-    module Repo
-      class Account < Base
-        def update(resource_attributes)
-          body = JsonApiSerializer.new(
-            type: :account,
-            attributes: %i(email password)
-          ).serialize(resource_attributes)
-
-          put_request '/account', body
-        end
-
-        def find
-          get_request '/account'
-        end
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-require 'dato/json_api_serializer'
-require 'dato/json_api_deserializer'
-
-module Dato
-  module Account
-    module Repo
-      class Base
-        attr_reader :client
-
-        def initialize(client)
-          @client = client
-        end
-
-        private
-
-        %i(post put delete get).each do |method|
-          define_method "#{method}_request" do |*args|
-            JsonApiDeserializer.new.deserialize(
-              client.request(method, *args)
-            )
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-require 'dato/account/repo/base'
-
-module Dato
-  module Account
-    module Repo
-      class DeployEvent < Base
-        def all
-          get_request '/deploy-events'
-        end
-
-        def find(deploy_event_id)
-          get_request "/deploy-events/#{deploy_event_id}"
-        end
-      end
-    end
-  end
-end

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

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-require 'dato/account/repo/base'
-
-module Dato
-  module Account
-    module Repo
-      class Site < Base
-        def find(site_id)
-          get_request "/sites/#{site_id}"
-        end
-
-        def all
-          get_request '/sites'
-        end
-
-        def create(resource_attributes)
-          body = JsonApiSerializer.new(
-            type: :site,
-            attributes: %i(domain internal_subdomain name notes ssg template)
-          ).serialize(resource_attributes)
-
-          post_request '/sites', body
-        end
-
-        def update(site_id, resource_attributes)
-          body = JsonApiSerializer.new(
-            type: :site,
-            attributes: %i(domain internal_subdomain name notes)
-          ).serialize(resource_attributes, site_id)
-
-          put_request "/sites/#{site_id}", body
-        end
-
-        def destroy(site_id)
-          delete_request "/sites/#{site_id}"
-        end
-
-        def duplicate(site_id, resource_attributes)
-          body = JsonApiSerializer.new(
-            type: :site,
-            attributes: %i(name)
-          ).serialize(resource_attributes)
-
-          post_request "/sites/#{site_id}/duplicate", body
-        end
-      end
-    end
-  end
-end

data/lib/dato/site/paginator.rb

@@ -1,35 +0,0 @@
-module Dato
-  module Site
-    class Paginator
-      def initialize(client, base_endpoint, filters)
-        @client, @base_endpoint, @filters = client, base_endpoint, filters
-      end
-
-      def response
-        items_per_page = 100
-
-        base_response = @client.request(
-          :get, @base_endpoint, @filters.dup.merge('page[limit]' => items_per_page)
-        )
-
-        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,
-            @base_endpoint,
-            @filters.dup.merge(
-              'page[offset]' => items_per_page * (page + 1),
-              'page[limit]' => items_per_page
-            )
-          )[:data]
-        end
-
-        base_response
-      end
-    end
-  end
-end
-

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

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-require 'dato/site/repo/base'
-
-module Dato
-  module Site
-    module Repo
-      class AccessToken < Base
-        def create(resource_attributes)
-          body = JsonApiSerializer.new(
-            type: :access_token,
-            attributes: %i(name),
-            relationships: { role: { collection: false, type: :role } },
-            required_attributes: %i(name)
-          ).serialize(resource_attributes)
-
-          post_request '/access_tokens', body
-        end
-
-        def update(user_id, resource_attributes)
-          body = JsonApiSerializer.new(
-            type: :access_token,
-            attributes: %i(name),
-            relationships: { role: { collection: false, type: :role } }
-          ).serialize(resource_attributes, user_id)
-
-          put_request "/access_tokens/#{user_id}", body
-        end
-
-        def all
-          get_request '/access_tokens'
-        end
-
-        def find(user_id)
-          get_request "/access_tokens/#{user_id}"
-        end
-
-        def regenerate_token(user_id)
-          post_request "/access_tokens/#{user_id}/regenerate_token"
-        end
-
-        def destroy(user_id)
-          delete_request "/access_tokens/#{user_id}"
-        end
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-require 'dato/json_api_serializer'
-require 'dato/json_api_deserializer'
-
-module Dato
-  module Site
-    module Repo
-      class Base
-        attr_reader :client
-
-        def initialize(client)
-          @client = client
-        end
-
-        private
-
-        %i(post put delete get).each do |method|
-          define_method "#{method}_request" do |*args|
-            JsonApiDeserializer.new.deserialize(
-              client.request(method, *args)
-            )
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-require 'dato/site/repo/base'
-
-module Dato
-  module Site
-    module Repo
-      class DeployEvent < Base
-        def all
-          get_request '/deploy-events'
-        end
-
-        def find(deploy_event_id)
-          get_request "/deploy-events/#{deploy_event_id}"
-        end
-      end
-    end
-  end
-end

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

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-require 'dato/site/repo/base'
-
-module Dato
-  module Site
-    module Repo
-      class Field < Base
-        def create(item_type_id, resource_attributes)
-          body = JsonApiSerializer.new(
-            type: :field,
-            attributes: %i(api_key appeareance field_type hint label localized position validators),
-            required_attributes: %i(api_key appeareance field_type hint label localized position validators)
-          ).serialize(resource_attributes)
-
-          post_request "/item-types/#{item_type_id}/fields", body
-        end
-
-        def update(field_id, resource_attributes)
-          body = JsonApiSerializer.new(
-            type: :field,
-            attributes: %i(api_key appeareance field_type hint label localized position validators)
-          ).serialize(resource_attributes, field_id)
-
-          put_request "/fields/#{field_id}", body
-        end
-
-        def all(item_type_id)
-          get_request "/item-types/#{item_type_id}/fields"
-        end
-
-        def find(field_id)
-          get_request "/fields/#{field_id}"
-        end
-
-        def destroy(field_id)
-          delete_request "/fields/#{field_id}"
-        end
-      end
-    end
-  end
-end