active_interaction 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c697a5664d9fb8f7dc5e12088c25261aa878d5
-  data.tar.gz: d79c93af7a60358da30c2f91b381191fb4961847
+  metadata.gz: bcb762bfdc148c4eeb1e277f07e13c60fb3944d8
+  data.tar.gz: 7676378a761abeadec3fecc6e350dd27a7fbdd37
 SHA512:
-  metadata.gz: ffff1d6c71ca6be49b219b300bde3363bd282b3c6ea49805acd9a9a8ea452f8fd51caadda41a21bc75652c2b03562a61c207c90662d498e3c5c78b3c61daa52d
-  data.tar.gz: c8f8fba72f89b45bc1678c0bcc283286c67c077e2a481f5f5f339de8b3eb4576b2b4f1ccbec1a76c6ac027ead45bc24cdc0a33f1f183ebd041e15b44122da9b5
+  metadata.gz: 4abdb88c3887e65abed055d535a49ebf8ff9ccd42fba9798315c3f0cb7646461c60007381867c32a8a5f8b4c87082bd4a8bedd3905e3fec041cd0457daed94e9
+  data.tar.gz: b8c6e2b73a547575e9eaa92c3d412044174e3ea1196dd6a868ad17fb657cdbb495a5455f9411ba5bba9f1c76350bf7505ac78f576cae5b8a7080e0e5a751751b

data/lib/active_interaction/base.rb

@@ -169,8 +169,7 @@ module ActiveInteraction
     #
     # @private
     def initialize(inputs = {})
-      raise ArgumentError, 'inputs must be a hash' unless inputs.is_a?(Hash)
-
+      inputs = normalize_inputs!(inputs)
       process_inputs(inputs.symbolize_keys)
     end
 
@@ -234,6 +233,21 @@ module ActiveInteraction
 
     private
 
+    # We want to allow both `Hash` objects and `ActionController::Parameters`
+    # objects. In Rails < 5, parameters are a subclass of hash and calling
+    # `#symbolize_keys` returns the entire hash, not just permitted values. In
+    # Rails >= 5, parameters are not a subclass of hash but calling
+    # `#to_unsafe_h` returns the entire hash.
+    def normalize_inputs!(inputs)
+      return inputs if inputs.is_a?(Hash)
+
+      parameters = 'ActionController::Parameters'
+      klass = parameters.safe_constantize
+      return inputs.to_unsafe_h if klass && inputs.is_a?(klass)
+
+      raise ArgumentError, "inputs must be a hash or #{parameters}"
+    end
+
     # @param inputs [Hash{Symbol => Object}]
     def process_inputs(inputs)
       @_interaction_keys = inputs.keys.to_set & self.class.filters.keys

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/base_spec.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 require 'spec_helper'
+require 'action_controller'
 
 InteractionWithFilter = Class.new(TestInteraction) do
   float :thing
@@ -58,6 +59,22 @@ describe ActiveInteraction::Base do
       end
     end
 
+    context 'with non-hash inputs' do
+      let(:inputs) { [[:k, :v]] }
+
+      it 'raises an error' do
+        expect { interaction }.to raise_error ArgumentError
+      end
+    end
+
+    context 'with ActionController::Parameters inputs' do
+      let(:inputs) { ActionController::Parameters.new }
+
+      it 'does not raise an error' do
+        expect { interaction }.to_not raise_error
+      end
+    end
+
     context 'with a reader' do
       let(:described_class) do
         Class.new(TestInteraction) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel