evil-client 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 237e89873909ecf0ad225c9a714e68702c96b5c6
-  data.tar.gz: 5a030e4b7629338ebe24359311e7dac5b4d74fe8
+  metadata.gz: 2740449772138472d84ec8f0a8f4e5fdeea23af8
+  data.tar.gz: d165a97dababfa3e40f1838a18d06b61847ff1da
 SHA512:
-  metadata.gz: 0ae5ee8377ef7ca78252356a4cad2726ef854a676b4b0715c4e6a881d7c8d381896307b48d7d8e6cbe7920362369f4886dc8f654a39bab10e2cf160cf8c6fed8
-  data.tar.gz: 54acb1b3f1d7e94d879240eaa6eba66576c719b5833707ef68393dcded7c971b7a1ed248e840f514d1a377a3daa6f33892caaf93a4acecffd485459e9c9f177f
+  metadata.gz: 4274645076138cbba089ecbcc3c3c4034e50789c7128e06b1abb45e9316c41908cf367174002227ddc51e124bd2963a4b0de3ba7a5be8e3bee345ba34e2cf92b
+  data.tar.gz: 98cc762b3c67d6688879dd3724a24c19ab78823acb162f9c6ea94e8fd4f53aa1f44834f005df3e99f483128ba2de7e43549823135e71b2e136927ec844deb5bd

data/CHANGELOG.md

@@ -4,6 +4,32 @@ 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.0.0] [2017-09-02]
+
+### Changed
+
+- In this version I've changed interface for validations by switching
+  to [tram-policy] based validation  (nepalez)
+
+  Instead of giving name to validator:
+
+  ```ruby
+  validate :name_present { name != "" }
+  ```
+
+  You should use `errors.add` with the name for exception
+
+  ```ruby
+  validate { errors.add :blank_name if name == "" }
+  ```
+
+  This time the exception will be risen with all validation errors at once,
+  not only the first one.
+
+- The `:en` locale is always used for translations (nepalez)
+
+  You don't need to make this locale available -- this is made under the hood!
+
 ## [1.1.0] [2017-08-10]
 
 Some syntax sugar has been added to both the client and its RSpec helpers.

data/README.md

@@ -10,6 +10,7 @@ Human-friendly DSL for writing HTTP(s) clients in Ruby
 [![Dependency Status][gemnasium-badger]][gemnasium]
 [![Code Climate][codeclimate-badger]][codeclimate]
 [![Inline docs][inch-badger]][inch]
+[![Documentation Status][readthedocs-badger]][readthedocs]
 
 ## Intro
 
@@ -37,7 +38,7 @@ $ gem install evil-client
 
 ## Synopsis
 
-The following example gives an idea of how a client to remote API looks like when written on top of `Evil::Client`.
+The following example gives an idea of how a client to remote API looks like when written on top of `Evil::Client`. See [full documentation][readthedocs] for more details.
 
 ```ruby
 require "evil-client"
@@ -65,7 +66,7 @@ class CatsClient < Evil::Client
       option :age,   optional: true
 
       let(:data) { options.select { |key, _| %i(name color age).include? key } }
-      validate(:data_present) { !data.empty? }
+      validate   { errors.add :no_filters if data.empty? }
 
       path        { "cats/#{id}" } # added to root path
       http_method :patch # you can use plain syntax instead of a block
@@ -119,3 +120,5 @@ The gem is available as open source under the terms of the [MIT License](http://
 [swagger]: http://swagger.io
 [travis-badger]: https://img.shields.io/travis/evilmartians/evil-client/master.svg?style=flat
 [travis]: https://travis-ci.org/evilmartians/evil-client
+[readthedocs-badger]: https://readthedocs.org/projects/evilclient/badge/?version=latest
+[readthedocs]: http://evilclient.readthedocs.io/en/latest

data/docs/helpers/scope.md

@@ -10,7 +10,10 @@ class CatsClient < Evil::Client
   option :password,  proc(&:to_s)
   option :subdomain, proc(&:to_s)
 
-  validate(:valid_subdomain) { %w[wild domestic].include? subdomain }
+  validate do
+    return if %w[wild domestic].include? subdomain
+    errors.add :invalid_subdomain, subdomain: subdomain
+  end
 
   path { "https://#{subdomain}.example.com/" }
   http_method "get"
@@ -39,7 +42,7 @@ class CatsClient < Evil::Client
     # scope-specific options
     option :version, proc(&:to_i)
 
-    validate(:supported_version) { version < 5 }
+    validate { errors.add :wrong_version unless version < 5 }
 
     # scope-specific redefinition of the root settings
     http_method { version.zero? ? :get : :post }

data/docs/helpers/validate.md

@@ -1,6 +1,8 @@
 Use `validate` helper to check interconnection between several options.
 
-The helper takes name (unique for a current scope) and a block. Validation fails when a block returns falsey value.
+It takes a block, where all options are available. You should call method
+`errors.add :some_key, **some_options` or `errors.add "some message"`
+to invalidate options.
 
 ```ruby
 class CatsAPI < Evil::Client
@@ -10,15 +12,15 @@ class CatsAPI < Evil::Client
 
   # All requests should be made with either token or user/password
   # This is required by any request
-  validate(:valid_credentials) { token ^ password }
-  validate(:password_given)    { user ^ !password }
+  validate { errors.add :wrong_credentials unless token.nil? ^ password.nil? }
+  validate { errors.add :missed_password   unless user.nil? ^ !password }
 
   scope :cats do
     option :version, proc(&:to_i)
 
     # Check that operation of cats scope include token after API v1
     # This doesn't affect other subscopes of CatsAPI root scope
-    validate(:token_based) { token || version.zero? }
+    validate { errors.add :missed_token unless token || version.zero? }
   end
 
   # ...
@@ -27,7 +29,12 @@ end
 CatsAPI.new password: "foo" # raises Evil::Client::ValidationError
 ```
 
-The error message is translated using i18n gem. You should provide translations for a corresponding scope:
+The error message is translated using i18n gem in **english** locale.
+You don't need to add `:en` to `I18n.available_locales`, we make it
+under the hood and then restore previous settings.
+
+All you need is to provide translations for a corresponding scope which is
+`en.evil.client.errors.{class_name}.{scopes and operations}` as shown below.
 
 ```yaml
 # config/locales/evil-client.en.yml
@@ -37,15 +44,15 @@ en:
     client:
       errors:
         cats_api:
-          valid_credentials: "Provide either a token or a password"
-          password_given:    "User and password should accompany one another"
+          wrong_credentials: "Provide either a token or a password"
+          missed_password:   "User and password should accompany one another"
           cats:
-            token_based: "The token is required for operations with cats in API v1+"
+            missed_token: "The token is required for operations with cats in API v1+"
 ```
 
-The root scope for error messages is `{locale}.evil.client.errors.{class_name}` as shown above.
+Alternatively you can call `errors.add "some message"` without any translation. Only symbolic keys are translated via i18n, while string messages used in exceptions as is. This time you don't need adding translation at all.
 
-Remember, that you can initialize client with some valid options, and then reload that options in a nested subscope/operation. All validations defined from the root of the client will be used for any set of options. See the example:
+Remember, that you can initialize client with some valid options, and then reload that options in a nested subscope/operation. All validations defined from the root of the client will be used for any set of options. For example:
 
 ```ruby
 client = CatsAPI.new token: "foo"
@@ -58,11 +65,11 @@ cats.fetch id: 3
 # valid
 
 cats.fetch id: 3, token: nil
-# fails due to 'valid_credentials' is broken
+# fails due to wrong credentials
 
 cats.fetch id: 3, token: nil, user: "andy", password: "qux"
 # valid
 
 cats.fetch id: 3, token: nil, user: "andy", password: "qux", version: 1
-# fails due to 'cats.token_based' is broken
+# fails due to missed token
 ```

data/docs/index.md

@@ -63,7 +63,7 @@ class CatsClient < Evil::Client
       option :age,   optional: true
 
       let(:data) { options.select { |key, _| %i(name color age).include? key } }
-      validate(:data_present) { !data.empty? }
+      validate   { errors.add :no_data if data.empty? }
 
       path        { "cats/#{id}" } # added to root path
       http_method :patch # you can use plain syntax instead of a block

data/evil-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "evil-client"
-  gem.version  = "1.1.0"
+  gem.version  = "2.0.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"
@@ -11,10 +11,10 @@ Gem::Specification.new do |gem|
   gem.test_files       = gem.files.grep(/^spec/)
   gem.extra_rdoc_files = Dir["README.md", "LICENSE", "CHANGELOG.md"]
 
-  gem.required_ruby_version = ">= 2.3"
+  gem.required_ruby_version = "~> 2.3"
 
-  gem.add_runtime_dependency "dry-initializer", "~> 1.4"
-  gem.add_runtime_dependency "i18n", "~> 0.8.6"
+  gem.add_runtime_dependency "dry-initializer", "~> 2.0.0"
+  gem.add_runtime_dependency "tram-policy", "~> 0.2.1"
   gem.add_runtime_dependency "mime-types", "~> 3.1"
   gem.add_runtime_dependency "rack", "~> 2"
 

data/lib/evil/client.rb

@@ -4,11 +4,10 @@ require "rack"
 require "cgi"
 require "json"
 require "yaml"
-require "i18n"
 require "mime-types"
 require "securerandom"
 require "delegate"
-require "dry-initializer"
+require "tram-policy"
 require "net/http"
 require "net/https"
 #
@@ -30,6 +29,7 @@ module Evil
 
     require_relative "client/chaining"
     require_relative "client/options"
+    require_relative "client/policy"
     require_relative "client/settings"
     require_relative "client/schema"
     require_relative "client/container"
@@ -125,6 +125,14 @@ module Evil
       @scope.scopes
     end
 
+    # Settings of the client
+    #
+    # @return (see Evil::Client::Container#settings)
+    #
+    def settings
+      @scope.settings
+    end
+
     # Options assigned to the client
     #
     # @return (see Evil::Client::Container#options)

data/lib/evil/client/names.rb

@@ -43,6 +43,7 @@ class Evil::Client
       send
       settings
       singleton_class
+      tap
       to_s
       to_str
       token_auth

data/lib/evil/client/policy.rb

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

data/lib/evil/client/schema.rb

@@ -55,9 +55,7 @@ class Evil::Client
     # @return [Class]
     #
     def settings
-      @settings ||= Class.new(parent&.settings || Settings).tap do |klass|
-        klass.send(:instance_variable_set, :@schema, self)
-      end
+      @settings ||= (parent&.settings || Settings).for(self)
     end
 
     # Adds an option to the [#settings] class
@@ -86,8 +84,8 @@ class Evil::Client
     # @param  (see Evil::Client::Settings.validate)
     # @return [self]
     #
-    def validate(key, &block)
-      settings.validate(key, &block)
+    def validate(&block)
+      settings.validate(&block)
       self
     end
 

data/lib/evil/client/settings.rb

@@ -4,15 +4,38 @@ class Evil::Client
   #
   class Settings
     Names.clean(self) # Remove unnecessary methods from the instance
-    require_relative "settings/validator"
     extend ::Dry::Initializer
 
+    @policy = Policy
+
     class << self
-      # The schema klass settings belongs to
+      # Subclasses itself for a given schema
+      #
+      # @param  [Class] schema
+      # @return [Class] a subclass for the schema
+      #
+      def for(schema)
+        Class.new(self).tap do |klass|
+          klass.send(:instance_variable_set, :@schema, schema)
+        end
+      end
+
+      # Reference to the schema klass the settings belongs to
       #
       # @return [Class]
       #
-      attr_reader :schema
+      attr_reader :schema, :locale
+
+      # Human-friendly representation of settings class
+      #
+      # @return [String]
+      #
+      def name
+        super || @schema.to_s
+      end
+      alias_method :to_s,    :name
+      alias_method :to_str,  :name
+      alias_method :inspect, :name
 
       # Only options can be defined for the settings container
       # @private
@@ -54,35 +77,23 @@ class Evil::Client
         self
       end
 
-      # Define validator for the attribute
+      # Policy class that collects all the necessary validators
       #
-      # @param [#to_sym] key The name of the attribute
-      # @param [Proc] block  The body of new attribute
-      # @return [self]
+      # @return [Class] a subclass of [Tram::Policy] named after the scope
       #
-      def validate(key, &block)
-        validators[key] = Validator.new(@schema, key, &block)
-        self
+      def policy
+        @policy ||= superclass.policy.for(self)
       end
 
-      # Collection of validators to check initialized settings
+      # Add validation rule to the [#policy]
       #
-      # @return [Hash<Symbol, Evil::Client::Validator>]
-      #
-      def validators
-        @validators ||= {}
-      end
-
-      # Human-friendly representation of settings class
-      #
-      # @return [String]
+      # @param [Proc] block  The body of new attribute
+      # @return [self]
       #
-      def name
-        super || @schema.to_s
+      def validate(&block)
+        policy.validate(&block)
+        self
       end
-      alias_method :to_s,    :name
-      alias_method :to_str,  :name
-      alias_method :inspect, :name
 
       # Builds settings with options
       #
@@ -93,10 +104,20 @@ class Evil::Client
       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 }
-        super logger, opts
+        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
+      end
     end
 
     # The processed hash of options contained by the instance of settings
@@ -104,7 +125,7 @@ class Evil::Client
     # @return [Hash<Symbol, Object>]
     #
     def options
-      Options.new @__options__
+      @options ||= Options.new self.class.dry_initializer.attributes(self)
     end
 
     # @!attribute logger
@@ -143,26 +164,10 @@ class Evil::Client
     private
 
     def initialize(logger, **options)
-      @logger = logger
       super(options)
-
+      @logger = logger
+      self.class.policy[self].validate!
       logger&.debug(self) { "initialized" }
-      __validate__!
-    end
-
-    def __validate__!
-      __validators__.reverse.each { |validator| validator.call(self) }
-    end
-
-    def __validators__
-      klass = self.class
-      [].tap do |list|
-        loop do
-          list.concat klass.validators.values
-          klass = klass.superclass
-          break if klass == Evil::Client::Settings
-        end
-      end
     end
   end
 end

data/mkdocs.yml

@@ -6,22 +6,22 @@ repo_url: https://github.com/nepalez/evil-client
 site_author: Andrew Kozin
 theme: readthedocs
 pages:
-  Synopsis: index.md
-  Helpers:
-    scope:             helpers/scope.md
-    operation:         helpers/operation.md
-    option:            helpers/option.md
-    let:               helpers/let.md
-    validate:          helpers/validate.md
-    path:              helpers/path.md
-    http_method:       helpers/http_method.md
-    security:          helpers/security.md
-    headers:           helpers/headers.md
-    query:             helpers/query.md
-    'body and format': helpers/body.md
-    response:          helpers/response.md
-    middleware:        helpers/middleware.md
-    connection:        helpers/connection.md
-    logger:            helpers/logger.md
-  'RSpec matcher':     rspec.md
-  License: license.md
+  - Synopsis: index.md
+  - Helpers:
+    - scope:             helpers/scope.md
+    - operation:         helpers/operation.md
+    - option:            helpers/option.md
+    - let:               helpers/let.md
+    - validate:          helpers/validate.md
+    - path:              helpers/path.md
+    - http_method:       helpers/http_method.md
+    - security:          helpers/security.md
+    - headers:           helpers/headers.md
+    - query:             helpers/query.md
+    - 'body and format': helpers/body.md
+    - response:          helpers/response.md
+    - middleware:        helpers/middleware.md
+    - connection:        helpers/connection.md
+    - logger:            helpers/logger.md
+  - 'RSpec matcher':     rspec.md
+  - License: license.md

data/spec/fixtures/test_client.rb

@@ -4,7 +4,8 @@ module Test
     option :user
     option :token,    optional: true
     option :password, optional: true
-    validate(:valid_credentials) { token.nil? ^ password.nil? }
+
+    validate { errors.add :valid_credentials unless token.nil? ^ password.nil? }
 
     path { "https://#{subdomain}.example.com" }
 
@@ -25,7 +26,7 @@ module Test
           option :id,    optional: true
           option :email, optional: true
 
-          validate(:filter_given) { name || id || email }
+          validate { errors.add :filter_given unless name || id || email }
 
           http_method   :get
           response(200) { |*res| res.last.flat_map { |item| JSON.parse(item) } }

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require "bundler/setup"
 require "webmock/rspec"
 require "rspec/its"
 require "timecop"
+require "tempfile"
 require "evil/client"
 require "evil/client/rspec"
 
@@ -24,9 +25,7 @@ RSpec.configure do |config|
     # Prepare the Test namespace for constants defined in specs
     module Test; end
     # Load translations
-    en_translations = yaml_fixture_file "locales/en.yml"
-    I18n.available_locales = %i[en]
-    I18n.backend.store_translations :en, en_translations["en"]
+    I18n.load_path += Dir["spec/fixtures/locales/*.yml"]
   end
 
   config.after(:each) do

data/spec/unit/client_spec.rb

@@ -93,6 +93,14 @@ RSpec.describe Evil::Client do
     klass.new(token: "foo", version: 1)
   end
 
+  describe "#settings" do
+    subject { client.settings }
+
+    it "returns settings assigned to client settings" do
+      expect(subject.token).to eq "foo"
+    end
+  end
+
   describe "#options" do
     subject { client.options }
 

data/spec/unit/policy_spec.rb

@@ -0,0 +1,32 @@
+RSpec.describe Evil::Client::Policy do
+  it "subsclasses Tram::Policy" do
+    expect(described_class.superclass).to eq Tram::Policy
+  end
+
+  it "takes a parameter (settings) to validate" do
+    expect(described_class[double]).to be_valid
+  end
+
+  it "delegates instance methods to settings" do
+    settings = double :settings, foo: :BAR
+    policy   = described_class[settings]
+    expect(policy.foo).to eq :BAR
+  end
+
+  describe ".for" do
+    let(:settings) { class_double Evil::Client::Settings, to_s: "Foo" }
+    subject { described_class.for settings }
+
+    it "builds a subclass of its own" do
+      expect(subject.superclass).to eq described_class
+    end
+
+    it "keeps reference to the settings" do
+      expect(subject.settings).to eq settings
+    end
+
+    it "takes the name from settings clsass" do
+      expect(subject.name).to eq "Foo.policy"
+    end
+  end
+end

data/spec/unit/schema_spec.rb

@@ -143,10 +143,10 @@ RSpec.describe Evil::Client::Schema do
 
   describe "#validate" do
     before  { allow(schema.settings).to receive(:validate) }
-    subject { schema.validate(:id_present) {} }
+    subject { schema.validate {} }
 
     it "is delegated to settings" do
-      expect(schema.settings).to receive(:validate).with(:id_present)
+      expect(schema.settings).to receive(:validate)
       subject
     end
 

data/spec/unit/settings_spec.rb

@@ -2,19 +2,50 @@ RSpec.describe Evil::Client::Settings do
   let(:settings) { klass.new(logger, options) }
   let(:log)      { StringIO.new }
   let(:logger)   { Logger.new log }
-  let(:klass)    { Class.new(described_class) }
+  let(:schema)   { double :schema, to_s: "Test::Api.users.update" }
+  let(:klass)    { described_class.for(schema) }
   let(:options)  { { "id" => 42, "name" => "Andrew" } }
   let(:dsl_methods) do
     %i[options datetime logger scope basic_auth key_auth token_auth]
   end
 
-  before { klass.instance_variable_set :@schema, "Test::Api.users.update" }
+  describe ".for" do
+    subject { klass }
 
-  describe ".schema" do
-    subject { klass.schema }
+    it "subclasses itself" do
+      expect(subject.superclass).to eq described_class
+    end
 
-    it "returns the schema class the settings belongs to" do
-      expect(subject).to eq "Test::Api.users.update"
+    it "keeps the schema" do
+      expect(subject.schema).to eq schema
+    end
+  end
+
+  describe ".policy" do
+    context "for the root schema settings" do
+      subject { klass.policy }
+
+      it "subclasses Evil::Client::Policy" do
+        expect(subject.superclass).to eq Evil::Client::Policy
+      end
+
+      it "refers back to the settings" do
+        expect(subject.settings).to eq klass
+      end
+    end
+
+    context "for the scope settings" do
+      let(:scope_schema) { double :scope_schema }
+      let(:scope_klass)  { klass.for(scope_schema) }
+      subject { scope_klass.policy }
+
+      it "subclasses policy of parent settings" do
+        expect(subject.superclass).to eq klass.policy
+      end
+
+      it "refers back to the settings" do
+        expect(subject.settings).to eq scope_klass
+      end
     end
   end
 
@@ -71,7 +102,7 @@ RSpec.describe Evil::Client::Settings do
   describe ".validate" do
     before do
       klass.param :name
-      klass.validate(:name_present) { name.to_s != "" }
+      klass.validate { errors.add :name_present if name.to_s == "" }
     end
 
     let(:options) { { "name" => "" } }
@@ -79,14 +110,7 @@ RSpec.describe Evil::Client::Settings do
     it "adds validation for an instance" do
       # see spec/fixtures/locale/en.yml
       expect { settings }
-        .to raise_error(Evil::Client::ValidationError, "The user has no name")
-    end
-
-    it "gives logger to validators" do
-      settings rescue nil
-
-      expect(log.string).to include "#{klass.schema}.validator[:name_present]"
-      expect(log.string).to include "failed"
+        .to raise_error(Evil::Client::ValidationError, /The user has no name/)
     end
   end
 

metadata

@@ -1,157 +1,157 @@
 --- !ruby/object:Gem::Specification
 name: evil-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrew Kozin (nepalez)
 - Ravil Bairamgalin (brainopia)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
+        version: 2.0.0
+  name: dry-initializer
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
-  type: :runtime
+        version: 0.2.1
+  name: tram-policy
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :runtime
+  name: mime-types
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-  type: :runtime
+  name: rack
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rspec-its
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: timecop
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: webmock
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-description: 
+description:
 email:
 - andrew.kozin@gmail.com
 - nepalez@evilmartians.com
@@ -212,6 +212,7 @@ files:
 - lib/evil/client/formatter/text.rb
 - lib/evil/client/names.rb
 - lib/evil/client/options.rb
+- lib/evil/client/policy.rb
 - lib/evil/client/resolver.rb
 - lib/evil/client/resolver/body.rb
 - lib/evil/client/resolver/format.rb
@@ -232,7 +233,6 @@ files:
 - lib/evil/client/schema/operation.rb
 - lib/evil/client/schema/scope.rb
 - lib/evil/client/settings.rb
-- lib/evil/client/settings/validator.rb
 - mkdocs.yml
 - spec/features/custom_connection_spec.rb
 - spec/features/operation/middleware_spec.rb
@@ -262,6 +262,7 @@ files:
 - spec/unit/formatter/text_spec.rb
 - spec/unit/formatter_spec.rb
 - spec/unit/options_spec.rb
+- spec/unit/policy_spec.rb
 - spec/unit/resolver/body_spec.rb
 - spec/unit/resolver/format_spec.rb
 - spec/unit/resolver/headers_spec.rb
@@ -278,19 +279,18 @@ files:
 - spec/unit/schema/operation_spec.rb
 - spec/unit/schema/scope_spec.rb
 - spec/unit/schema_spec.rb
-- spec/unit/settings/validator_spec.rb
 - spec/unit/settings_spec.rb
 homepage: https://github.com/evilmartians/evil-client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -299,9 +299,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.4
+signing_key:
 specification_version: 4
 summary: Human-friendly DSL for building HTTP(s) clients in Ruby
 test_files:
@@ -333,6 +333,7 @@ test_files:
 - spec/unit/formatter/text_spec.rb
 - spec/unit/formatter_spec.rb
 - spec/unit/options_spec.rb
+- spec/unit/policy_spec.rb
 - spec/unit/resolver/body_spec.rb
 - spec/unit/resolver/format_spec.rb
 - spec/unit/resolver/headers_spec.rb
@@ -349,6 +350,4 @@ test_files:
 - spec/unit/schema/operation_spec.rb
 - spec/unit/schema/scope_spec.rb
 - spec/unit/schema_spec.rb
-- spec/unit/settings/validator_spec.rb
 - spec/unit/settings_spec.rb
-has_rdoc: 

data/lib/evil/client/settings/validator.rb

@@ -1,64 +0,0 @@
-class Evil::Client
-  #
-  # Validator to be called in context of initialized settings
-  #
-  class Settings::Validator
-    # Performs validation of initialized settings
-    #
-    # @param [Evil::Client::Settings]
-    # @return true
-    # @raise [Evil::Client::ValidationError] when a validation fails
-    #
-    def call(settings)
-      if validate!(settings, @block)
-        settings&.logger&.debug(self) { "passed for #{settings}" }
-        true
-      else
-        settings&.logger&.error(self) { "failed for #{settings}" }
-        raise ValidationError.new(@key, @schema, settings.options)
-      end
-    end
-
-    # Human-friendly representation of current validator
-    #
-    # @return [String]
-    #
-    def to_s
-      "#{@schema}.validator[:#{@key}]"
-    end
-    alias_method :to_str,  :to_s
-    alias_method :inspect, :to_s
-
-    private
-
-    def initialize(schema, key, &block)
-      check_key!   key
-      check_block! block
-
-      @schema = schema
-      @key    = key.to_sym
-      @block  = block
-    end
-
-    def check_key!(key)
-      message = if !key.respond_to? :to_sym
-                  "Validator should have a symbolic name"
-                elsif key.empty?
-                  "Validator name should not be empty"
-                end
-
-      raise ArgumentError.new(message) if message
-    end
-
-    def check_block!(block)
-      raise ArgumentError, "You should set block for validation" unless block
-    end
-
-    def validate!(settings, block)
-      settings.instance_exec(&block) && true
-    rescue => error
-      settings&.logger&.error(self) { "broken for #{settings} with #{error}" }
-      raise
-    end
-  end
-end

data/spec/unit/settings/validator_spec.rb

@@ -1,128 +0,0 @@
-RSpec.describe Evil::Client::Settings::Validator do
-  let(:validator) { described_class.new(schema, key, &block) }
-  let(:schema)    { double to_s: "Test::Api.users.update" }
-  let(:key)       { :token_present }
-  let(:block)     { proc { 1 if token.to_s != "" } }
-
-  describe ".new" do
-    subject { validator }
-    it { is_expected.to be_a described_class }
-
-    context "when key is missed" do
-      let(:key) { nil }
-
-      it "raises ArgumentError" do
-        expect { subject }.to raise_error ArgumentError
-      end
-    end
-
-    context "when key is empty" do
-      let(:key) { "" }
-
-      it "raises ArgumentError" do
-        expect { subject }.to raise_error ArgumentError
-      end
-    end
-
-    context "when key cannot be symbolized" do
-      let(:key) { 1 }
-
-      it "raises ArgumentError" do
-        expect { subject }.to raise_error ArgumentError
-      end
-    end
-
-    context "when block is missed" do
-      let(:block) { nil }
-
-      it "raises ArgumentError" do
-        expect { subject }.to raise_error ArgumentError
-      end
-    end
-  end
-
-  describe "#to_s" do
-    subject { validator.to_s }
-
-    it "represents validator in a human-friendly manner" do
-      expect(subject).to eq "Test::Api.users.update.validator[:token_present]"
-    end
-  end
-
-  describe "#to_str" do
-    subject { validator.to_str }
-
-    it "represents validator in a human-friendly manner" do
-      expect(subject).to eq "Test::Api.users.update.validator[:token_present]"
-    end
-  end
-
-  describe "#inspect" do
-    subject { validator.inspect }
-
-    it "represents validator in a human-friendly manner" do
-      expect(subject).to eq "Test::Api.users.update.validator[:token_present]"
-    end
-  end
-
-  describe "#call" do
-    let(:log)      { StringIO.new }
-    let(:logger)   { Logger.new(log) }
-    let(:options)  { { id: 7, token: token } }
-    let(:token)    { "foo" }
-
-    let(:settings) do
-      double options: options, to_s: "my_settings", logger: logger, **options
-    end
-
-    subject { validator.call settings }
-
-    context "when block returns truthy value" do
-      it { is_expected.to eql true }
-
-      it "logs the result" do
-        subject
-
-        expect(log.string).to include validator.to_s
-        expect(log.string).to include "passed for my_settings"
-      end
-
-      context "when logger level was set to INFO" do
-        before { logger.level = Logger::INFO }
-
-        it "skips logging" do
-          expect { subject }.not_to change { log.string }
-        end
-      end
-    end
-
-    context "when block returns falsey value" do
-      let(:token) { nil }
-
-      it "raises Evil::Client::ValidationError" do
-        # see spec/fixtures/locales/en.yml
-        expect { subject }
-          .to raise_error Evil::Client::ValidationError,
-                          "To update user id:7 you must provide a token"
-      end
-
-      it "logs the result" do
-        subject rescue nil
-
-        expect(log.string).to include validator.to_s
-        expect(log.string).to include "failed for my_settings"
-      end
-    end
-
-    context "when block raises" do
-      let(:block) { proc { raise "my_problem" } }
-
-      it "logs the result" do
-        subject rescue nil
-
-        expect(log.string).to include validator.to_s
-        expect(log.string).to include "broken for my_settings with my_problem"
-      end
-    end
-  end
-end