dato 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82c1636f441fbd46c8331b4a3a17d005560de0e8
-  data.tar.gz: c37302cbe0003a7188dcc6c4344876eab27f1b23
+  metadata.gz: 625bd39b3b678607cd376d9ba1edc2e725bc2b86
+  data.tar.gz: 272fee3a00041493b597d137697b10f8a4fde371
 SHA512:
-  metadata.gz: daa7cca64ddccfedde2a6fa675111c2b11f92f944c61aa0ebdc69114f2d84c4701e1357d92b164a25b10a7db373b2735c0a7377bef2aec98eba168b2a0b2481b
-  data.tar.gz: b9c65378b99fda7b554f62c9191a5dddea274847bf09cd05f7968bec8074be49e4fcb5017fa3af572f13e7d30f937067d3d00250dcc527d9cfac0e50906093f7
+  metadata.gz: 8d0351d838f7799d1bf129b9dd7e81848cadc4ff638e252f8a3e6b6f636e53ac79fb2f8db1c75b3b66130c93d2a50f4b4ee7b4fd39551a0299403d688c0b4121
+  data.tar.gz: 0f74932dbec7b9f7bdf326f904f99cab5233e33d586ad3118dff08954fc818154d8a628ea32db475262c7f5652ddd0bb53a5192f12e4737b3229e83519be906c

data/README.md

@@ -24,7 +24,46 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+client = Dato::Site::Client.new("YOUR_SITE_API_TOKEN")
+
+article_type = client.item_types.create(
+  name: "Article",
+  singleton: false,
+  sortable: false,
+  api_key: "article"
+)
+
+client.fields.create(
+  article_type[:id],
+  api_key: "title",
+  field_type: "string",
+  appeareance: { type: "title" },
+  label: "Title",
+  localized: false,
+  position: 99,
+  hint: "",
+  validators: { required: {} },
+)
+
+client.fields.create(
+  article_type[:id],
+  api_key: "image",
+  field_type: "image",
+  appeareance: nil,
+  label: "Image",
+  localized: false,
+  position: 99,
+  hint: "",
+  validators: { required: {} },
+)
+
+client.items.create(
+  item_type: article_type[:id],
+  title: "First post!",
+  image: client.upload_image("http://i.giphy.com/NXOF5rlaSXdAc.gif")
+)
+```
 
 ## Development
 

data/dato.gemspec

@@ -31,4 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "faraday", [">= 0.9.0"]
   spec.add_runtime_dependency "faraday_middleware", [">= 0.9.0"]
   spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "fastimage"
+  spec.add_runtime_dependency "downloadr"
+  spec.add_runtime_dependency "addressable"
 end

data/lib/dato/account/client.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext/hash/indifferent_access'
 
 require 'dato/account/repo/account'
 require 'dato/account/repo/site'
+require 'dato/api_error'
 
 module Dato
   module Account
@@ -14,10 +15,10 @@ module Dato
         sites: Repo::Site,
       }
 
-      attr_reader :token, :domain, :schema
+      attr_reader :token, :base_url, :schema
 
-      def initialize(token, domain: 'https://account-api.datocms.com')
-        @domain = domain
+      def initialize(token, base_url: 'https://account-api.datocms.com')
+        @base_url = base_url
         @token = token
       end
 
@@ -32,21 +33,16 @@ module Dato
       end
 
       def request(*args)
-        begin
-          connection.send(*args).body.with_indifferent_access
-        rescue Faraday::ClientError => e
-          puts e.response
-          body = JSON.parse(e.response[:body])
-          puts JSON.pretty_generate(body)
-          raise e
-        end
+        connection.send(*args).body.with_indifferent_access
+      rescue Faraday::ClientError => e
+        raise ApiError.new(e)
       end
 
       private
 
       def connection
         options = {
-          url: domain,
+          url: base_url,
           headers: {
             'Accept' => "application/json",
             'Content-Type' => "application/json",

data/lib/dato/api_error.rb

@@ -0,0 +1,18 @@
+module Dato
+  class ApiError < StandardError
+    attr_reader :faraday_error
+
+    def initialize(faraday_error)
+      @faraday_error = faraday_error
+    end
+
+    def message
+      [
+        "DatoCMS API Error",
+        "Status: #{faraday_error.response[:status]}",
+        "Response:",
+        JSON.pretty_generate(JSON.load(faraday_error.response[:body]))
+      ].join("\n")
+    end
+  end
+end

data/lib/dato/site/client.rb

@@ -11,6 +11,10 @@ require 'dato/site/repo/upload_request'
 require 'dato/site/repo/user'
 require 'dato/site/repo/item'
 
+require 'dato/upload/file'
+require 'dato/upload/image'
+require 'dato/api_error'
+
 module Dato
   module Site
     class Client
@@ -24,13 +28,23 @@ module Dato
         items: Repo::Item,
       }
 
-      attr_reader :token, :domain, :schema
+      attr_reader :token, :base_url, :schema
 
-      def initialize(token, domain: 'https://site-api.datocms.com')
-        @domain = domain
+      def initialize(token, base_url: 'https://site-api.datocms.com')
+        @base_url = base_url
         @token = token
       end
 
+      def upload_file(path_or_url)
+        file = Upload::File.new(self, path_or_url)
+        file.upload
+      end
+
+      def upload_image(path_or_url)
+        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(
@@ -42,20 +56,16 @@ module Dato
       end
 
       def request(*args)
-        begin
-          connection.send(*args).body.with_indifferent_access
-        rescue Faraday::ClientError => e
-          body = JSON.parse(e.response[:body])
-          puts JSON.pretty_generate(body)
-          raise e
-        end
+        connection.send(*args).body.with_indifferent_access
+      rescue Faraday::ClientError => e
+        raise ApiError.new(e)
       end
 
       private
 
       def connection
         options = {
-          url: domain,
+          url: base_url,
           headers: {
             'Accept' => "application/json",
             'Content-Type' => "application/json",

data/lib/dato/upload/file.rb

@@ -0,0 +1,68 @@
+require "downloadr"
+require "tempfile"
+require "addressable"
+require "net/http"
+
+module Dato
+  module Upload
+    class File
+      attr_reader :client, :source
+
+      def initialize(client, source)
+        @client = client
+        @source = source
+      end
+
+      def file
+        @file ||= if http_source?
+                    Tempfile.new('file').tap do |file|
+                      Downloadr::HTTP.new(source, file).download
+                    end
+                  else
+                    ::File.new(::File.expand_path(source))
+                  end
+      end
+
+      def http_source?
+        uri = Addressable::URI.parse(source)
+        uri.scheme == "http" || uri.scheme == "https"
+      rescue Addressable::URI::InvalidURIError
+        false
+      end
+
+      def filename
+        if http_source?
+          ::File.basename(source)
+        else
+          ::File.basename(file.path)
+        end
+      end
+
+      def upload
+        upload_request = client.upload_requests.create(filename: filename)
+        uri = URI.parse(upload_request[:url])
+
+        request = Net::HTTP::Put.new(
+          uri,
+          'x-amz-acl' => 'public-read'
+        )
+        request.body = file.read
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+
+        http.request(request)
+
+        format_resource(upload_request)
+      end
+
+      def format_resource(upload_request)
+        {
+          path: upload_request[:id],
+          size: ::File.size(file.path),
+          format: ::File.extname(::File.basename(file.path)).delete('.')
+        }
+      end
+    end
+  end
+end

data/lib/dato/upload/image.rb

@@ -0,0 +1,19 @@
+require "dato/upload/file"
+require "fastimage"
+
+module Dato
+  module Upload
+    class Image < Dato::Upload::File
+      def format_resource(upload_request)
+        width, height = FastImage.size(file.path)
+
+        super(upload_request).merge(
+          width: width,
+          height: height,
+          format: FastImage.type(file.path).to_s
+        )
+      end
+    end
+  end
+end
+

data/lib/dato/version.rb

@@ -1,3 +1,3 @@
 module Dato
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-06 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fastimage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: downloadr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby client for DatoCMS API
 email:
 - s.verna@cantierecreativo.net
@@ -187,6 +229,7 @@ files:
 - lib/dato/account/repo/account.rb
 - lib/dato/account/repo/base.rb
 - lib/dato/account/repo/site.rb
+- lib/dato/api_error.rb
 - lib/dato/json_api_deserializer.rb
 - lib/dato/json_api_serializer.rb
 - lib/dato/site/client.rb
@@ -198,6 +241,8 @@ files:
 - lib/dato/site/repo/site.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/version.rb
 homepage: https://github.com/datocms/ruby-datocms-client
 licenses:
@@ -224,4 +269,3 @@ signing_key:
 specification_version: 4
 summary: Ruby client for DatoCMS API
 test_files: []
-has_rdoc: