dry-mutations 0.99.100 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef60a2ff49f64d8a640292d1bb70e5ff52bc8cf8
-  data.tar.gz: 21c45010a109911e25d397994128ad3e5fe81ed1
+  metadata.gz: 23228f617c8162feb245848da2e562f4b9425bc7
+  data.tar.gz: 40dc518c5051e58a87950020bccdaf0de17b7dd9
 SHA512:
-  metadata.gz: faf1055254a03e47b49298b821c7d8a73f04dd616b776bb33dcf46548728e811e8d7145187e82dfa276615f3f77b4c5bb1892ec0f1fe17ad6322917423e10eda
-  data.tar.gz: be638ebe8f86ddcbf46dc1fd05e10ca9d68fc6b0c702014ed928fdae83e8f69b1c3ac60fd1f31417622b23c80eed549ea0305eeff60140987c0d571cc21f3fcf
+  metadata.gz: 72fed50dd92a78813505cb95db253999860513d8253f0c5a568fa7dba370920c7cc8439b6ebba3a58473bf7c03ffb727481f84802e090029c8b0da93621d1e85
+  data.tar.gz: b91a085cdc2d0a279d527734c3b55e632cda6722cacc898e0d213c3612182f8800ff7256ffe6b1be0debd2103381301278630755d6d6f219680cc7a17f611750

data/.rubocop.yml

@@ -19,15 +19,27 @@ Metrics/PerceivedComplexity:
 Metrics/AbcSize:
   Max: 42
 
+Metrics/ModuleLength:
+  Max: 256
+
+Metrics/BlockLength:
+  Max: 64
+
+################################################################################
+
+Lint/EmptyWhen:
+  Enabled: false
+
 ################################################################################
 
 Style/SignalException:
   EnforcedStyle: semantic
 
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
 Style/MethodName:
-  Exclude:
-    - 'lib/dry/mutations/utils.rb'
-    - 'lib/dry/transactions/*.rb'
+  Enabled: false
 
 Style/VariableName:
   SupportedStyles: snake_case

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 rvm:
-  - 2.1.1
   - 2.1.8
   - 2.2.2
-  - 2.3.1
   - 2.4.0
 before_install: gem install bundler -v 1.13.7
 addons:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dry-mutations (0.99.100)
+    dry-mutations (1.0.0)
       activesupport (>= 3.2, < 5)
       dry-transaction (~> 0.9)
       dry-validation (~> 0.10)
@@ -11,16 +11,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
+      arel (~> 6.0)
     activesupport (4.2.8)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    arel (6.0.4)
     awesome_print (1.7.0)
+    builder (3.2.3)
     codeclimate-test-reporter (1.0.3)
       simplecov
     coderay (1.1.1)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.2.5)
     docile (1.1.5)
     dry-configurable (0.6.1)
@@ -59,11 +68,11 @@ GEM
       dry-logic (~> 0.4, >= 0.4.0)
       dry-types (~> 0.9, >= 0.9.0)
     hashie (3.5.5)
-    i18n (0.8.1)
+    i18n (0.8.4)
     inflecto (0.0.2)
-    json (1.8.3)
+    json (2.0.3)
     method_source (0.8.2)
-    minitest (5.10.1)
+    minitest (5.10.2)
     mutations (0.8.1)
       activesupport
     pry (0.10.4)
@@ -90,8 +99,9 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
+    sqlite3 (1.3.11)
     thread_safe (0.3.6)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     wisper (1.6.1)
 
@@ -99,6 +109,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (>= 3.2, < 5)
   awesome_print
   bundler (~> 1.10)
   codeclimate-test-reporter
@@ -107,6 +118,7 @@ DEPENDENCIES
   rake (~> 10.0)
   rspec (~> 3)
   simplecov
+  sqlite3
 
 BUNDLED WITH
    1.13.7

data/README.md

@@ -162,6 +162,15 @@ required do
 end
 ```
 
+## `ActiveRecord::Relation` support
+
+
+```ruby
+schema(Dry::Mutations.Schema do
+  required(:slaves).filled(relation?: Slave)
+end)
+```
+
 ## Combining dry schemas with mutation-like syntax
 
 Since version `0.99.9`, one might pass the `Dry::Validation::Schema` directly

data/config/messages.yml

@@ -2,6 +2,7 @@ en:
   errors:
     duck?: 'must respond to %{expected}'
     model?: 'must be a model (instance of %{expected})'
+    relation?: 'must be a relation (many instances of %{expected})'
     discard_empty: 'aleksei’s too dumb error (%{expected},) you won :-P'
     default?: 'default value implementation sucks'
     class: 'class guard for arrays implementation sucks'

data/dry-mutations.gemspec

@@ -31,6 +31,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'activerecord', '< 5', '>= 3.2'  # prevent mutations to require activerecord 5
 
   spec.add_dependency 'activesupport', '< 5', '>= 3.2' # prevent mutations to require activesupport 5
   spec.add_dependency 'mutations', '~> 0.8'

data/lib/dry/mutations/extensions/command.rb

@@ -27,7 +27,7 @@ module Dry
 
           base.singleton_class.prepend(Module.new do
             def respond_to_missing?(method_name, include_private = false)
-              [:call, :to_proc].include?(method_name) || super
+              %i|call to_proc|.include?(method_name) || super
             end
           end)
         end
@@ -134,26 +134,31 @@ module Dry
         def predicates(input, digged = [])
           case input
           when Dry::Logic::Rule::Predicate then digged << input
-          when Array then input.each { |e| predicates(e, digged) }
-          when ->(i) { i.respond_to?(:rules) }
-            predicates(input.rules, digged)
+          when Array, ActiveRecord::Relation then input.each { |e| predicates(e, digged) }
+          when ->(i) { i.respond_to?(:rules) } then predicates(input.rules, digged)
           end
           digged
         end
 
+        # rubocop:disable Style/YodaCondition
         def dig(predicate, input = schema)
           case input.rules
           when Hash # the whole schema
             input.rules.map do |k, v|
               pred = predicates(v).detect do |p|
-                p.respond_to?(:predicate) && (p = p.predicate).is_a?(Method) && "#{p.owner}##{p.name}" == predicate
+                p.respond_to?(:predicate) &&
+                  (p = p.predicate).is_a?(Method) &&
+                  "#{p.owner}##{p.name}" == predicate
               end
               pred ? [k, pred] : nil
             end.compact.to_h
           else
-            predicates(input).detect { |p| "#{p.owner}##{p.name}" == predicate }
+            predicates(input).detect do |p|
+              "#{p.owner}##{p.name}" == predicate
+            end
           end
         end
+        # rubocop:enable Style/YodaCondition
 
         def defaults
           ::Dry::Mutations::Utils.Hash(

data/lib/dry/mutations/predicates.rb

@@ -3,6 +3,17 @@ module Dry
     module Predicates # :nodoc:
       include ::Dry::Logic::Predicates
 
+      RAILS_4_RELATION = 'ActiveRecord_Associations_CollectionProxy'.freeze
+
+      predicate(:relation?) do |expected, current|
+        if expected.const_defined?(RAILS_4_RELATION)
+          current.is_a?(expected.const_get(RAILS_4_RELATION))
+        else
+          # Gracefull fallback for Rails3
+          current.is_a?(ActiveRecord::Relation) && current.name == expected.name
+        end
+      end
+
       predicate(:duck?) do |expected, current|
         expected.empty? || expected.all?(&current.method(:respond_to?))
       end

data/lib/dry/mutations/schema.rb

@@ -14,7 +14,6 @@ module Dry
       end
 
       configure(&CONFIGURATOR)
-      # predicates(::Dry::Mutations::Predicates)
 
       def discarded
         @@discarded

data/lib/dry/mutations/utils/dry-mutations.rb

@@ -78,8 +78,8 @@ module Dry
               end
             end
           )
-        when -> (t) { DRY_TYPES.include?(t) } then :"#{type}?"
-        # else nil # implicit # FIXME: IS IT OK?
+        when ->(t) { DRY_TYPES.include?(t) } then :"#{type}?"
+          # else type implicitly return `nil` here TODO
         end
       end
 

data/lib/dry/mutations/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Mutations
-    VERSION = '0.99.100'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-mutations
 version: !ruby/object:Gem::Version
-  version: 0.99.100
+  version: 1.0.0
 platform: ruby
 authors:
 - Aleksei Matiushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-25 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement