active_interaction 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efaabefa03827c037549d3199559e79028e01014
-  data.tar.gz: c31b3dfde06e95dd679771e2719300c3ceeb155a
+  metadata.gz: c0d9ea988d5cb1324a1cfff2baa3c901eafb47ce
+  data.tar.gz: 70ddb30716690e05f11fa65314a609ba61a4633e
 SHA512:
-  metadata.gz: e89ce8aa7c3d8ffa79de7720444086a425edc0e287ac0a87d96b5b987bc5275af0c916eef480f59f66b57b0be6c29a0b2c094bb0719de5156d0acb6a7b005bd5
-  data.tar.gz: cc04bc1579b22405deba56144038f681bbb99b3db413382bc5126a703a761e711fafbc23fb32dca99271472492619dd58ffec5f1b8628e28c71b8a16ac8f4415
+  metadata.gz: 232fdf439bb14b719903140fd7da05339a98ea7d926e9540ee65333ec2e6d3889676b94194b3e3de3fa5311fa55363a5e88a43828deace94ec1a49d2438e60dd
+  data.tar.gz: 7f0125b70ae502bcb5b891d71b613cedb8321d046c5730f4e559c3d9f81c36986492085b06fef341514f8860fcf9ed7b711808a7a09769370273d293c3182364

data/lib/active_interaction/errors.rb

@@ -126,7 +126,7 @@ module ActiveInteraction
     end
 
     def merge_detail!(other, attribute, detail, error)
-      if attribute?(attribute)
+      if attribute?(attribute) || attribute == :base
         add(attribute, error, detail) unless added?(attribute, error, detail)
       else
         translated_error = translate(other, attribute, error)

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/errors_spec.rb

@@ -68,6 +68,17 @@ describe ActiveInteraction::Errors do
         end
       end
 
+      context 'that is a symbol on base' do
+        before do
+          other.add(:base)
+        end
+
+        it 'adds the error' do
+          errors.merge!(other)
+          expect(errors.details[:base]).to eql [{ error: :invalid }]
+        end
+      end
+
       context 'that is a string' do
         let(:message) { SecureRandom.hex }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel