evil-client 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0323c33d7f3cf56d4aca84057aef698e57efbb
-  data.tar.gz: fde6a5543b7c8775350d18cf805b8efe277d65cb
+  metadata.gz: 2ccf12ec7a65e3b93d702235488587267b4b63bf
+  data.tar.gz: 24d639ea31d94a956cf919c873098f3ec2beea75
 SHA512:
-  metadata.gz: 4bcaf9be801454e01f7a99d0385f71eafabbe6e98955ea24b3541d0a5a68bfb88e891ca714736354a8bbd3e45c57c4936ee84e2a2f65abd4606b4b45dc53b149
-  data.tar.gz: 21161df236b8079fb8511bac24f5a3c87e4054803d18f7811a0d46a68941595ed4a5de59517e856c1e4a9ce8f1ef9022eeebf7e67a7dc4b9154303e684ebb09d
+  metadata.gz: c0db70d946408b64ec9875605b37c7f26af598c0f062c31bf4524ddb820b41ff43d598626e9f865ffd859ab7a911c7c20c4add08f3e080ab0ba6e83c128ba050
+  data.tar.gz: 25f5a6ffb7c7c05ed40ceb47a3899ce651db16453f7561b631c6bb680a4713b963ba10eb291044a4ce168d9fd653abe214537555828bf0882471018020f6cf39

data/CHANGELOG.md

@@ -4,7 +4,13 @@ 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]
+## [2.1.1] [2018-01-05]
+
+### Changed
+
+- Dependency from [tram-policy] was updated to v2.3+ (nepalez)
+
+## [2.1.0] [2018-01-04]
 
 ### Added
 
@@ -23,7 +29,7 @@ to [Semantic Versioning].
   end
   ```
 
-- Method to pass response handling to parent scopes by @Envek ([#21](https://github.com/evilmartians/evil-client/pull/21]))
+- Method to pass response handling to parent scopes (Envek)
 
   Allow to handle specific cases in operations and common cases in parent scopes.
 
@@ -44,11 +50,11 @@ to [Semantic Versioning].
 
 ### Fixed
 
-- Generation of English error messages in case of using non-English locales
+- Generation of English error messages in case of using non-English locales (Envek)
 
 ### Changed
 
-- Version requirement for tram-policy is limited due to regression in 0.2.4
+- Version requirement for tram-policy is limited due to regression in 0.2.4 (Envek)
 
   See https://github.com/tram-rb/tram-policy/commit/874c8f61399dbe174c158fec729d16c2b1ffb2fd#r26432444
 
@@ -432,7 +438,8 @@ formats will be added.
 
 [Keep a Changelog]: http://keepachangelog.com/
 [Semantic Versioning]: http://semver.org/
-[dry-initializer]: http://github.com/dry-rb/dry-initalizer
+[dry-initializer]: https://github.com/dry-rb/dry-initalizer
+[tram-policy]: https://github.com/tram-rb/tram-policy
 [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

data/evil-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "evil-client"
-  gem.version  = "2.1.0"
+  gem.version  = "2.1.1"
   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"
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   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_runtime_dependency "tram-policy", "~> 0.2.3"
 
   gem.add_development_dependency "rake", ">= 10"
   gem.add_development_dependency "rspec", "~> 3.0"

data/lib/evil/client/model.rb

@@ -79,22 +79,11 @@ class Evil::Client
       # @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 }
+        validate_model other
+        extend_model   other
       end
-      # rubocop: enable Metrics/AbcSize
 
       # Model instance constructor
       #
@@ -113,13 +102,28 @@ class Evil::Client
       private
 
       def in_english(&block)
-        unless I18n.available_locales.include?(:en)
-          available_locales = I18n.available_locales
-          I18n.available_locales += %i[en]
-        end
+        available_locales = Array I18n.available_locales
+        I18n.available_locales = available_locales | %i[en]
         I18n.with_locale(:en, &block)
       ensure
-        I18n.available_locales = available_locales if available_locales
+        I18n.available_locales = available_locales
+      end
+
+      def validate_model(other)
+        return if other.ancestors.include? Evil::Client::Model
+        raise TypeError, "#{other} is not a subclass of Evil::Client::Model"
+      end
+
+      def extend_model(other)
+        other.dry_initializer.options.each do |definition|
+          option definition.source, definition.options
+        end
+
+        other.lets.each { |key, block| let(key, &block) }
+
+        other.policy.validators.each do |validator|
+          policy.local_validators << validator
+        end
       end
     end
   end

data/lib/evil/client/policy.rb

@@ -32,11 +32,13 @@ class Evil::Client
       alias_method :to_sym,  :name
       alias_method :inspect, :name
 
-      private
-
+      # Redefines translation scope for the policy
+      #
+      # @return[Array<Symbol>]
+      #
       def scope
         @scope ||= %i[evil client errors] << \
-                   Tram::Policy::Inflector.underscore(model.to_s)
+                   Tram::Policy::Inflector.underscore(model.to_s).to_sym
       end
     end
 

data/spec/fixtures/locales/en.yml

@@ -9,9 +9,12 @@ en:
               token_present: "To update user id:%{id} you must provide a token"
               name_present:  "The user has no name"
         test/client:
-          valid_credentials: You should set either token or password to authenticate the client
+          valid_credentials: &vc You should set either token or password to authenticate the client
           crm:
             users:
+              valid_credentials: *vc
+              fetch:
+                valid_credentials: *vc
               filter:
                   filter_given: You should define some filter with either name, email, or id
         test/model:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evil-client
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Andrew Kozin (nepalez)
@@ -58,9 +58,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-    - - "<="
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
@@ -68,9 +65,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-    - - "<="
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency