active_interaction 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66bb9089f91627be5b2370b6e68eb216ff3da581
-  data.tar.gz: 0f107c34005d354adb1fc2bad3b72776b588b455
+  metadata.gz: 570d5eae8a7122f5acf5ea497d191574073c80d1
+  data.tar.gz: f5a66f3defbfd2cee1dabf0a60f7d4799544b043
 SHA512:
-  metadata.gz: d17dab874880c2d8b363e749ef785800bece6d567196937968bd20637a8f7c1df5e653583d0397f11b2934d2c00aba16ada93af8e7b0abda6aa53df07de91463
-  data.tar.gz: 09dbd1ee68e85d8a0b49e492eb2043e75350fb6194385f654cb95fed861bfb63046e53ce7f909f83e0b90ea4097b71e2616d2ba11f6968b864b8004f07906d01
+  metadata.gz: 4af716412dbce18461deb2ff8a15878511c683ef9fc3bc499b027788ecba3d98ada05ed09ab615a0ec8adcfbcd61a39c57cd119a3095c26c3a0760891d9d74bd
+  data.tar.gz: 2911bf4456d0724b48804e4176ed96fcf40361b7dba671dfa7450f3a24180e3188a1509d4ffdeb8e41ed40e8895e80a4d2c5f96ce37651a14d208345c457ad82

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [3.0.1][] (2016-01-15)
+
+## Fixed
+
+- [#349][]: Merging errors on `:base` with a message that was a `String` attempted to translate it.
+
 # [3.0.0][] (2016-01-13)
 
 ## Changed
@@ -504,6 +510,7 @@ For help upgrading to version 2, please read [the announcement post][].
 
 - Initial release.
 
+  [3.0.1]: https://github.com/orgsync/active_interaction/compare/v3.0.0...v3.0.1
   [3.0.0]: https://github.com/orgsync/active_interaction/compare/v2.2.0...v3.0.0
   [2.2.0]: https://github.com/orgsync/active_interaction/compare/v2.1.5...v2.2.0
   [2.1.5]: https://github.com/orgsync/active_interaction/compare/v2.1.4...v2.1.5
@@ -660,5 +667,6 @@ For help upgrading to version 2, please read [the announcement post][].
   [#336]: https://github.com/orgsync/active_interaction/pull/336
   [#344]: https://github.com/orgsync/active_interaction/pull/344
   [#346]: https://github.com/orgsync/active_interaction/pull/346
+  [#349]: https://github.com/orgsync/active_interaction/pull/349
 
   [the announcement post]: http://devblog.orgsync.com/2015/05/06/announcing-active-interaction-2/

data/lib/active_interaction/base.rb

@@ -254,7 +254,7 @@ module ActiveInteraction
         begin
           public_send("#{name}=", filter.clean(inputs[name], self))
         rescue InvalidValueError, MissingValueError, NoDefaultError
-          # #type_check will add errors if appropriate.
+          nil # #type_check will add errors if appropriate.
         end
       end
     end

data/lib/active_interaction/errors.rb

@@ -121,8 +121,8 @@ module ActiveInteraction
       if attribute?(attribute)
         add(attribute, error, detail) unless added?(attribute, error, detail)
       else
-        message = full_message(
-          attribute, other.generate_message(attribute, error))
+        translated_error = translate(other, attribute, error)
+        message = full_message(attribute, translated_error)
         attribute = :base
         add(attribute, message) unless added?(attribute, message)
       end
@@ -131,5 +131,13 @@ module ActiveInteraction
     def attribute?(attribute)
       @base.respond_to?(attribute)
     end
+
+    def translate(other, attribute, error)
+      if error.is_a?(Symbol)
+        other.generate_message(attribute, error)
+      else
+        error
+      end
+    end
   end
 end

data/lib/active_interaction/filter.rb

@@ -14,7 +14,7 @@ module ActiveInteraction
   # Describes an input filter for an interaction.
   class Filter
     # @return [Hash{Symbol => Class}]
-    CLASSES = {}
+    CLASSES = {} # rubocop:disable Style/MutableConstant
     private_constant :CLASSES
 
     # @return [Hash{Symbol => Filter}]

data/lib/active_interaction/filters/abstract_date_time_filter.rb

@@ -9,7 +9,7 @@ module ActiveInteraction
   #
   # @private
   class AbstractDateTimeFilter < AbstractFilter
-    alias_method :_cast, :cast
+    alias _cast cast
     private :_cast
 
     def cast(value, context)

data/lib/active_interaction/filters/abstract_numeric_filter.rb

@@ -8,7 +8,7 @@ module ActiveInteraction
   #
   # @private
   class AbstractNumericFilter < AbstractFilter
-    alias_method :_cast, :cast
+    alias _cast cast
     private :_cast
 
     def cast(value, context)

data/lib/active_interaction/filters/time_filter.rb

@@ -24,7 +24,7 @@ module ActiveInteraction
   class TimeFilter < AbstractDateTimeFilter
     register :time
 
-    alias_method :_klass, :klass
+    alias _klass klass
     private :_klass
 
     def initialize(name, options = {}, &block)

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/base_spec.rb

@@ -36,7 +36,7 @@ describe ActiveInteraction::Base do
   describe '.new(inputs = {})' do
     it 'does not allow :_interaction_* as an option' do
       key = :"_interaction_#{SecureRandom.hex}"
-      inputs.merge!(key => nil)
+      inputs[key] = nil
       expect do
         interaction
       end.to raise_error ActiveInteraction::InvalidValueError
@@ -44,7 +44,7 @@ describe ActiveInteraction::Base do
 
     it 'does not allow "_interaction_*" as an option' do
       key = "_interaction_#{SecureRandom.hex}"
-      inputs.merge!(key => nil)
+      inputs[key] = nil
       expect do
         interaction
       end.to raise_error ActiveInteraction::InvalidValueError
@@ -75,7 +75,7 @@ describe ActiveInteraction::Base do
         end
 
         context 'passing' do
-          before { inputs.merge!(thing: SecureRandom.hex) }
+          before { inputs[:thing] = SecureRandom.hex }
 
           it 'returns a valid outcome' do
             expect(interaction).to be_valid
@@ -85,7 +85,7 @@ describe ActiveInteraction::Base do
 
       context 'with a single input' do
         let(:thing) { SecureRandom.hex }
-        before { inputs.merge!(thing: thing) }
+        before { inputs[:thing] = thing }
 
         it 'sets the attribute' do
           expect(interaction.thing).to eql thing
@@ -98,7 +98,7 @@ describe ActiveInteraction::Base do
 
       context 'validation' do
         context 'failing' do
-          before { inputs.merge!(thing: thing) }
+          before { inputs[:thing] = thing }
 
           context 'with an invalid value' do
             let(:thing) { 'a' }
@@ -118,7 +118,7 @@ describe ActiveInteraction::Base do
         end
 
         context 'passing' do
-          before { inputs.merge!(thing: 1) }
+          before { inputs[:thing] = 1 }
 
           it 'returns a valid outcome' do
             expect(interaction).to be_valid
@@ -127,7 +127,7 @@ describe ActiveInteraction::Base do
       end
 
       context 'with a single input' do
-        before { inputs.merge!(thing: 1) }
+        before { inputs[:thing] = 1 }
 
         it 'sets the attribute to the filtered value' do
           expect(interaction.thing).to eql 1.0
@@ -248,7 +248,7 @@ describe ActiveInteraction::Base do
       end
 
       context 'passing validations' do
-        before { inputs.merge!(thing: thing) }
+        before { inputs[:thing] = thing }
 
         context 'failing runtime validations' do
           before do
@@ -311,7 +311,7 @@ describe ActiveInteraction::Base do
       end
 
       context 'passing validations' do
-        before { inputs.merge!(thing: thing) }
+        before { inputs[:thing] = thing }
 
         it 'returns the result' do
           expect(result[:thing]).to eql thing
@@ -341,7 +341,8 @@ describe ActiveInteraction::Base do
 
     context 'with valid composition' do
       before do
-        inputs.merge!(x: x, z: z)
+        inputs[:x] = x
+        inputs[:z] = z
       end
 
       it 'is valid' do
@@ -485,7 +486,7 @@ describe ActiveInteraction::Base do
       let(:thing) { rand }
 
       before do
-        inputs.merge!(thing: thing)
+        inputs[:thing] = thing
       end
 
       it 'returns true' do

data/spec/active_interaction/concerns/runnable_spec.rb

@@ -90,7 +90,7 @@ describe ActiveInteraction::Runnable do
     let(:result) { double }
 
     it 'returns the result' do
-      expect(instance.result = result).to eql result
+      expect((instance.result = result)).to eql result
     end
 
     it 'sets the result' do

data/spec/active_interaction/errors_spec.rb

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

data/spec/active_interaction/filters/date_filter_spec.rb

@@ -10,7 +10,7 @@ describe ActiveInteraction::DateFilter, :filter do
     let(:format) { '%d/%m/%Y' }
 
     before do
-      options.merge!(format: format)
+      options[:format] = format
     end
   end
 
@@ -116,12 +116,10 @@ describe ActiveInteraction::DateFilter, :filter do
   describe '#default' do
     context 'with a GroupedInput' do
       before do
-        options.merge!(
-          default: ActiveInteraction::GroupedInput.new(
-            '1' => '2012',
-            '2' => '1',
-            '3' => '2'
-          )
+        options[:default] = ActiveInteraction::GroupedInput.new(
+          '1' => '2012',
+          '2' => '1',
+          '3' => '2'
         )
       end
 

data/spec/active_interaction/filters/date_time_filter_spec.rb

@@ -10,7 +10,7 @@ describe ActiveInteraction::DateTimeFilter, :filter do
     let(:format) { '%d/%m/%Y %H:%M:%S %:z' }
 
     before do
-      options.merge!(format: format)
+      options[:format] = format
     end
   end
 
@@ -124,15 +124,13 @@ describe ActiveInteraction::DateTimeFilter, :filter do
   describe '#default' do
     context 'with a GroupedInput' do
       before do
-        options.merge!(
-          default: ActiveInteraction::GroupedInput.new(
-            '1' => '2012',
-            '2' => '1',
-            '3' => '2',
-            '4' => '3',
-            '5' => '4',
-            '6' => '5'
-          )
+        options[:default] = ActiveInteraction::GroupedInput.new(
+          '1' => '2012',
+          '2' => '1',
+          '3' => '2',
+          '4' => '3',
+          '5' => '4',
+          '6' => '5'
         )
       end
 

data/spec/active_interaction/filters/decimal_filter_spec.rb

@@ -10,7 +10,7 @@ describe ActiveInteraction::DecimalFilter, :filter do
     let(:digits) { 4 }
 
     before do
-      options.merge!(digits: digits)
+      options[:digits] = digits
     end
   end
 

data/spec/active_interaction/filters/hash_filter_spec.rb

@@ -80,7 +80,7 @@ describe ActiveInteraction::HashFilter, :filter do
   describe '#default' do
     context 'with a Hash' do
       before do
-        options.merge!(default: {})
+        options[:default] = {}
       end
 
       it 'returns the Hash' do
@@ -90,7 +90,7 @@ describe ActiveInteraction::HashFilter, :filter do
 
     context 'with a non-empty Hash' do
       before do
-        options.merge!(default: { a: {} })
+        options[:default] = { a: {} }
       end
 
       it 'raises an error' do

data/spec/active_interaction/filters/object_filter_spec.rb

@@ -10,7 +10,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
   it_behaves_like 'a filter'
 
   before do
-    options.merge!(class: Thing)
+    options[:class] = Thing
   end
 
   describe '#cast' do
@@ -101,7 +101,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
 
     context 'with class as a superclass' do
       before do
-        options.merge!(class: Thing.superclass)
+        options[:class] = Thing.superclass
       end
 
       it 'returns the instance' do
@@ -111,7 +111,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
 
     context 'with class as a String' do
       before do
-        options.merge!(class: Thing.name)
+        options[:class] = Thing.name
       end
 
       it 'returns the instance' do
@@ -131,7 +131,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
 
     context 'with class as an invalid String' do
       before do
-        options.merge!(class: 'invalid')
+        options[:class] = 'invalid'
       end
 
       it 'raises an error' do

data/spec/active_interaction/filters/string_filter_spec.rb

@@ -8,7 +8,7 @@ describe ActiveInteraction::StringFilter, :filter do
 
   shared_context 'without strip' do
     before do
-      options.merge!(strip: false)
+      options[:strip] = false
     end
   end
 

data/spec/active_interaction/filters/time_filter_spec.rb

@@ -10,7 +10,7 @@ describe ActiveInteraction::TimeFilter, :filter do
     let(:format) { '%d/%m/%Y %H:%M:%S %z' }
 
     before do
-      options.merge!(format: format)
+      options[:format] = format
     end
   end
 
@@ -146,15 +146,13 @@ describe ActiveInteraction::TimeFilter, :filter do
   describe '#default' do
     context 'with a GroupedInput' do
       before do
-        options.merge!(
-          default: ActiveInteraction::GroupedInput.new(
-            '1' => '2012',
-            '2' => '1',
-            '3' => '2',
-            '4' => '3',
-            '5' => '4',
-            '6' => '5'
-          )
+        options[:default] = ActiveInteraction::GroupedInput.new(
+          '1' => '2012',
+          '2' => '1',
+          '3' => '2',
+          '4' => '3',
+          '5' => '4',
+          '6' => '5'
         )
       end
 

data/spec/active_interaction/integration/array_interaction_spec.rb

@@ -31,7 +31,7 @@ describe ArrayInteraction do
   context 'with inputs[:a]' do
     let(:a) { [[]] }
 
-    before { inputs.merge!(a: a) }
+    before { inputs[:a] = a }
 
     it 'returns the correct value for :a' do
       expect(result[:a]).to eql a

data/spec/active_interaction/integration/hash_interaction_spec.rb

@@ -18,7 +18,7 @@ describe HashInteraction do
   context 'with inputs[:a]' do
     let(:a) { { x: {} } }
 
-    before { inputs.merge!(a: a) }
+    before { inputs[:a] = a }
 
     it 'returns the correct value for :a' do
       expect(result[:a]).to eql a.with_indifferent_access

data/spec/active_interaction/integration/time_interaction_spec.rb

@@ -10,6 +10,7 @@ TimeZone = Class.new do
   def self.parse(*args)
     TimeWithZone.new(Time.parse(*args))
   rescue ArgumentError
+    nil
   end
 end
 
@@ -37,7 +38,7 @@ describe TimeInteraction do
     let(:a) { nil }
 
     before do
-      inputs.merge!(a: a)
+      inputs[:a] = a
 
       allow(Time).to receive(:zone).and_return(TimeZone)
     end

data/spec/support/filters.rb

@@ -9,7 +9,7 @@ shared_context 'filters' do
 
   shared_context 'optional' do
     before do
-      options.merge!(default: nil)
+      options[:default] = nil
     end
   end
 
@@ -112,7 +112,7 @@ shared_examples_for 'a filter' do
 
     context 'with an invalid default' do
       before do
-        options.merge!(default: Object.new)
+        options[:default] = Object.new
       end
 
       it 'raises an error' do
@@ -144,7 +144,7 @@ shared_examples_for 'a filter' do
 
     context 'with an invalid default' do
       before do
-        options.merge!(default: Object.new)
+        options[:default] = Object.new
       end
 
       it 'raises an error' do
@@ -177,7 +177,7 @@ shared_examples_for 'a filter' do
       let(:desc) { SecureRandom.hex }
 
       before do
-        options.merge!(desc: desc)
+        options[:desc] = desc
       end
 
       it 'returns the description' do

data/spec/support/interactions.rb

@@ -54,7 +54,7 @@ shared_examples_for 'an interaction' do |type, generator, filter_options = {}|
   context 'with inputs[:required]' do
     let(:required) { generator.call }
 
-    before { inputs.merge!(required: required) }
+    before { inputs[:required] = required }
 
     it 'is valid' do
       expect(outcome).to be_valid
@@ -73,7 +73,7 @@ shared_examples_for 'an interaction' do |type, generator, filter_options = {}|
     end
 
     it 'does not return nil for :default when given nil' do
-      inputs.merge!(default: nil)
+      inputs[:default] = nil
       expect(result[:default]).to_not be_nil
     end
 
@@ -92,7 +92,7 @@ shared_examples_for 'an interaction' do |type, generator, filter_options = {}|
     context 'with inputs[:optional]' do
       let(:optional) { generator.call }
 
-      before { inputs.merge!(optional: optional) }
+      before { inputs[:optional] = optional }
 
       it 'returns the correct value for :optional' do
         expect(result[:optional]).to eql optional
@@ -102,7 +102,7 @@ shared_examples_for 'an interaction' do |type, generator, filter_options = {}|
     context 'with inputs[:default]' do
       let(:default) { generator.call }
 
-      before { inputs.merge!(default: default) }
+      before { inputs[:default] = default }
 
       it 'returns the correct value for :default' do
         expect(result[:default]).to eql default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -163,14 +163,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: 0.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Manage application specific business logic.