active_interaction 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e565176aa5fba8541adcb1bff86f9deb7b88de08
-  data.tar.gz: 071ae728292232470bf81b5ae049c7e51444ef8f
+  metadata.gz: c2eca96d7ec5eccc82c4321445f7c0e009a0d8e6
+  data.tar.gz: '048a0f22cd8c0e2071eb1428aff2cd9c88be0482'
 SHA512:
-  metadata.gz: 049b8e1805135d5a6f4a800e7fcefd68d6d6f26513d75f48cede2aebf83120ea52815d7bf02f94c39417b4222de08e29e571aaf63717c5857dca7688cb09acfa
-  data.tar.gz: 94d18809c216c9fe7df17ff6b57b7b9e994ff0b1f097f432838856f038d48c6a2c16e7580324967754d643118b54d62f0d0549d23c936bff78177089455933bb
+  metadata.gz: a67fa88d500066873e6c4626d21fd76c5cf322989fab2fb9ab52f076ce7353d2e22856c4b40b204f23570bfd2d9f218f2c5d2289c77207f43d2a5c21dd557eb7
+  data.tar.gz: 24daf7828183f8093ea7aa19709a0b49f5f8f9f263cf997dd9c5ed32ae5e45beb7267ad892efff27d5318a67c5c6e75f1f31d9048e734284aabf0da4fbdbb65a

data/README.md

@@ -66,20 +66,20 @@ Read more on [the project page][] or check out [the full documentation][].
 Add it to your Gemfile:
 
 ``` rb
-gem 'active_interaction', '~> 3.4'
+gem 'active_interaction', '~> 3.5'
 ```
 
 Or install it manually:
 
 ``` sh
-$ gem install active_interaction --version '~> 3.4'
+$ gem install active_interaction --version '~> 3.5'
 ```
 
-This project uses [Semantic Versioning][]. Check out [the change log][] for a
+This project uses [Semantic Versioning][]. Check out [GitHub releases][] for a
 detailed list of changes. For help upgrading to version 2, please read [the
 announcement post][].
 
-ActiveInteraction works with Ruby 2.0 through 2.3 and ActiveModel 4.0 through
+ActiveInteraction works with Ruby 2.0 through 2.4 and ActiveModel 4.0 through
 5.0. If you want to use ActiveInteraction with an older version of Ruby or
 ActiveModel, use ActiveInteraction < 3.0.0.
 
@@ -1267,7 +1267,8 @@ are merged to create `inputs`. There are times where it is useful to know
 whether a value was passed to `run` or the result of a filter default. In
 particular, it is useful when `nil` is an acceptable value. For example, you
 may optionally track your users' birthdays. You can use the `given?` predicate
-to see if an input was even passed to `run`.
+to see if an input was even passed to `run`. With `given?` you can also check
+the input of a hash filter by passing a series of keys to check.
 
 ``` rb
 class UpdateUser < ActiveInteraction::Base
@@ -1401,7 +1402,7 @@ ActiveInteraction is licensed under [the MIT License][].
 [the project page]: http://orgsync.github.io/active_interaction/
 [the full documentation]: http://rubydoc.info/github/orgsync/active_interaction
 [semantic versioning]: http://semver.org/spec/v2.0.0.html
-[the change log]: CHANGELOG.md
+[GitHub releases]: https://github.com/orgsync/active_interaction/releases
 [the announcement post]: http://devblog.orgsync.com/2015/05/06/announcing-active-interaction-2/
 [active_model-errors_details]: https://github.com/cowbell/active_model-errors_details
 [aaron lasseigne]: https://github.com/AaronLasseigne

data/lib/active_interaction/base.rb

@@ -203,7 +203,8 @@ module ActiveInteraction
 
     # Returns `true` if the given key was in the hash passed to {.run}.
     # Otherwise returns `false`. Use this to figure out if an input was given,
-    # even if it was `nil`.
+    # even if it was `nil`. Keys within nested hash filter can also be checked
+    # by passing them in series.
     #
     # @example
     #   class Example < ActiveInteraction::Base
@@ -214,13 +215,36 @@ module ActiveInteraction
     #   Example.run!(x: nil)  # => true
     #   Example.run!(x: rand) # => true
     #
+    # @example Nested checks
+    #   class Example < ActiveInteraction::Base
+    #     hash :x, default: {} do
+    #       integer :y, default: nil
+    #     end
+    #     def execute; given?(:x, :y) end
+    #   end
+    #   Example.run!()               # => false
+    #   Example.run!(x: nil)         # => false
+    #   Example.run!(x: {})          # => false
+    #   Example.run!(x: { y: nil })  # => true
+    #   Example.run!(x: { y: rand }) # => true
+    #
     # @param input [#to_sym]
     #
     # @return [Boolean]
     #
     # @since 2.1.0
-    def given?(input)
-      @_interaction_keys.include?(input.to_sym)
+    def given?(input, *rest)
+      filter_level = self.class
+      input_level = @_interaction_inputs
+
+      [input, *rest].map(&:to_sym).each do |key|
+        filter_level = filter_level.filters[key]
+        if !filter_level || input_level.nil? || !input_level.key?(key)
+          break false
+        end
+
+        input_level = input_level[key]
+      end && true
     end
 
     protected
@@ -250,7 +274,7 @@ module ActiveInteraction
 
     # @param inputs [Hash{Symbol => Object}]
     def process_inputs(inputs)
-      @_interaction_keys = inputs.keys.to_set & self.class.filters.keys
+      @_interaction_inputs = inputs
 
       inputs.each do |key, value|
         raise InvalidValueError, key.inspect if InputProcessor.reserved?(key)

data/lib/active_interaction/version.rb

@@ -6,5 +6,5 @@ module ActiveInteraction
   # The version number.
   #
   # @return [Gem::Version]
-  VERSION = Gem::Version.new('3.4.0')
+  VERSION = Gem::Version.new('3.5.0')
 end

data/spec/active_interaction/base_spec.rb

@@ -436,6 +436,73 @@ describe ActiveInteraction::Base do
       inputs[:y] = rand
       expect(result).to be false
     end
+
+    context 'nested hash values' do
+      let(:described_class) do
+        Class.new(TestInteraction) do
+          hash :x, default: {} do
+            boolean :y,
+              default: true
+          end
+
+          def execute; end
+        end
+      end
+
+      it 'is true when the nested input is given' do
+        described_class.class_exec do
+          def execute
+            given?(:x, :y)
+          end
+        end
+
+        inputs[:x] = { y: false }
+        expect(result).to be true
+      end
+
+      it 'is false when the nested input is not given' do
+        described_class.class_exec do
+          def execute
+            given?(:x, :y)
+          end
+        end
+
+        inputs[:x] = {}
+        expect(result).to be false
+      end
+
+      it 'is false when the first input is not given' do
+        described_class.class_exec do
+          def execute
+            given?(:x, :y)
+          end
+        end
+
+        expect(result).to be false
+      end
+
+      it 'is false when the first input is nil' do
+        described_class.class_exec do
+          def execute
+            given?(:x, :y)
+          end
+        end
+
+        inputs[:x] = nil
+        expect(result).to be false
+      end
+
+      it 'returns false if you go too far' do
+        described_class.class_exec do
+          def execute
+            given?(:x, :y, :z)
+          end
+        end
+
+        inputs[:x] = { y: true }
+        expect(result).to be false
+      end
+    end
   end
 
   context 'inheritance' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Manage application specific business logic.