abbyy-cloud 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e315b9643988d2d779dbbe0e22deca6552111e47
-  data.tar.gz: 1255379a0e408cdba1c524395d8c2a3a653bf7f9
+  metadata.gz: 22ccdf6c83c1c16d2d88e4e2c1db6e92350f855b
+  data.tar.gz: 5487edca014bb2b01839ad1c018c417b9ba90d6e
 SHA512:
-  metadata.gz: 71b4414e1f7f9aba1058e7bac40dc5fa38c0f14079c593ba5426b89f1b015b492a626472debad76e2282c4cf3f1ad543ab7b9f5005f7446034b8a0e831ce0153
-  data.tar.gz: 8fe5ec65636e196b1a9e2e1da3cd539a279b89891929414256bdc91c79d0620dee8906a0329c0756af60186b724b315fe16afb1fa82ecb87ca3a4e04a62b2877
+  metadata.gz: 73afb10ed62e83e82275e2ed91b4dea2c4a84e3624b5b6352ed163f63bc34db49c0acdb3e824a8394232c8a9773e26628b1c8f43bd14e54a2def0edda5415822
+  data.tar.gz: c3238c14723df68f93233c9f99d03b7203a82a1b09f84f25e190dab8597a126799baa4dbd66dc03b4a82fe1aa4fdd9d3230f3534684ed68bbc6739bc3a7c93e8

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Master (to be released)
 
+[Compare v0.0.7...HEAD](https://github.com/nepalez/abbyy-cloud/compare/v0.0.7...HEAD)
+
+# [v0.0.7 2016-09-09](https://github.com/nepalez/abbyy-cloud/tree/v0.0.7)
+
+### Bugs Fixed
+
+* Order of loading files (nepalez)
+
+[Compare v0.0.6...v0.0.7](https://github.com/nepalez/abbyy-cloud/compare/v0.0.6...v0.0.7)
+
+# [v0.0.6 2016-09-09](https://github.com/nepalez/abbyy-cloud/tree/v0.0.6)
+
 ### Added
 
 * Operation `files.upload` (nepalez)
@@ -7,7 +19,7 @@
 * Operation `orders.create(options)` (nepalez)
 * Operation `orders.find(id)` (nepalez)
 
-[Compare v0.0.5...HEAD](https://github.com/nepalez/abbyy-cloud/compare/v0.0.5...HEAD)
+[Compare v0.0.5...v0.0.6](https://github.com/nepalez/abbyy-cloud/compare/v0.0.5...v0.0.6)
 
 # [v0.0.5 2016-08-23](https://github.com/nepalez/abbyy-cloud/tree/v0.0.5)
 

data/abbyy-cloud.gemspec

@@ -1,6 +1,9 @@
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 Gem::Specification.new do |gem|
   gem.name     = "abbyy-cloud"
-  gem.version  = "0.0.6"
+  gem.version  = "0.0.7"
   gem.authors  = ["Andrew Kozin"]
   gem.email    = ["andrew.kozin@gmail.com"]
   gem.summary  = "HTTP client to ABBYY Cloud API"
@@ -18,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "dry-struct", "~> 0.0.1"
   gem.add_runtime_dependency "hashie", "~> 3.4"
   gem.add_runtime_dependency "multipart_body", "~> 0.2"
+  gem.add_runtime_dependency "mime-types", "~> 3.1"
 
   gem.add_development_dependency "bundler", "~> 1.12"
   gem.add_development_dependency "rake", "~> 10.0"

data/lib/abbyy/cloud.rb

@@ -5,6 +5,7 @@ require "json"
 require "net/http"
 require "net/https"
 require "multipart_body"
+require "mime-types"
 
 module ABBYY
   class Cloud
@@ -14,7 +15,7 @@ module ABBYY
     require_relative "cloud/settings"
 
     %w(exceptions models operations namespaces).each do |dir|
-      path = File.expand_path("lib/abbyy/cloud/#{dir}/**")
+      path = File.expand_path("../cloud/#{dir}/**", __FILE__)
       Dir[path].each { |file| require file }
     end
 

data/lib/abbyy/cloud/models/full_order.rb

@@ -11,7 +11,7 @@ require_relative "unit_type"
 class ABBYY::Cloud
   module Models
     class FullOrder < Struct
-      attribute :amount, Types::Coercible::Float
+      attribute :amount, Types::Coercible::Float.optional
       attribute :approval_required, Types::Form::Bool
       attribute :created, Types::Form::Time
       attribute :currency, Types::Currency
@@ -26,18 +26,18 @@ class ABBYY::Cloud
       attribute :is_manual_estimation, Types::Form::Bool
       attribute :label, Types::Label.optional
       attribute :number, Types::Coercible::Int
-      attribute :payment_provider, Types::Strict::String
+      attribute :payment_provider, Types::Strict::String.optional
       attribute :payment_type, Types::PaymentType
       attribute :progress, Types::Coercible::Int
       attribute :started, Types::Form::Time.optional
-      attribute :statistics, Types::OrderStatistics
+      attribute :statistics, Types::OrderStatistics.optional
       attribute :status, Types::Status
       attribute :to, Types::FilledArray.member(Types::Locale)
       attribute :translations, Types::Array.member(Types::TranslationLink)
       attribute :type, Types::TranslationType
-      attribute :unit_count, Types::Coercible::Int
-      attribute :unit_type, Types::UnitType
-      attribute :units_count, Types::Hash
+      attribute :unit_count, Types::Coercible::Int.optional
+      attribute :unit_type, Types::UnitType.optional
+      attribute :units_count, Types::Hash.optional
     end
 
     # Registers type Types::FullOrder

data/lib/abbyy/cloud/models/translation_link.rb

@@ -4,10 +4,10 @@ require_relative "file_link"
 class ABBYY::Cloud
   module Models
     class TranslationLink < Struct
-      attribute :delivered, Types::Form::Time
-      attribute :started, Types::Form::Time
-      attribute :progress, Types::Coercible::Int
-      attribute :status, Types::Status
+      attribute :delivered,   Types::Form::Time.optional
+      attribute :started,     Types::Form::Time.optional
+      attribute :progress,    Types::Hash
+      attribute :status,      Types::Status
       attribute :source_file, Types::FileLink
       attribute :target_file, Types::FileLink
     end

data/lib/abbyy/cloud/operations/base.rb

@@ -1,3 +1,5 @@
+require_relative "file"
+
 # Base class for specific operations
 # It validates request and response using corresponding structs
 #
@@ -79,11 +81,10 @@ class ABBYY::Cloud
 
       private
 
-      def prepare_multipart(file, content_type: "plain/text", **)
+      def prepare_multipart(data, content_type: "text/plain", **)
         name = SecureRandom.hex(10)
-        data = file.read if file.respond_to?(:read)
-        path = Pathname.new(file.path).basename if file.respond_to?(:path)
-        part = Part.new(name, data || file, path || "file")
+        file = File.new(data, content_type: content_type)
+        part = Part.new(name, file.read, file.path)
         part.content_type = content_type
         MultipartBody.new [part]
       end
@@ -91,7 +92,7 @@ class ABBYY::Cloud
       def prepare_request_body(multipart, data)
         case request_type
         when :json then JSON(request_body[data].to_h)
-        when :file then multipart.to_s << "\r\n"
+        when :file then [nil, nil, multipart, nil].join("\r\n")
         else data
         end
       rescue => error

data/lib/abbyy/cloud/operations/file.rb

@@ -0,0 +1,29 @@
+# Emulates a source to ensure it has methods [#read] and [#path]
+class ABBYY::Cloud
+  module Operations
+    class File
+      extend Dry::Initializer::Mixin
+      param  :source
+      option :content_type
+
+      def read
+        source.respond_to?(:read) ? source.read : source
+      end
+
+      def path
+        @path ||= \
+          if source.respond_to?(:path)
+            Pathname.new(source.path).basename
+          else
+            "#{SecureRandom.hex(4)}.#{ext}"
+          end
+      end
+
+      private
+
+      def ext
+        MIME::Types[content_type].first.preferred_extension
+      end
+    end
+  end
+end

data/lib/abbyy/cloud/operations/submit_order.rb

@@ -24,6 +24,7 @@ class ABBYY::Cloud
         attribute :label, Types::Label.optional
         attribute :to, Types::FilledArray.member(Types::Locale)
         attribute :files, Types::FilledArray.member(Types::FileReference)
+        attribute :category, Types::Strict::String.optional
       end
 
       response_body Models::FullOrder

data/spec/feature/abbyy/orders_create_spec.rb

@@ -18,7 +18,8 @@ RSpec.describe "orders.create" do
       currency:             "RUB",
       from:                 "ru",
       to:                   ["de"],
-      files:                [{ id: "foo", token: "bar" }]
+      files:                [{ id: "foo", token: "bar" }],
+      category:             "Games > Lego"
     }
   end
 
@@ -63,7 +64,6 @@ RSpec.describe "orders.create" do
       payment_type: "External",
       unit_type: "Words",
       unit_count: 32,
-      units_count: 32,
       currency: "RUB",
       amount: 100.0,
       deadline: "2019-01-23T10:00:00Z",

data/spec/feature/abbyy/orders_find_spec.rb

@@ -42,7 +42,6 @@ RSpec.describe "orders.find" do
       payment_type: "External",
       unit_type: "Words",
       unit_count: 32,
-      units_count: 32,
       currency: "RUB",
       amount: 100.0,
       deadline: "2019-01-23T10:00:00Z",

data/spec/unit/abbyy/cloud/models/full_order_spec.rb

@@ -134,22 +134,6 @@ RSpec.describe ABBYY::Cloud::Models::FullOrder do
     end
   end
 
-  context "without unit_type:" do
-    before { data.delete :unit_type }
-
-    it "fails" do
-      expect { subject }.to raise_error(StandardError)
-    end
-  end
-
-  context "without unit_count:" do
-    before { data.delete :unit_count }
-
-    it "fails" do
-      expect { subject }.to raise_error(StandardError)
-    end
-  end
-
   context "without currency:" do
     before { data.delete :currency }
 
@@ -181,12 +165,4 @@ RSpec.describe ABBYY::Cloud::Models::FullOrder do
       expect { subject }.to raise_error(StandardError)
     end
   end
-
-  context "without statistics:" do
-    before { data.delete :statistics }
-
-    it "fails" do
-      expect { subject }.to raise_error(StandardError)
-    end
-  end
 end

data/spec/unit/abbyy/cloud/models/translation_link_spec.rb

@@ -23,7 +23,6 @@ RSpec.describe ABBYY::Cloud::Models::TranslationLink do
       },
       started: "2016-03-13T10:00:00Z",
       delivered: "2019-03-14T11:00:00Z",
-      progress: 10,
       status: "InProgress"
     }
   end
@@ -55,12 +54,4 @@ RSpec.describe ABBYY::Cloud::Models::TranslationLink do
       expect { subject }.to raise_error(StandardError)
     end
   end
-
-  context "without progress:" do
-    before { data.delete :progress }
-
-    it "fails" do
-      expect { subject }.to raise_error(StandardError)
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abbyy-cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Andrew Kozin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-initializer
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +233,7 @@ files:
 - lib/abbyy/cloud/operations/base.rb
 - lib/abbyy/cloud/operations/download_file.rb
 - lib/abbyy/cloud/operations/engines.rb
+- lib/abbyy/cloud/operations/file.rb
 - lib/abbyy/cloud/operations/find_order.rb
 - lib/abbyy/cloud/operations/prices.rb
 - lib/abbyy/cloud/operations/submit_order.rb