evil-client 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2740449772138472d84ec8f0a8f4e5fdeea23af8
-  data.tar.gz: d165a97dababfa3e40f1838a18d06b61847ff1da
+  metadata.gz: 4e0323c33d7f3cf56d4aca84057aef698e57efbb
+  data.tar.gz: fde6a5543b7c8775350d18cf805b8efe277d65cb
 SHA512:
-  metadata.gz: 4274645076138cbba089ecbcc3c3c4034e50789c7128e06b1abb45e9316c41908cf367174002227ddc51e124bd2963a4b0de3ba7a5be8e3bee345ba34e2cf92b
-  data.tar.gz: 98cc762b3c67d6688879dd3724a24c19ab78823acb162f9c6ea94e8fd4f53aa1f44834f005df3e99f483128ba2de7e43549823135e71b2e136927ec844deb5bd
+  metadata.gz: 4bcaf9be801454e01f7a99d0385f71eafabbe6e98955ea24b3541d0a5a68bfb88e891ca714736354a8bbd3e45c57c4936ee84e2a2f65abd4606b4b45dc53b149
+  data.tar.gz: 21161df236b8079fb8511bac24f5a3c87e4054803d18f7811a0d46a68941595ed4a5de59517e856c1e4a9ce8f1ef9022eeebf7e67a7dc4b9154303e684ebb09d

data/.rubocop.yml

@@ -15,6 +15,9 @@ Style/Alias:
 Style/ClassAndModuleChildren:
   Enabled: false
 
+Style/DateTime:
+  Enabled: false
+
 Style/FileName:
   Exclude:
     - lib/evil-client.rb

data/CHANGELOG.md

@@ -4,6 +4,55 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog], and this project adheres
 to [Semantic Versioning].
 
+## [2.1.0] [WIP]
+
+### Added
+
+- Class `Evil::Client::Model` (nepalez)
+  Describes standalone model with `.option`, `.let`, and `.validate` extracted
+  from `Evil::Client::Settings`.
+
+- Module `Evil::Client::Dictionary` (nepalez)
+  Describes a yaml dictionary-based collection of items
+
+- Helper method `extend` to inject a model into another model, or settings (nepalez)
+
+  ```ruby
+  operation :update_user do
+    extend User # takes option-s, let-s, and validate-s from User
+  end
+  ```
+
+- Method to pass response handling to parent scopes by @Envek ([#21](https://github.com/evilmartians/evil-client/pull/21]))
+
+  Allow to handle specific cases in operations and common cases in parent scopes.
+
+  ```ruby
+  scope :entities do
+    operation :create do
+      response(409) do |_, _, (data, *)|
+        super! unless data["errorCode"] == "201"
+        raise YourAPI::AlreadyExists, data["errorMessage"]
+      end
+    end
+
+    response(409) do |_, _, (data, *)|
+      raise YourAPI::Error, data.dig["errorsMessage"]
+    end
+  end
+  ```
+
+### Fixed
+
+- Generation of English error messages in case of using non-English locales
+
+### Changed
+
+- Version requirement for tram-policy is limited due to regression in 0.2.4
+
+  See https://github.com/tram-rb/tram-policy/commit/874c8f61399dbe174c158fec729d16c2b1ffb2fd#r26432444
+
+
 ## [2.0.0] [2017-09-02]
 
 ### Changed
@@ -381,11 +430,13 @@ formats will be added.
   response :not_found, 404, format: "json", raise: true
   ```
 
-[1.1.0]: https://github.com/evilmartians/evil-client/compare/v1.0.0...v1.1.0
-[1.0.0]: https://github.com/evilmartians/evil-client/compare/v0.3.3...v1.0.0
-[0.3.3]: https://github.com/evilmartians/evil-client/compare/v0.3.2...v0.3.3
-[0.3.2]: https://github.com/evilmartians/evil-client/compare/v0.3.1...v0.3.2
-[0.3.1]: https://github.com/evilmartians/evil-client/compare/v0.3.0...v0.3.1
 [Keep a Changelog]: http://keepachangelog.com/
 [Semantic Versioning]: http://semver.org/
 [dry-initializer]: http://github.com/dry-rb/dry-initalizer
+[0.3.1]: https://github.com/evilmartians/evil-client/compare/v0.3.0...v0.3.1
+[0.3.2]: https://github.com/evilmartians/evil-client/compare/v0.3.1...v0.3.2
+[0.3.3]: https://github.com/evilmartians/evil-client/compare/v0.3.2...v0.3.3
+[1.0.0]: https://github.com/evilmartians/evil-client/compare/v0.3.3...v1.0.0
+[1.1.0]: https://github.com/evilmartians/evil-client/compare/v1.0.0...v1.1.0
+[2.0.0]: https://github.com/evilmartians/evil-client/compare/v1.1.0...v2.0.0
+[2.1.0]: https://github.com/evilmartians/evil-client/compare/v2.0.0...v2.1.0

data/docs/helpers/response.md

@@ -32,6 +32,31 @@ response 400, 422 do |_status, *|
 end
 ```
 
+In case if you want to implement hierarchical processing of errors from more specific to certain operations or scopes to common errors of whole API, you can call `super!` method from response handler when you want to delegate handling to parent scope:
+
+```ruby
+class YourAPI < Evil::Client
+  scope :entities do
+    operation :create do
+      response(409) do |_, _, body|
+        data = JSON.parse(body.first)
+        case data.dig("errors", 0, "errorId")
+        when 35021
+          raise YourAPI::AlreadyExists, data.dig("errors", 0, "message")
+        else
+          super!
+        end
+      end
+    end
+  end
+
+  response(409) do |_, _, body|
+    data = JSON.parse(body.first)
+    raise EbayAPI::Error, data.dig("errors", 0, "message")
+  end
+end
+```
+
 When you use client-specific [middleware], the `response` block will receive the result already processed by the whole middleware stack. The helper will serve a final step of its handling. Its result wouldn't be processed further in any way.
 
 If a remote API will respond with a status, not defined for the operation, the `Evil::Client::ResponseError` will be risen. The exception carries both the response, and all its parts (status, headers, and body).

data/evil-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "evil-client"
-  gem.version  = "2.0.0"
+  gem.version  = "2.1.0"
   gem.author   = ["Andrew Kozin (nepalez)", "Ravil Bairamgalin (brainopia)"]
   gem.email    = ["andrew.kozin@gmail.com", "nepalez@evilmartians.com"]
   gem.homepage = "https://github.com/evilmartians/evil-client"
@@ -13,10 +13,10 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = "~> 2.3"
 
-  gem.add_runtime_dependency "dry-initializer", "~> 2.0.0"
-  gem.add_runtime_dependency "tram-policy", "~> 0.2.1"
+  gem.add_runtime_dependency "dry-initializer", "~> 2.1"
   gem.add_runtime_dependency "mime-types", "~> 3.1"
   gem.add_runtime_dependency "rack", "~> 2"
+  gem.add_runtime_dependency "tram-policy", "~> 0.2.2", "<= 0.2.3"
 
   gem.add_development_dependency "rake", ">= 10"
   gem.add_development_dependency "rspec", "~> 3.0"

data/lib/evil/client.rb

@@ -30,6 +30,7 @@ module Evil
     require_relative "client/chaining"
     require_relative "client/options"
     require_relative "client/policy"
+    require_relative "client/model"
     require_relative "client/settings"
     require_relative "client/schema"
     require_relative "client/container"
@@ -37,6 +38,7 @@ module Evil
     require_relative "client/connection"
     require_relative "client/formatter"
     require_relative "client/resolver"
+    require_relative "client/dictionary"
 
     include Chaining
 
@@ -59,12 +61,8 @@ module Evil
       # Sets a custom connection, or resets it to a default one
       #
       # @param  [#call, nil] connection
-      # @return [self]
       #
-      def connection=(connection)
-        @connection = connection
-        self
-      end
+      attr_writer :connection
 
       # Schema for the root scope of the client
       #
@@ -106,7 +104,6 @@ module Evil
     #
     def logger=(logger)
       @scope.logger = logger
-      self
     end
 
     # Operations defined at the root of the client
@@ -141,6 +138,17 @@ module Evil
       @scope.options
     end
 
+    # Human-readable representation of the client
+    #
+    # @return [String]
+    #
+    def inspect
+      vars = options.map { |k, v| "@#{k}=#{v}" }.join(", ")
+      "#<#{self.class}:#{format('0x%014x', object_id)} #{vars}>"
+    end
+    alias to_s   inspect
+    alias to_str inspect
+
     private
 
     def initialize(**options)

data/lib/evil/client/dictionary.rb

@@ -0,0 +1,77 @@
+class Evil::Client
+  # Class-level methods
+  module Dictionary
+    include Enumerable
+
+    # Exception to be risen when item cannot be found in a dictionary
+    Error = Class.new(ArgumentError)
+
+    # Raw data for the dictionary items
+    # @return [String]
+    def raw
+      @raw ||= []
+    end
+
+    # List of the dictionary items
+    # @return [Array<Evil::Client::Dictionary>]
+    def all
+      @all ||= raw.map { |item| new(item) }
+    end
+
+    # Iterates by dictionary items
+    # @return [Enumerator<Evil::Client::Dictionary>]
+    def each
+      block_given? ? all.each { |item| yield(item) } : all.to_enum
+    end
+
+    # Calls the item and raises when it is not in the dictionary
+    #
+    # @param  [Evil::Client::Dictionary] item
+    # @return [Evil::Client::Dictionary]
+    # @raise  [Evil::Client::Dictionary::Error]
+    #
+    def call(item)
+      return item if all.include? item
+      raise Error, "#{item} is absent in the dictionary #{self}"
+    end
+
+    # Alias for [.call]
+    #
+    # @param  [Evil::Client::Dictionary] item
+    # @return [Evil::Client::Dictionary]
+    # @raise  [Evil::Client::Dictionary::Error]
+    #
+    def [](item)
+      call(item)
+    end
+
+    class << self
+      # Loads [#raw] dictionary from YAML config file
+      #
+      # @param  [String] path
+      # @return [self]
+      #
+      def [](path)
+        file, paths = path.to_s.split("#")
+        list = YAML.load_file(file)
+        keys = paths.to_s.split("/").map(&:to_sym)
+        @raw = keys.any? ? Hash(list).dig(*keys) : list
+        self
+      end
+
+      private
+
+      def extended(klass)
+        super
+        klass.send :instance_variable_set, :@raw, @raw.to_a
+        @raw = nil
+      end
+
+      def included(klass)
+        super
+        klass.send :define_method, :raw, &@raw.method(:to_a)
+        @raw = nil
+      end
+    end
+  end
+end

data/lib/evil/client/model.rb

@@ -0,0 +1,126 @@
+class Evil::Client
+  #
+  # Data structure with validators and memoizers
+  #
+  class Model
+    extend Dry::Initializer
+
+    @policy = Policy
+
+    class << self
+      # @!method options(key, type = nil, opts = {})
+      # Creates or updates the settings' initializer
+      #
+      # @see [http://dry-rb.org/gems/dry-initializer]
+      #
+      # @param       [#to_sym] key        Symbolic name of the option
+      # @param       [#call]   type (nil) Type coercer for the option
+      # @option opts [#call]   :type      Another way to assign type coercer
+      # @option opts [#call]   :default   Proc containing default value
+      # @option opts [Boolean] :optional  Whether it can be missed
+      # @option opts [#to_sym] :as        The name of settings variable
+      # @option opts [false, :private, :protected] :reader Reader method type
+      # @return      [self]
+      #
+      def option(key, type = nil, as: key.to_sym, **opts)
+        NameError.check!(as)
+        super
+        self
+      end
+      undef_method :param # model initializes with [#options] only
+
+      # Creates or reloads memoized attribute
+      #
+      # @param [#to_sym] key The name of the attribute
+      # @param [Proc] block  The body of new attribute
+      # @return [self]
+      #
+      def let(key, &block)
+        NameError.check!(key)
+        lets[key.to_sym] = block
+
+        define_method(key) do
+          instance_variable_get(:"@#{key}") ||
+            instance_variable_set(:"@#{key}", instance_exec(&block))
+        end
+
+        self
+      end
+
+      # Definitions for virtual attributes
+      #
+      # @return [Hash<Symbol, Proc>]
+      #
+      def lets
+        @lets ||= {}
+      end
+
+      # Policy object for model instances
+      #
+      # @return [Evil::Client::Policy]
+      #
+      def policy
+        @policy ||= superclass.policy.for(self)
+      end
+
+      # Add validation rule to the [#policy]
+      #
+      # @param [Proc] block  The body of new attribute
+      # @return [self]
+      #
+      def validate(&block)
+        policy.validate(&block)
+        self
+      end
+
+      # Merges [.option]-s, virtual attributes [.let] and [.validation]-s
+      # from another model into the current one.
+      #
+      # @param  [Evil::Client::Model] other
+      # @return [self]
+      #
+      # rubocop: disable Metrics/AbcSize
+      def extend(other)
+        return super if other.instance_of? Module
+
+        unless other.ancestors.include? Evil::Client::Model
+          raise TypeError, "#{other} is not a subclass of Evil::Client::Model"
+        end
+
+        other.dry_initializer.options.each do |definition|
+          option definition.source, definition.options
+        end
+
+        other.lets.each { |key, block| let(key, &block) }
+        other.policy.all.each { |validator| policy.local << validator }
+      end
+      # rubocop: enable Metrics/AbcSize
+
+      # Model instance constructor
+      #
+      # @param  [Hash] op Model options
+      # @return [Evil::Client::Model]
+      #
+      def new(op = {})
+        op = Hash(op).each_with_object({}) { |(k, v), obj| obj[k.to_sym] = v }
+        super(op).tap { |item| in_english { policy[item].validate! } }
+      rescue StandardError => error
+        raise ValidationError, error.message
+      end
+      alias call new
+      alias []   call
+
+      private
+
+      def in_english(&block)
+        unless I18n.available_locales.include?(:en)
+          available_locales = I18n.available_locales
+          I18n.available_locales += %i[en]
+        end
+        I18n.with_locale(:en, &block)
+      ensure
+        I18n.available_locales = available_locales if available_locales
+      end
+    end
+  end
+end

data/lib/evil/client/policy.rb

@@ -4,29 +4,29 @@ class Evil::Client
   #
   class Policy < Tram::Policy
     class << self
-      # Subclasses itself for a settings class
+      # Subclasses itself for a model class
       #
-      # @param  [Class] settings Settings class to validate
+      # @param  [Class] model Settings class to validate
       # @return [Class]
       #
-      def for(settings)
+      def for(model)
         Class.new(self).tap do |klass|
-          klass.send :instance_variable_set, :@settings, settings
+          klass.send :instance_variable_set, :@model, model
         end
       end
 
-      # Reference to the settings class whose instances validates the policy
+      # Reference to the model whose instances are validated by the policy
       #
       # @return [Class, nil]
       #
-      attr_reader :settings
+      attr_reader :model
 
-      # Delegates the name of the policy to the name of checked settings
+      # Delegates the name of the policy to the name of checked model
       #
       # @return [String, nil]
       #
       def name
-        "#{settings}.policy"
+        "#{model}.policy"
       end
       alias_method :to_s,    :name
       alias_method :to_sym,  :name
@@ -36,21 +36,21 @@ class Evil::Client
 
       def scope
         @scope ||= %i[evil client errors] << \
-                   Tram::Policy::Inflector.underscore(settings.to_s)
+                   Tram::Policy::Inflector.underscore(model.to_s)
       end
     end
 
     # An instance of settings to be checked by the policy
-    param :settings
+    param :model
 
     private
 
     def respond_to_missing?(name, *)
-      settings.respond_to?(name)
+      model.respond_to?(name)
     end
 
     def method_missing(*args)
-      respond_to_missing?(*args) ? settings.__send__(*args) : super
+      respond_to_missing?(*args) ? model.__send__(*args) : super
     end
   end
 end

data/lib/evil/client/resolver.rb

@@ -46,7 +46,7 @@ class Evil::Client
       yield.tap do |obj|
         logger&.debug(self.class) { "resolved #{self} to #{obj.inspect}" }
       end
-    rescue => err
+    rescue StandardError => err
       logger&.error(self.class) { "failed to resolve #{self}: #{err.message}" }
       raise
     end

data/lib/evil/client/resolver/query.rb

@@ -31,7 +31,7 @@ class Evil::Client
 
       left  = __stringify_keys__(left)
       right = __stringify_keys__(right)
-      right.keys.each { |key| left[key] = __deep_merge__ left[key], right[key] }
+      right.each_key { |key| left[key] = __deep_merge__ left[key], right[key] }
 
       left
     end

data/lib/evil/client/resolver/response.rb

@@ -6,6 +6,9 @@ class Evil::Client
   class Resolver::Response < Resolver
     private
 
+    PROCESSING_DONE = Object.new
+    SKIP_RESPONSE   = Object.new
+
     def initialize(schema, settings, response)
       @__response__ = Array response
       super schema, settings, :responses, @__response__.first.to_i
@@ -13,14 +16,20 @@ class Evil::Client
 
     def __call__
       super do
-        __check_status__
-        instance_exec(*@__response__, &__blocks__.last)
+        catch(PROCESSING_DONE) do
+          __blocks__.reverse_each do |block|
+            catch(SKIP_RESPONSE) do
+              throw(PROCESSING_DONE, instance_exec(*@__response__, &block))
+            end
+          end
+          # We're here if 1) no blocks or 2) all blocks skipped processing
+          raise ResponseError.new(@__schema__, @__settings__, @__response__)
+        end
       end
     end
 
-    def __check_status__
-      return if __blocks__.any?
-      raise ResponseError.new(@__schema__, @__settings__, @__response__)
+    def super!
+      throw SKIP_RESPONSE
     end
   end
 end

data/lib/evil/client/resolver/uri.rb

@@ -20,7 +20,7 @@ class Evil::Client
 
     def __uri__(path)
       URI path
-    rescue => error
+    rescue StandardError => error
       raise __definition_error__(error.message)
     end
 

data/lib/evil/client/schema.rb

@@ -60,8 +60,8 @@ class Evil::Client
 
     # Adds an option to the [#settings] class
     #
-    # @param  (see Evil::Client::Settings.option)
-    # @option (see Evil::Client::Settings.option)
+    # @param  (see Evil::Client::Model.option)
+    # @option (see Evil::Client::Model.option)
     # @return [self]
     #
     def option(key, type = nil, **opts)
@@ -71,7 +71,7 @@ class Evil::Client
 
     # Adds a memoized method to the [#settings] class
     #
-    # @param  (see Evil::Client::Settings.let)
+    # @param  (see Evil::Client::Model.let)
     # @return [self]
     #
     def let(key, &block)
@@ -81,7 +81,7 @@ class Evil::Client
 
     # Adds validator to the [#settings] class
     #
-    # @param  (see Evil::Client::Settings.validate)
+    # @param  (see Evil::Client::Model.validate)
     # @return [self]
     #
     def validate(&block)

data/lib/evil/client/settings.rb

@@ -2,11 +2,8 @@ class Evil::Client
   #
   # Container for settings assigned to some operation or scope.
   #
-  class Settings
+  class Settings < Model
     Names.clean(self) # Remove unnecessary methods from the instance
-    extend ::Dry::Initializer
-
-    @policy = Policy
 
     class << self
       # Subclasses itself for a given schema
@@ -37,54 +34,6 @@ class Evil::Client
       alias_method :to_str,  :name
       alias_method :inspect, :name
 
-      # Only options can be defined for the settings container
-      # @private
-      def param(*args)
-        option(*args)
-      end
-
-      # Creates or updates the settings' initializer
-      #
-      # @see [http://dry-rb.org/gems/dry-initializer]
-      #
-      # @param       [#to_sym] key       Symbolic name of the option
-      # @param       [#call]   type      Type coercer for the option
-      # @option opts [#call]   :type     Another way to assign type coercer
-      # @option opts [#call]   :default  Proc containing default value
-      # @option opts [Boolean] :optional Whether it can be missed
-      # @option opts [#to_sym] :as       The name of settings variable
-      # @option opts [false, :private, :protected] :reader Reader method type
-      # @return      [self]
-      #
-      def option(key, type = nil, as: key.to_sym, **opts)
-        NameError.check!(as)
-        super
-        self
-      end
-
-      # Creates or reloads memoized attribute
-      #
-      # @param [#to_sym] key The name of the attribute
-      # @param [Proc] block  The body of new attribute
-      # @return [self]
-      #
-      def let(key, &block)
-        NameError.check!(key)
-        define_method(key) do
-          instance_variable_get(:"@#{key}") ||
-            instance_variable_set(:"@#{key}", instance_exec(&block))
-        end
-        self
-      end
-
-      # Policy class that collects all the necessary validators
-      #
-      # @return [Class] a subclass of [Tram::Policy] named after the scope
-      #
-      def policy
-        @policy ||= superclass.policy.for(self)
-      end
-
       # Add validation rule to the [#policy]
       #
       # @param [Proc] block  The body of new attribute
@@ -101,22 +50,12 @@ class Evil::Client
       # @param  [Hash<#to_sym, Object>, nil] opts
       # @return [Evil::Client::Settings]
       #
-      def new(logger, opts = {})
-        logger&.debug(self) { "initializing with options #{opts}..." }
-        opts = Hash(opts).each_with_object({}) { |(k, v), o| o[k.to_sym] = v }
-        in_english { super logger, opts }
-      rescue => error
-        raise ValidationError, error.message
-      end
-
-      private
-
-      def in_english(&block)
-        available_locales = I18n.available_locales
-        I18n.available_locales = %i[en]
-        I18n.with_locale(:en, &block)
-      ensure
-        I18n.available_locales = available_locales
+      def new(logger, op = {})
+        logger&.debug(self) { "initializing with options #{op}..." }
+        super(op).tap do |item|
+          item.logger = logger
+          logger&.debug(item) { "initialized" }
+        end
       end
     end
 
@@ -160,14 +99,5 @@ class Evil::Client
     end
     alias_method :to_str, :inspect
     alias_method :to_s,   :inspect
-
-    private
-
-    def initialize(logger, **options)
-      super(options)
-      @logger = logger
-      self.class.policy[self].validate!
-      logger&.debug(self) { "initialized" }
-    end
   end
 end

data/spec/fixtures/config.yml

@@ -0,0 +1,4 @@
+# Config file for testing Evil::Client::Dictionary
+---
+- ONE
+- TWO

data/spec/fixtures/locales/en.yml

@@ -14,3 +14,7 @@ en:
             users:
               filter:
                   filter_given: You should define some filter with either name, email, or id
+        test/model:
+          name_present: "The user has no name"
+        test/other:
+          empty_name: "name is empty"

data/spec/unit/dictionary_spec.rb

@@ -0,0 +1,58 @@
+RSpec.describe Evil::Client::Dictionary do
+  shared_examples :a_dictionary do |scope|
+    before do
+      class Test::Dictionary < String
+        def initialize(value)
+          super(value.downcase)
+        end
+      end
+    end
+
+    let(:klass) { Test::Dictionary }
+
+    describe "#all (#{scope})" do
+      subject { klass.all }
+
+      it "returns all items from a dictionary" do
+        expect(subject).to eq %w[one two]
+      end
+    end
+
+    describe "#each (#{scope})" do
+      subject { klass.map(&:reverse) }
+
+      it "iterates over dictionary items" do
+        expect(subject).to eq %w[eno owt]
+      end
+    end
+
+    describe "#call (#{scope})" do
+      it "returns dictionary item" do
+        expect(klass.call("one")).to eq "one"
+      end
+
+      it "raises when the item not in the dictionary" do
+        expect { klass.call "ONE" }
+          .to raise_error Evil::Client::Dictionary::Error
+      end
+    end
+  end
+
+  it_behaves_like :a_dictionary, "when class extended by the module" do
+    before do
+      class Test::Dictionary < String
+        extend Evil::Client::Dictionary["spec/fixtures/config.yml"]
+      end
+    end
+  end
+
+  it_behaves_like :a_dictionary, "when singleton class includes the module" do
+    before do
+      class Test::Dictionary < String
+        class << self
+          include Evil::Client::Dictionary["spec/fixtures/config.yml"]
+        end
+      end
+    end
+  end
+end

data/spec/unit/model_spec.rb

@@ -0,0 +1,133 @@
+RSpec.describe Evil::Client::Model do
+  before { class Test::Model < described_class; end }
+
+  let(:model)    { klass.new(options) }
+  let(:klass)    { Test::Model }
+  let(:options)  { { "id" => 42, "name" => "Andrew" } }
+  let(:dsl_methods) do
+    %i[options datetime logger scope basic_auth key_auth token_auth]
+  end
+
+  describe ".policy" do
+    subject { klass.policy }
+
+    it "subclasses Evil::Client::Policy" do
+      expect(subject.superclass).to eq described_class.policy
+      expect(described_class.policy.superclass).to eq Tram::Policy
+    end
+
+    it "refers back to the model" do
+      expect(subject.model).to eq klass
+    end
+  end
+
+  describe ".option" do
+    it "is defined by Dry::Initializer DSL" do
+      expect(klass).to be_a Dry::Initializer
+    end
+
+    it "fails when method name is reserved for DSL" do
+      dsl_methods.each do |name|
+        expect { klass.option name }
+          .to raise_error Evil::Client::NameError
+      end
+    end
+
+    it "allows the option to be renamed" do
+      expect { klass.option :basic_auth, as: :something }.not_to raise_error
+    end
+  end
+
+  describe ".let" do
+    before do
+      klass.option :id
+      klass.let(:square_id) { id**2 }
+    end
+
+    subject { model.square_id }
+
+    it "adds the corresponding memoizer to the instance" do
+      expect(subject).to eq(42**2)
+    end
+
+    it "fails when method name is reserved for DSL" do
+      dsl_methods.each do |name|
+        expect { klass.let(name) { 0 } }
+          .to raise_error Evil::Client::NameError
+      end
+    end
+  end
+
+  describe ".validate" do
+    before do
+      klass.option :name
+      klass.validate { errors.add :name_present if name.to_s == "" }
+    end
+
+    let(:options) { { "name" => "" } }
+
+    it "adds validation for an instance" do
+      # see spec/fixtures/locale/en.yml
+      expect { model }
+        .to raise_error(Evil::Client::ValidationError, /The user has no name/)
+    end
+  end
+
+  describe ".new" do
+    subject { model }
+
+    context "with wrong options" do
+      before { klass.option :user, as: :customer }
+
+      it "raises Evil::Client::ValidationError" do
+        expect { subject }.to raise_error Evil::Client::ValidationError, /user/
+      end
+    end
+  end
+
+  describe ".extend" do
+    before do
+      class Test::Other < described_class
+        option :first_name, optional: true
+        option :last_name,  optional: true
+
+        let(:name) { [first_name, last_name].compact.join(" ") }
+
+        validate { errors.add :empty_name if name == "" }
+      end
+
+      class Test::Model < described_class
+        extend Test::Other
+        option :email, optional: true
+      end
+    end
+
+    let(:options) do
+      { first_name: "Joe", last_name: "Doe", email: "joe@example.com" }
+    end
+
+    subject { model }
+
+    it "behaves like a model" do
+      expect(subject).to be_a klass
+      expect(subject.email).to eq "joe@example.com"
+    end
+
+    it "injects options from the other model" do
+      expect(subject.first_name).to eq "Joe"
+      expect(subject.last_name).to  eq "Doe"
+    end
+
+    it "injects memoizers from the other model" do
+      expect(subject.name).to eq "Joe Doe"
+    end
+
+    context "with invalid options" do
+      let(:options) { { email: "joe@example.com" } }
+
+      it "injects validators from the other model" do
+        expect { subject }.to raise_error(StandardError, /name/)
+      end
+    end
+  end
+end

data/spec/unit/policy_spec.rb

@@ -22,10 +22,10 @@ RSpec.describe Evil::Client::Policy do
     end
 
     it "keeps reference to the settings" do
-      expect(subject.settings).to eq settings
+      expect(subject.model).to eq settings
     end
 
-    it "takes the name from settings clsass" do
+    it "takes the name from settings class" do
       expect(subject.name).to eq "Foo.policy"
     end
   end

data/spec/unit/resolver/response_spec.rb

@@ -5,16 +5,18 @@ RSpec.describe Evil::Client::Resolver::Response, ".call" do
   let(:logger)   { Logger.new log }
   let(:response) { [201, { "Content-Language" => "en" }, ["success"]] }
 
+  let(:root_response_handler) { proc { |*args| args } }
   let(:root_schema) do
     double :my_parent_schema,
-           definitions: { responses: { 201 => proc { |*args| args } } },
+           definitions: { responses: { 201 => root_response_handler } },
            parent: nil
   end
 
+  let(:response_handler) { proc { |_, _, body| body.first } }
   let(:schema) do
     double :my_schema,
            definitions: {
-             responses: { 201 => proc { |_, _, body| body.first } }
+             responses: { 201 => response_handler }
            },
            parent: root_schema
   end
@@ -53,6 +55,24 @@ RSpec.describe Evil::Client::Resolver::Response, ".call" do
     end
   end
 
+  context "when root definition reloaded but schema handler skips response" do
+    let(:response_handler) do
+      proc { |_, _, _| super! }
+    end
+
+    it "applies root schema to response" do
+      expect(subject).to eq response
+    end
+
+    context "when root definition skips response handling too" do
+      let(:root_response_handler) { proc { super! } }
+
+      it "raises Evil::Client::ResponseError" do
+        expect { subject }.to raise_error Evil::Client::ResponseError
+      end
+    end
+  end
+
   context "when no definitions was given for the status" do
     let(:response) { [202, { "Content-Language" => "en" }, ["success"]] }
 

data/spec/unit/settings_spec.rb

@@ -26,11 +26,12 @@ RSpec.describe Evil::Client::Settings do
       subject { klass.policy }
 
       it "subclasses Evil::Client::Policy" do
-        expect(subject.superclass).to eq Evil::Client::Policy
+        expect(subject.superclass).to eq described_class.policy
+        expect(described_class.policy.superclass).to eq Evil::Client::Policy
       end
 
       it "refers back to the settings" do
-        expect(subject.settings).to eq klass
+        expect(subject.model).to eq klass
       end
     end
 
@@ -44,7 +45,7 @@ RSpec.describe Evil::Client::Settings do
       end
 
       it "refers back to the settings" do
-        expect(subject.settings).to eq scope_klass
+        expect(subject.model).to eq scope_klass
       end
     end
   end
@@ -66,22 +67,9 @@ RSpec.describe Evil::Client::Settings do
     end
   end
 
-  describe ".param" do
-    before do
-      klass.param :id,    optional: true
-      klass.param :email, optional: true
-    end
-
-    subject { settings.options }
-
-    it "acts like .option" do
-      expect(subject).to eq id: 42
-    end
-  end
-
   describe ".let" do
     before do
-      klass.param :id
+      klass.option :id
       klass.let(:square_id) { id**2 }
     end
 
@@ -101,7 +89,7 @@ RSpec.describe Evil::Client::Settings do
 
   describe ".validate" do
     before do
-      klass.param :name
+      klass.option :name
       klass.validate { errors.add :name_present if name.to_s == "" }
     end
 
@@ -207,7 +195,7 @@ RSpec.describe Evil::Client::Settings do
   end
 
   describe "#datetime" do
-    let(:time) { DateTime.parse "2017-07-21 16:58:00 UTC" }
+    let(:time) { Time.parse "2017-07-21 16:58:00 UTC" }
     subject { settings.datetime value }
 
     context "with a parceable string" do

metadata

@@ -1,157 +1,163 @@
 --- !ruby/object:Gem::Specification
 name: evil-client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Andrew Kozin (nepalez)
 - Ravil Bairamgalin (brainopia)
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-02 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  name: dry-initializer
-  prerelease: false
+        version: '2.1'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
-  name: tram-policy
-  prerelease: false
+        version: '3.1'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '3.1'
 - !ruby/object:Gem::Dependency
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-  name: mime-types
-  prerelease: false
+        version: '2'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
+  name: tram-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-  name: rack
-  prerelease: false
+        version: 0.2.2
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.2.2
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-  name: rspec-its
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.42'
-  name: rubocop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.42'
 - !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-  name: timecop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-  name: webmock
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-description:
+description: 
 email:
 - andrew.kozin@gmail.com
 - nepalez@evilmartians.com
@@ -200,6 +206,7 @@ files:
 - lib/evil/client/container.rb
 - lib/evil/client/container/operation.rb
 - lib/evil/client/container/scope.rb
+- lib/evil/client/dictionary.rb
 - lib/evil/client/exceptions/definition_error.rb
 - lib/evil/client/exceptions/name_error.rb
 - lib/evil/client/exceptions/response_error.rb
@@ -210,6 +217,7 @@ files:
 - lib/evil/client/formatter/multipart.rb
 - lib/evil/client/formatter/part.rb
 - lib/evil/client/formatter/text.rb
+- lib/evil/client/model.rb
 - lib/evil/client/names.rb
 - lib/evil/client/options.rb
 - lib/evil/client/policy.rb
@@ -240,6 +248,7 @@ files:
 - spec/features/operation/request_spec.rb
 - spec/features/operation/response_spec.rb
 - spec/features/scope/options_spec.rb
+- spec/fixtures/config.yml
 - spec/fixtures/locales/en.yml
 - spec/fixtures/test_client.rb
 - spec/spec_helper.rb
@@ -251,6 +260,7 @@ files:
 - spec/unit/container/operation_spec.rb
 - spec/unit/container/scope_spec.rb
 - spec/unit/container_spec.rb
+- spec/unit/dictionary_spec.rb
 - spec/unit/exceptions/definition_error_spec.rb
 - spec/unit/exceptions/name_error_spec.rb
 - spec/unit/exceptions/response_error_spec.rb
@@ -261,6 +271,7 @@ files:
 - spec/unit/formatter/part_spec.rb
 - spec/unit/formatter/text_spec.rb
 - spec/unit/formatter_spec.rb
+- spec/unit/model_spec.rb
 - spec/unit/options_spec.rb
 - spec/unit/policy_spec.rb
 - spec/unit/resolver/body_spec.rb
@@ -284,7 +295,7 @@ homepage: https://github.com/evilmartians/evil-client
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -299,9 +310,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.14
+signing_key: 
 specification_version: 4
 summary: Human-friendly DSL for building HTTP(s) clients in Ruby
 test_files:
@@ -311,6 +322,7 @@ test_files:
 - spec/features/operation/request_spec.rb
 - spec/features/operation/response_spec.rb
 - spec/features/scope/options_spec.rb
+- spec/fixtures/config.yml
 - spec/fixtures/locales/en.yml
 - spec/fixtures/test_client.rb
 - spec/spec_helper.rb
@@ -322,6 +334,7 @@ test_files:
 - spec/unit/container/operation_spec.rb
 - spec/unit/container/scope_spec.rb
 - spec/unit/container_spec.rb
+- spec/unit/dictionary_spec.rb
 - spec/unit/exceptions/definition_error_spec.rb
 - spec/unit/exceptions/name_error_spec.rb
 - spec/unit/exceptions/response_error_spec.rb
@@ -332,6 +345,7 @@ test_files:
 - spec/unit/formatter/part_spec.rb
 - spec/unit/formatter/text_spec.rb
 - spec/unit/formatter_spec.rb
+- spec/unit/model_spec.rb
 - spec/unit/options_spec.rb
 - spec/unit/policy_spec.rb
 - spec/unit/resolver/body_spec.rb