abbyy-cloud 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 938b0d59f4470c20fcf36a978dc3af2cc452f572
-  data.tar.gz: 7f714120a1f2f07cfb70584a0665f6c83beb754f
+  metadata.gz: a2c718870d311c032c56d09eaefe85358d8053c6
+  data.tar.gz: 6b5236b37d7d2362cdb46f390a99cc4ed4d84675
 SHA512:
-  metadata.gz: cd173cce75744e96fbd2d176c9f76436433312f4d29f623793acc6f87eea43de16e3bcf96fd88fc96be7a9242a7a97189280286ba5b4abdb43542d404fecf773
-  data.tar.gz: fb9899694839692475db2373b008ba9839ecd9f1e197de4e6cd42b85934f766fd58feae413dda05a3d58e3743d5247d3e8803a156f4b0b62bde062626da41978
+  metadata.gz: e18b7be8f087be2564513df127d8676f7a0047cf807fc7ad8b12332505c69cad972c9c3ef76dcd74687ad3f57521bde7d1b27aad0f83b24729f6958d0fe87b4f
+  data.tar.gz: 7db9109e79a27f3100ad6e198b5e4f967e61662d181da6cb351c8e3ee5bb298f4e69a0fe60c038fdcb89699c800cce344e994fb6787d64a36510abb331803083

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Master (to be released)
 
-[Compare v0.0.8...HEAD](https://github.com/nepalez/abbyy-cloud/compare/v0.0.8...HEAD)
+[Compare v0.0.9...HEAD](https://github.com/nepalez/abbyy-cloud/compare/v0.0.9...HEAD)
+
+# [v0.0.9 2016-10-11](https://github.com/nepalez/abbyy-cloud/tree/v0.0.9)
+
+### Internal
+
+* Update dependency from the `dry-initializer` gem (nepalez)
+* Switch from Dry::Struct to native ABBYY::Cloud::Model (nepalez)
+* Drop dependency from `dry-struct` gem (nepalez)
+
+[Compare v0.0.8...v0.0.9](https://github.com/nepalez/abbyy-cloud/compare/v0.0.8...v0.0.9)
 
 # [v0.0.8 2016-09-17](https://github.com/nepalez/abbyy-cloud/tree/v0.0.8)
 

data/abbyy-cloud.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name     = "abbyy-cloud"
-  gem.version  = "0.0.8"
+  gem.version  = "0.0.9"
   gem.authors  = ["Andrew Kozin"]
   gem.email    = ["andrew.kozin@gmail.com"]
   gem.summary  = "HTTP client to ABBYY Cloud API"
@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.3.0"
 
-  gem.add_runtime_dependency "dry-initializer", "~> 0.4.0"
-  gem.add_runtime_dependency "dry-struct", "~> 0.0.1"
+  gem.add_runtime_dependency "dry-initializer", "~> 0.6"
+  gem.add_runtime_dependency "dry-types", "~> 0.9.0"
   gem.add_runtime_dependency "hashie", "~> 3.4"
   gem.add_runtime_dependency "multipart_body", "~> 0.2"
   gem.add_runtime_dependency "mime-types", "~> 3.1"

data/lib/abbyy/cloud.rb

@@ -1,5 +1,5 @@
 require "dry-initializer"
-require "dry-struct"
+require "dry-types"
 require "hashie/mash"
 require "json"
 require "net/http"
@@ -9,7 +9,7 @@ require "mime-types"
 
 module ABBYY
   class Cloud
-    require_relative "cloud/struct"
+    require_relative "cloud/model"
     require_relative "cloud/types"
     require_relative "cloud/connection"
     require_relative "cloud/settings"

data/lib/abbyy/cloud/exceptions/response_error.rb

@@ -5,14 +5,14 @@ class ABBYY::Cloud
     attr_reader :status, :data
 
     def initialize(response)
-      @data   = Models::Error[parse_response(response)]
       @status = response.code.to_i
+      @data   = Models::Error[parse_response(response)] unless @status == 500
 
       super <<-MESSAGE.gsub(/ +\|/, "")
-        |ABBYY Cloud API responded to the request #{data.request_id} with a status #{status}
-        |  error:       #{data.error}
-        |  description: #{data.error_description}
-        |  model_state: #{data.model_state}
+        |ABBYY Cloud API responded to the request #{data&.request_id} with a status #{status}
+        |  error:       #{data&.error}
+        |  description: #{data&.error_description}
+        |  model_state: #{data&.model_state}
       MESSAGE
     end
 

data/lib/abbyy/cloud/model.rb

@@ -0,0 +1,61 @@
+# Base structure for models describing parts of requests and responses
+#
+# The initializer accepts a hash with symbol/string keys,
+# from which it takes and validates necessary options.
+#
+# The method [#to_h] converts nested data to hash
+# with symbolic keys at any level of nesting.
+#
+class ABBYY::Cloud
+  class Model
+    class << self
+      include Dry::Initializer::Mixin
+      alias_method :attribute, :option
+      alias_method :param, :option
+
+      def new(value)
+        return value if value.is_a? self
+        value = value.to_h.each_with_object({}) do |(key, val), obj|
+          obj[key.to_sym] = val
+        end
+        super value
+      end
+      alias_method :call, :new
+      alias_method :[], :new
+    end
+
+    tolerant_to_unknown_options
+
+    def ==(other)
+      return false unless other.respond_to? :to_h
+      to_h == other.to_h
+    end
+
+    def to_h
+      attributes = method(:initialize)
+                   .parameters
+                   .map { |item| item[1] unless item[0] == :keyrest }.compact
+
+      attributes.each_with_object({}) do |key, hash|
+        val = send(key)
+        hash[key] = hashify(val) unless val == Dry::Initializer::UNDEFINED
+      end
+    end
+    alias_method :[], :send
+
+    private
+
+    def hashify(value)
+      if value.is_a? ABBYY::Cloud::Model
+        value.to_h
+      elsif value.respond_to? :to_hash
+        value.to_hash
+             .each_with_object({}) { |(key, val), obj| obj[key] = hashify(val) }
+      elsif value.is_a? Enumerable
+        value.map { |val| hashify(val) }
+      else
+        value
+      end
+    end
+  end
+end

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

@@ -2,9 +2,9 @@ require_relative "locale"
 
 class ABBYY::Cloud
   module Models
-    class Direction < Struct
-      attribute :source, Types::Locale
-      attribute :target, Types::Locale
+    class Direction < Model
+      attribute :source, type: Types::Locale
+      attribute :target, type: Types::Locale
     end
 
     # Registers type Types::Direction

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

@@ -2,9 +2,9 @@ require_relative "discount_type"
 
 class ABBYY::Cloud
   module Models
-    class Discount < Struct
-      attribute :discount_type, Types::DiscountType
-      attribute :discount,      Types::Coercible::Float
+    class Discount < Model
+      attribute :discount_type, type: Types::DiscountType
+      attribute :discount,      type: Types::Coercible::Float
     end
 
     # Registers type Types::Discount

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

@@ -3,10 +3,11 @@ require_relative "direction"
 
 class ABBYY::Cloud
   module Models
-    class Engine < Struct
-      attribute :name,                   Types::Strict::String
-      attribute :languages,              Types::Array.member(Types::Locale)
-      attribute :translation_directions, Types::Array.member(Types::Direction)
+    class Engine < Model
+      attribute :name,      type: Types::Strict::String
+      attribute :languages, type: Types::Array.member(Types::Locale)
+      attribute :translation_directions,
+                type: Types::Array.member(Types::Direction)
     end
 
     # Registers type Types::Engine

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

@@ -1,11 +1,12 @@
 class ABBYY::Cloud
   # Collection of models returned in requests
   module Models
-    class Error < Struct
-      attribute :request_id,        Types::Strict::String.optional
-      attribute :error,             Types::Strict::String.optional
-      attribute :error_description, Types::Strict::String.optional
-      attribute :model_state,       Types::Hash.optional
+    class Error < Model
+      attribute :request_id,        type: Types::Strict::String, optional: true
+      attribute :error,             type: Types::Strict::String, optional: true
+      attribute :error_description, type: Types::Strict::String, optional: true
+      attribute :model_state,       type: Types::Hash.constrained(type: Hash),
+                                    optional: true
     end
   end
 end

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

@@ -9,22 +9,25 @@ require_relative "text_statistics"
 class ABBYY::Cloud
   module Models
     class FileInfo < FileReference
-      attribute :name,               Types::Strict::String
-      attribute :mime,               Types::Strict::String
-      attribute :created,            Types::Form::Time
-      attribute :is_recognizable,    Types::Form::Bool
-      attribute :is_deleted,         Types::Form::Bool
-      attribute :reading_status,     Types::Strict::String
-      attribute :reading_progress,   Types::Coercible::Int
-      attribute :expected_languages, Types::Array.member(Types::Locale).optional
-      attribute :processed,          Types::Form::Time.optional
-      attribute :deleted,            Types::Form::Time.optional
-      attribute :error,              Types::Strict::String.optional
-      attribute :statistics,         Types::TextStatistics.optional
-      attribute :ocr_settings,       Types::OcrSettings.optional
-      attribute :ocr_statistics,     Types::OcrStatistics.optional
+      attribute :name,             type: Types::Strict::String
+      attribute :mime,             type: Types::Strict::String
+      attribute :created,          type: Types::Form::Time
+      attribute :is_recognizable,  type: Types::Form::Bool
+      attribute :is_deleted,       type: Types::Form::Bool
+      attribute :reading_status,   type: Types::Strict::String
+      attribute :reading_progress, type: Types::Coercible::Int
+      attribute :processed,        type: Types::Form::Time,     optional: true
+      attribute :deleted,          type: Types::Form::Time,     optional: true
+      attribute :error,            type: Types::Strict::String, optional: true
+      attribute :statistics,       type: Types::TextStatistics, optional: true
+      attribute :ocr_settings,     type: Types::OcrSettings,    optional: true
+      attribute :ocr_statistics,   type: Types::OcrStatistics,  optional: true
+      attribute :expected_languages,
+                type: Types::Array.member(Types::Locale),
+                optional: true
       attribute :ocr_warnings,
-                Types::Array.member(Types::OcrWarning).optional
+                type: Types::Array.member(Types::OcrWarning),
+                optional: true
     end
 
     # Registers type Types::FileInfo

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

@@ -4,12 +4,12 @@ require_relative "locale"
 class ABBYY::Cloud
   module Models
     class FileLink < FileReference
-      attribute :name,        Types::Strict::String
-      attribute :language,    Types::Locale
-      attribute :is_deleted,  Types::Form::Bool
-      attribute :chars_count, Types::Coercible::Int.optional
-      attribute :words_count, Types::Coercible::Int.optional
-      attribute :pages_count, Types::Coercible::Int.optional
+      attribute :name,        type: Types::Strict::String
+      attribute :language,    type: Types::Locale
+      attribute :is_deleted,  type: Types::Form::Bool
+      attribute :chars_count, type: Types::Coercible::Int, optional: true
+      attribute :words_count, type: Types::Coercible::Int, optional: true
+      attribute :pages_count, type: Types::Coercible::Int, optional: true
     end
 
     # Registers type Types::FileLink

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

@@ -1,8 +1,8 @@
 class ABBYY::Cloud
   module Models
-    class FileReference < Struct
-      attribute :id,    Types::Strict::String
-      attribute :token, Types::Strict::String
+    class FileReference < Model
+      attribute :id,    type: Types::Strict::String
+      attribute :token, type: Types::Strict::String
     end
 
     # Registers type Types::FileReference

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

@@ -10,34 +10,36 @@ require_relative "unit_type"
 
 class ABBYY::Cloud
   module Models
-    class FullOrder < Struct
-      attribute :amount, Types::Coercible::Float.optional
-      attribute :approval_required, Types::Form::Bool
-      attribute :created, Types::Form::Time
-      attribute :currency, Types::Currency
-      attribute :deadline, Types::Form::Time.optional
-      attribute :deleted, Types::Form::Time.optional
-      attribute :delivered, Types::Form::Time.optional
-      attribute :email, Types::Strict::String
-      attribute :from, Types::Locale
-      attribute :id, Types::Strict::String
-      attribute :is_deleted, Types::Form::Bool
-      attribute :is_layout_required, Types::Form::Bool
-      attribute :is_manual_estimation, Types::Form::Bool
-      attribute :label, Types::Label.optional
-      attribute :number, Types::Coercible::Int
-      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.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.optional
-      attribute :unit_type, Types::UnitType.optional
-      attribute :units_count, Types::Hash.optional
+    class FullOrder < Model
+      attribute :amount, type: Types::Coercible::Float, optional: true
+      attribute :approval_required, type: Types::Form::Bool,
+                                    default: proc { false }
+      attribute :created, type: Types::Form::Time.constrained(type: Time)
+      attribute :currency, type: Types::Currency
+      attribute :deadline, type: Types::Form::Time, optional: true
+      attribute :deleted, type: Types::Form::Time, optional: true
+      attribute :delivered, type: Types::Form::Time, optional: true
+      attribute :email, type: Types::Strict::String
+      attribute :from, type: Types::Locale
+      attribute :id, type: Types::Strict::String
+      attribute :is_deleted, type: Types::Form::Bool
+      attribute :is_layout_required, type: Types::Form::Bool
+      attribute :is_manual_estimation, type: Types::Form::Bool,
+                                       default: proc { false }
+      attribute :label, type: Types::Label, optional: true
+      attribute :number, type: Types::Coercible::Int
+      attribute :payment_provider, type: Types::Strict::String, optional: true
+      attribute :payment_type, type: Types::PaymentType
+      attribute :progress, type: Types::Coercible::Int
+      attribute :started, type: Types::Form::Time, optional: true
+      attribute :statistics, type: Types::OrderStatistics, optional: true
+      attribute :status, type: Types::Status
+      attribute :to, type: Types::FilledArray.member(Types::Locale)
+      attribute :translations, type: Types::Array.member(Types::TranslationLink)
+      attribute :type, type: Types::TranslationType
+      attribute :unit_count, type: Types::Coercible::Int, optional: true
+      attribute :unit_type, type: Types::UnitType, optional: true
+      attribute :units_count, type: Types::Hash, optional: true
     end
 
     # Registers type Types::FullOrder

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

@@ -4,10 +4,10 @@ require_relative "ocr_quality"
 
 class ABBYY::Cloud
   module Models
-    class OcrSettings < Struct
-      attribute :format,  Types::FileFormat
-      attribute :mode,    Types::OcrMode
-      attribute :quality, Types::OcrQuality
+    class OcrSettings < Model
+      attribute :format,  type: Types::FileFormat
+      attribute :mode,    type: Types::OcrMode
+      attribute :quality, type: Types::OcrQuality
     end
 
     # Registers type Types::OcrSettings

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

@@ -1,10 +1,10 @@
 class ABBYY::Cloud
   module Models
-    class OcrStatistics < Struct
-      attribute :exported_pages,       Types::Coercible::Int
-      attribute :total_characters,     Types::Coercible::Int
-      attribute :uncertain_characters, Types::Coercible::Int
-      attribute :success_part,         Types::Coercible::Float
+    class OcrStatistics < Model
+      attribute :exported_pages,       type: Types::Coercible::Int
+      attribute :total_characters,     type: Types::Coercible::Int
+      attribute :uncertain_characters, type: Types::Coercible::Int
+      attribute :success_part,         type: Types::Coercible::Float
     end
 
     # Registers type Types::OcrStatistics

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

@@ -2,12 +2,15 @@ require_relative "ocr_warning_type"
 
 class ABBYY::Cloud
   module Models
-    class OcrWarning < Struct
-      attribute :warning_type,         Types::OcrWarningType
-      attribute :page_number,          Types::Coercible::Int
-      attribute :dpi,                  Types::Coercible::Int.optional
-      attribute :language_count,       Types::Coercible::Int.optional
-      attribute :full_warning_message, Types::Strict::String.optional
+    class OcrWarning < Model
+      attribute :warning_type,         type: Types::OcrWarningType
+      attribute :page_number,          type: Types::Coercible::Int
+      attribute :dpi,                  type: Types::Coercible::Int,
+                                       optional: true
+      attribute :language_count,       type: Types::Coercible::Int,
+                                       optional: true
+      attribute :full_warning_message, type: Types::Strict::String,
+                                       optional: true
     end
 
     # Registers type Types::OcrWarning

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

@@ -2,11 +2,11 @@ require_relative "source_tag"
 
 class ABBYY::Cloud
   module Models
-    class OrderStatistics < Struct
-      attribute :documents_count, Types::Coercible::Int
-      attribute :pages_count,     Types::Coercible::Int
-      attribute :words_count,     Types::Coercible::Int
-      attribute :chars_count,     Types::Coercible::Int
+    class OrderStatistics < Model
+      attribute :documents_count, type: Types::Coercible::Int
+      attribute :pages_count,     type: Types::Coercible::Int
+      attribute :words_count,     type: Types::Coercible::Int
+      attribute :chars_count,     type: Types::Coercible::Int
     end
 
     # Registers type Types::OrderStatistics

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

@@ -5,15 +5,15 @@ require_relative "discount"
 class ABBYY::Cloud
   module Models
     # Price details
-    class Price < Struct
-      attribute :id,          Types::Strict::String
-      attribute :account_id,  Types::Strict::String.optional
-      attribute :type,        Types::Strict::String
-      attribute :from,        Types::Locale
-      attribute :to,          Types::Locale
-      attribute :unit_prices, Types::Array.member(Types::UnitPrice)
-      attribute :discounts,   Types::Array.member(Types::Discount)
-      attribute :created,     Types::Coercible::Time
+    class Price < Model
+      attribute :id,          type: Types::Strict::String
+      attribute :account_id,  type: Types::Strict::String, optional: true
+      attribute :type,        type: Types::Strict::String
+      attribute :from,        type: Types::Locale
+      attribute :to,          type: Types::Locale
+      attribute :unit_prices, type: Types::Array.member(Types::UnitPrice)
+      attribute :discounts,   type: Types::Array.member(Types::Discount)
+      attribute :created,     type: Types::Coercible::Time
     end
 
     # Registers type Types::Price

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

@@ -2,9 +2,10 @@ require_relative "source_tag"
 
 class ABBYY::Cloud
   module Models
-    class SourceSegment < Struct
-      attribute :text, Types::Strict::String
-      attribute :tags, Types::Array.member(Types::SourceTag).default([])
+    class SourceSegment < Model
+      attribute :text, type: Types::Strict::String
+      attribute :tags, type: Types::Array.member(Types::SourceTag),
+                       default: proc { [] }
     end
 
     # Registers type Types::SourceSegment

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

@@ -2,10 +2,11 @@ class ABBYY::Cloud
   module Models
     TYPES = %w(Start End Placeholder).freeze
 
-    class SourceTag < Struct
-      attribute :number, Types::Strict::Int
-      attribute :position, Types::Strict::Int
-      attribute :type, Types::Strict::String.constrained(included_in: TYPES)
+    class SourceTag < Model
+      attribute :number,   type: Types::Strict::Int
+      attribute :position, type: Types::Strict::Int
+      attribute :type,
+                type: Types::Strict::String.constrained(included_in: TYPES)
     end
 
     # Registers type Types::SourceTag

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

@@ -2,11 +2,11 @@ require_relative "source_tag"
 
 class ABBYY::Cloud
   module Models
-    class TextStatistics < Struct
-      attribute :language,    Types::Locale
-      attribute :pages_count, Types::Coercible::Int
-      attribute :words_count, Types::Coercible::Int
-      attribute :chars_count, Types::Coercible::Int
+    class TextStatistics < Model
+      attribute :language,    type: Types::Locale
+      attribute :pages_count, type: Types::Coercible::Int
+      attribute :words_count, type: Types::Coercible::Int
+      attribute :chars_count, type: Types::Coercible::Int
     end
 
     # Registers type Types::TextStatistics

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

@@ -1,8 +1,8 @@
 class ABBYY::Cloud
   module Models
-    class TransferData < Struct
-      attribute :position, Types::Strict::Int
-      attribute :order,    Types::Strict::Int
+    class TransferData < Model
+      attribute :position, type: Types::Strict::Int
+      attribute :order,    type: Types::Strict::Int
     end
 
     # Registers type Types::TransferData

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

@@ -1,8 +1,8 @@
 class ABBYY::Cloud
   module Models
-    class Translation < Struct
-      attribute :id,          Types::Strict::String
-      attribute :translation, Types::Strict::String
+    class Translation < Model
+      attribute :id,          type: Types::Strict::String
+      attribute :translation, type: Types::Strict::String
     end
   end
 end

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

@@ -3,13 +3,13 @@ require_relative "file_link"
 
 class ABBYY::Cloud
   module Models
-    class TranslationLink < Struct
-      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
+    class TranslationLink < Model
+      attribute :delivered,   type: Types::Form::Time, optional: true
+      attribute :started,     type: Types::Form::Time, optional: true
+      attribute :progress,    type: Types::Hash,       default:  proc { {} }
+      attribute :status,      type: Types::Status
+      attribute :source_file, type: Types::FileLink
+      attribute :target_file, type: Types::FileLink
     end
 
     # Registers type Types::TranslationLink

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

@@ -2,11 +2,12 @@ require_relative "transfer_data"
 
 class ABBYY::Cloud
   module Models
-    class TranslationSegment < Struct
-      attribute :id,   Types::Strict::String
-      attribute :text, Types::Strict::String
+    class TranslationSegment < Model
+      attribute :id,   type: Types::Strict::String
+      attribute :text, type: Types::Strict::String
       attribute :tags_transfer_data,
-                Types::Array.member(Types::TransferData).default([])
+                type: Types::Array.member(Types::TransferData),
+                default: proc { [] }
     end
 
     # Registers type Types::TranslationSegment

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

@@ -4,10 +4,10 @@ require_relative "unit_type"
 class ABBYY::Cloud
   module Models
     # Price details
-    class UnitPrice < Struct
-      attribute :unit_type, Types::UnitType
-      attribute :currency,  Types::Currency
-      attribute :amount,    Types::Coercible::Float
+    class UnitPrice < Model
+      attribute :unit_type, type: Types::UnitType
+      attribute :currency,  type: Types::Currency
+      attribute :amount,    type: Types::Coercible::Float
     end
 
     # Registers type Types::UnitPrice

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

@@ -1,7 +1,7 @@
 require_relative "file"
 
 # Base class for specific operations
-# It validates request and response using corresponding structs
+# It validates request and response using corresponding models
 #
 # @abstract
 #
@@ -28,32 +28,32 @@ class ABBYY::Cloud
           value ? (@request_type = value) : (@request_type || :json)
         end
 
-        def request_body(struct = nil, &block)
-          provide_struct :@request_body, struct, &block
+        def request_body(model = nil, &block)
+          provide_model :@request_body, model, &block
         end
 
-        def request_query(struct = nil, &block)
-          provide_struct :@request_query, struct, &block
+        def request_query(model = nil, &block)
+          provide_model :@request_query, model, &block
         end
 
         def response_type(value = nil)
           value ? (@response_type = value) : (@response_type || :json)
         end
 
-        def response_body(struct = nil, &block)
-          provide_struct :@response_body, struct, &block
+        def response_body(model = nil, &block)
+          provide_model :@response_body, model, &block
         end
 
         private
 
-        def provide_struct(variable, struct, &block)
+        def provide_model(variable, model, &block)
           value = instance_variable_get(variable)
-          return value if value && struct.nil? && block.nil?
+          return value if value && model.nil? && block.nil?
 
-          struct ||= Class.new(Struct)
-                          .tap { |obj| obj.instance_eval(&block) if block }
+          model ||= Class.new(Model)
+                         .tap { |obj| obj.instance_eval(&block) if block }
 
-          instance_variable_set(variable, struct)
+          instance_variable_set(variable, model)
         end
       end
 

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

@@ -10,11 +10,11 @@ class ABBYY::Cloud
       http_method "get"
 
       request_query do
-        attribute :skip, Types::Strict::Int
-        attribute :take, Types::Strict::Int
-        attribute :type, Types::Strict::String.optional
-        attribute :from, Types::Locale.optional
-        attribute :to,   Types::Locale.optional
+        attribute :skip, type: Types::Strict::Int
+        attribute :take, type: Types::Strict::Int
+        attribute :type, type: Types::Strict::String, optional: true
+        attribute :from, type: Types::Locale,         optional: true
+        attribute :to,   type: Types::Locale,         optional: true
       end
 
       response_body Types::Array.member(Types::Price)

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

@@ -10,22 +10,26 @@ class ABBYY::Cloud
       http_method "post"
 
       request_body do
-        attribute :type, Types::TranslationType
-        attribute :email, Types::Strict::String.optional
-        attribute :contact_culture, Types::Strict::String.optional
-        attribute :contact_utc_offset, Types::Coercible::String.optional
-        attribute :mt_engine, Types::Strict::String.optional
-        attribute :approval_required, Types::Form::Bool
-        attribute :is_manual_estimation, Types::Form::Bool
-        attribute :unit_type, Types::UnitType
-        attribute :currency, Types::Currency
-        attribute :from, Types::Locale
-        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
-        attribute :cost_type,
-                  Types::CostType.default(Models::CostType.new("Default"))
+        attribute :type, type: Types::TranslationType
+        attribute :email, type: Types::Strict::String, optional: true
+        attribute :contact_culture, type: Types::Strict::String, optional: true
+        attribute :contact_utc_offset, type: Types::Coercible::String,
+                                       optional: true
+        attribute :mt_engine, type: Types::Strict::String,
+                              default: proc { false }
+        attribute :approval_required, type: Types::Form::Bool,
+                                      default: proc { false }
+        attribute :is_manual_estimation, type: Types::Form::Bool,
+                                         optional: proc { false }
+        attribute :unit_type, type: Types::UnitType
+        attribute :currency, type: Types::Currency
+        attribute :from, type: Types::Locale
+        attribute :label, type: Types::Label, optional: true
+        attribute :to, type: Types::FilledArray.member(Types::Locale)
+        attribute :files, type: Types::FilledArray.member(Types::FileReference)
+        attribute :category, type: Types::Strict::String, optional: true
+        attribute :cost_type, type:    Types::CostType,
+                              default: proc { Models::CostType.new("Default") }
       end
 
       response_body Models::FullOrder

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

@@ -8,10 +8,10 @@ class ABBYY::Cloud
       http_method "post"
 
       request_body do
-        attribute :engine,          Types::Strict::String
-        attribute :source_language, Types::Locale
-        attribute :target_language, Types::Locale
-        attribute :source_text,     Types::Strict::String
+        attribute :engine,          type: Types::Strict::String
+        attribute :source_language, type: Types::Locale
+        attribute :target_language, type: Types::Locale
+        attribute :source_text,     type: Types::Strict::String
       end
 
       response_body Models::Translation

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

@@ -10,10 +10,10 @@ class ABBYY::Cloud
       http_method "post"
 
       request_body do
-        attribute :engine,  Types::Strict::String
-        attribute :from,    Types::Locale
-        attribute :to,      Types::Locale
-        attribute :sources, Types::Array.member(Types::SourceSegment)
+        attribute :engine,  type: Types::Strict::String
+        attribute :from,    type: Types::Locale
+        attribute :to,      type: Types::Locale
+        attribute :sources, type: Types::Array.member(Types::SourceSegment)
       end
 
       response_body Types::Array.member(Types::TranslationSegment)

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

@@ -10,10 +10,11 @@ class ABBYY::Cloud
       request_type :file
 
       request_query do
-        attribute :quality,       Types::OcrQuality.optional
-        attribute :synthesisMode, Types::OcrMode.optional
-        attribute :exportFormat,  Types::FileFormat.optional
-        attribute :languages,     Types::Array.member(Types::Locale).optional
+        attribute :quality,       type: Types::OcrQuality, optional: true
+        attribute :synthesisMode, type: Types::OcrMode,    optional: true
+        attribute :exportFormat,  type: Types::FileFormat, optional: true
+        attribute :languages,     type: Types::Array.member(Types::Locale),
+                                  optional: true
       end
 
       response_body Types::Array.member(Types::FileInfo)

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

@@ -3,7 +3,7 @@ RSpec.describe ABBYY::Cloud::Models::Direction do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "with invalid source:" do

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

@@ -3,7 +3,7 @@ RSpec.describe ABBYY::Cloud::Models::Discount do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "with invalid discount_type:" do

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

@@ -9,7 +9,7 @@ RSpec.describe ABBYY::Cloud::Models::Engine do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "without name:" do

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

@@ -13,12 +13,12 @@ RSpec.describe ABBYY::Cloud::Models::Error do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "without params" do
     let(:data) { {} }
-    it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+    it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   end
 
   context "with invalid request_id:" do

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

@@ -14,7 +14,7 @@ RSpec.describe ABBYY::Cloud::Models::FileLink do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "without id:" do

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

@@ -3,7 +3,7 @@ RSpec.describe ABBYY::Cloud::Models::FileReference do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "without id:" do

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

@@ -68,7 +68,7 @@ RSpec.describe ABBYY::Cloud::Models::FullOrder do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
 
   context "without translations:" do
     before { data.delete :translations }

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

@@ -10,6 +10,6 @@ RSpec.describe ABBYY::Cloud::Models::OrderStatistics do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 end

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

@@ -14,7 +14,7 @@ RSpec.describe ABBYY::Cloud::Models::Price do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "without id:" do

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

@@ -8,7 +8,7 @@ RSpec.describe ABBYY::Cloud::Models::SourceSegment do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "without text:" do

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

@@ -3,7 +3,7 @@ RSpec.describe ABBYY::Cloud::Models::SourceTag do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "with invalid number:" do

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

@@ -3,7 +3,7 @@ RSpec.describe ABBYY::Cloud::Models::TransferData do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "with invalid order:" do

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

@@ -29,7 +29,7 @@ RSpec.describe ABBYY::Cloud::Models::TranslationLink do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
 
   context "without source_file:" do
     before { data.delete :source_file }

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

@@ -9,7 +9,7 @@ RSpec.describe ABBYY::Cloud::Models::TranslationSegment do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "without text:" do

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

@@ -3,7 +3,7 @@ RSpec.describe ABBYY::Cloud::Models::Translation do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "with invalid id:" do

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

@@ -3,7 +3,7 @@ RSpec.describe ABBYY::Cloud::Models::UnitPrice do
 
   subject { described_class.new(data) }
 
-  it { is_expected.to be_kind_of ABBYY::Cloud::Struct }
+  it { is_expected.to be_kind_of ABBYY::Cloud::Model }
   its(:to_h) { is_expected.to eq data }
 
   context "with invalid unit_type:" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abbyy-cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Andrew Kozin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-initializer
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: dry-struct
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - lib/abbyy/cloud/exceptions/argument_error.rb
 - lib/abbyy/cloud/exceptions/response_error.rb
 - lib/abbyy/cloud/exceptions/type_error.rb
+- lib/abbyy/cloud/model.rb
 - lib/abbyy/cloud/models/cost_type.rb
 - lib/abbyy/cloud/models/currency.rb
 - lib/abbyy/cloud/models/direction.rb
@@ -241,7 +242,6 @@ files:
 - lib/abbyy/cloud/operations/translate_segments.rb
 - lib/abbyy/cloud/operations/upload_file.rb
 - lib/abbyy/cloud/settings.rb
-- lib/abbyy/cloud/struct.rb
 - lib/abbyy/cloud/types.rb
 - spec/feature/abbyy/files_download_spec.rb
 - spec/feature/abbyy/files_upload_spec.rb

data/lib/abbyy/cloud/struct.rb

@@ -1,13 +0,0 @@
-class ABBYY::Cloud::Struct < Dry::Struct
-  class << self
-    def new(data)
-      default = schema.keys.each_with_object({}) { |key, hash| hash[key] = nil }
-      actual  = data.to_hash.each_with_object({}) do |(key, val), hash|
-        hash[key.to_sym] = val
-      end
-
-      super default.merge(actual)
-    end
-    alias_method :[], :new
-  end
-end