methodist 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7de08f2a184573192dbc368ed5e651bc88d4e1357d4c23f49a2806f9f2ad2e5
-  data.tar.gz: bbac31473819c708eec741dbdd7e2601f5a8ed9b915d189adc730990ef465a9f
+  metadata.gz: d4b0a1df657cf96583bdecf926cfa5beb74711aa2e942a47756e3eae03712ce8
+  data.tar.gz: ac96de08d5807f11da740f6356d246f2581c5befbe55e811b199cf6295935cd4
 SHA512:
-  metadata.gz: 0576137dde883b3239e9858ee7fbfc84a2b6b5564f66ea31b2494a0de0af0d56c35ab8bb68ac4a87601b845cc133f6dfc3703730bd4345a0b7d094b87303a359
-  data.tar.gz: ac09253556d655e4abe7777179ade14bab351ceefa5363fa472722445ba09d868577ab06f35c785269a8af703c06dcd646fba8b6e4b8788e2b3153b8a6842989
+  metadata.gz: 934db6fde4c720b1cf7777a1107967a700c710c1430aeb3952b2dbb9021458848b4f243d2f0d5740098e6707002e785a6ae29aba770e41d45c9a1bcbb3c00da6
+  data.tar.gz: 45aea636ce515ddd5a5e8366e3d6cf337d16e18f93e675399c57cee8fcfe6003e555c1937268ee4d4eee87870590e91328d75451308470974c927125ecaba9c2

data/lib/methodist/interactor.rb

@@ -10,6 +10,7 @@ require "dry/validation"
 #
 class Methodist::Interactor < Methodist::Pattern
   include Dry::Transaction
+  NEW_DRY_VALIDATION_V = '1.0.0'.freeze
 
   attr_accessor :validation_result
 
@@ -39,11 +40,22 @@ class Methodist::Interactor < Methodist::Pattern
     ##
     def schema(&block)
       if block_given?
-        @input_schema = Dry::Validation.Schema(&block)
+        @input_schema = dry_schema(&block)
       else
         raise SchemaDefinitionError, 'You must pass block to `schema`'
       end
     end
+
+    private
+
+    def dry_schema(&block)
+      return Dry::Schema.Params(&block) if new_dry_validation?
+      Dry::Validation.Schema(&block)
+    end
+
+    def new_dry_validation?
+      Gem.loaded_specs['dry-validation'].version.to_s >= NEW_DRY_VALIDATION_V
+    end
   end
 
   ##
@@ -100,7 +112,7 @@ class Methodist::Interactor < Methodist::Pattern
   # Method for validation input of interactor parameters.
   ##
   def failure_validation_value
-    field = validation_result.errors.keys.first
+    field = validation_result.errors.to_hash.keys.first
     {
       error: 'ValidationError',
       field: field,
@@ -108,7 +120,6 @@ class Methodist::Interactor < Methodist::Pattern
     }
   end
 
-
   class SchemaDefinitionError < StandardError; end
   class InputClassError < StandardError; end
 end

data/lib/methodist/version.rb

@@ -1,3 +1,3 @@
 module Methodist
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: methodist
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sergey Nesterov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-27 00:00:00.000000000 Z
+date: 2019-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,14 +28,14 @@ dependencies:
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Gem for Ruby on Rails created to stop chaos in your buisness logic.