active_interaction 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe823793d930b947cf93fb8c5e9653b7bcd63e49
-  data.tar.gz: 9bfec14c2454c235e20e1ab347c927680ddb7101
+  metadata.gz: 58a3ed3559d4e08664cc19fb81100a947bb597e8
+  data.tar.gz: d7d1152399851b34028504b90b05a5cfda76e14f
 SHA512:
-  metadata.gz: f469a6ed3d1efa8afab46b59a2c1c910ce4fa0a089524d892f04da1c9e7a17a8450a49d3c445f16c19a9df228606271fde3a33ab0cdf4049cc00eca2612e544c
-  data.tar.gz: 1abe93f04ed2ff447e0a36189b41386e98bfbf9abeb4f19d5a849aae461a0becf5c141be7464d88511031a225010a9cf96facb9d0145002ce5abd654d26fe6dc
+  metadata.gz: 96954a543eb586113be298cef976bbbdc5bb1eeed62de460d5b42ac3ad3c2c56896483729ad1c4a012ef08757b1e92a47848b9b7db7c903ebea3f3455967cfba
+  data.tar.gz: 046393507e5bb5acfea4db4bd0b1e95222d8dfafd156bb5289668c0139153ce1c9e9a643d1b3fc7c41d5bcdd444df5abc47c300301a9721a8757471eea2976e7

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # [Master][]
 
+# [0.3.0][] (2013-08-07)
+
+- Give better error messages for nested attributes.
+- Use default value when given an explicit `nil`.
+- Allow nested default values.
+
 # [0.2.2][] (2013-08-07)
 
 - Fix support for `ActiveSupport::TimeWithZone`.
@@ -33,7 +39,8 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v0.2.2...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v0.3.0...master
+  [0.3.0]: https://github.com/orgsync/active_interaction/compare/v0.2.2...v0.3.0
   [0.2.2]: https://github.com/orgsync/active_interaction/compare/v0.2.1...v0.2.2
   [0.2.1]: https://github.com/orgsync/active_interaction/compare/v0.2.0...v0.2.1
   [0.2.0]: https://github.com/orgsync/active_interaction/compare/v0.1.3...v0.2.0

data/README.md

@@ -22,7 +22,7 @@ This project uses [semantic versioning][].
 Add it to your Gemfile:
 
 ```ruby
-gem 'active_interaction', '~> 0.2.2'
+gem 'active_interaction', '~> 0.3.0'
 ```
 
 And then execute:

data/lib/active_interaction/base.rb

@@ -121,7 +121,9 @@ module ActiveInteraction
     # @return The return value of {#execute}.
     def self.run!(options = {})
       outcome = run(options)
-      raise InteractionInvalid if outcome.invalid?
+      if outcome.invalid?
+        raise InteractionInvalid, outcome.errors.full_messages.join(', ')
+      end
       outcome.result
     end
 
@@ -144,7 +146,7 @@ module ActiveInteraction
         begin
           default = filter.
             prepare(attribute, options[:default], options, &block)
-        rescue InvalidValue
+        rescue InvalidNestedValue, InvalidValue
           raise InvalidDefaultValue
         end
       end
@@ -170,7 +172,7 @@ module ActiveInteraction
         value =
           begin
             filter.prepare(attribute, value, options, &block)
-          rescue InvalidValue, MissingValue
+          rescue InvalidNestedValue, InvalidValue, MissingValue
             value
           end
         instance_variable_set("@#{attribute}", value)
@@ -188,11 +190,13 @@ module ActiveInteraction
       define_method(validator) do
         begin
           filter.prepare(attribute, send(attribute), options, &block)
-        rescue MissingValue
-          errors.add(attribute, 'is required')
+        rescue InvalidNestedValue
+          errors.add(attribute, 'is invalid')
         rescue InvalidValue
           errors.add(attribute,
                      "is not a valid #{type.to_s.humanize.downcase}")
+        rescue MissingValue
+          errors.add(attribute, 'is required')
         end
       end
       private validator

data/lib/active_interaction/errors.rb

@@ -1,6 +1,7 @@
 module ActiveInteraction
   class InteractionInvalid < ::StandardError; end
   class InvalidDefaultValue < ::StandardError; end
+  class InvalidNestedValue < ::StandardError; end
   class InvalidValue < ::StandardError; end
   class MissingValue < ::StandardError; end
 end

data/lib/active_interaction/filter.rb

@@ -20,6 +20,8 @@ module ActiveInteraction
         when NilClass
           if options[:allow_nil]
             nil
+          elsif options.has_key?(:default)
+            options[:default]
           else
             raise MissingValue
           end

data/lib/active_interaction/filter_method.rb

@@ -8,10 +8,6 @@ module ActiveInteraction
 
       @attribute = args.shift if args.first.is_a?(Symbol)
       @options = (args.first || {}).dup
-
-      if @options.include?(:default)
-        raise ArgumentError, ':default is not supported inside filter blocks'
-      end
     end
   end
 end

data/lib/active_interaction/filters/array_filter.rb

@@ -41,6 +41,8 @@ module ActiveInteraction
         Filter.factory(method.method_name).
           prepare(method.attribute, value, method.options, &method.block)
       end
+    rescue InvalidValue, MissingValue
+      raise InvalidNestedValue
     end
     private_class_method :convert_values
 

data/lib/active_interaction/filters/hash_filter.rb

@@ -25,7 +25,7 @@ module ActiveInteraction
     def self.prepare(key, value, options = {}, &block)
       case value
         when Hash
-          convert_values(value.dup, &block)
+          convert_values(value.merge(options[:default] || {}), &block)
         else
           super
       end
@@ -41,6 +41,8 @@ module ActiveInteraction
       end
 
       hash
+    rescue InvalidValue, MissingValue
+      raise InvalidNestedValue
     end
     private_class_method :convert_values
   end

data/lib/active_interaction/version.rb

@@ -1,3 +1,3 @@
 module ActiveInteraction
-  VERSION = Gem::Version.new('0.2.2')
+  VERSION = Gem::Version.new('0.3.0')
 end

data/spec/active_interaction/filter_method_spec.rb

@@ -32,11 +32,6 @@ describe ActiveInteraction::FilterMethod do
       before { args << options }
 
       include_examples 'instance variable assignment'
-
-      it 'does not allow :default' do
-        options.merge!(default: nil)
-        expect { filter_method }.to raise_error ArgumentError
-      end
     end
 
     context 'with a block' do

data/spec/active_interaction/filters/array_filter_spec.rb

@@ -28,7 +28,9 @@ describe ActiveInteraction::ArrayFilter do
         let(:value) { [Object.new] }
 
         it 'raises an error' do
-          expect { result }.to raise_error ActiveInteraction::InvalidValue
+          expect {
+            result
+          }.to raise_error ActiveInteraction::InvalidNestedValue
         end
       end
     end

data/spec/active_interaction/filters/hash_filter_spec.rb

@@ -28,7 +28,9 @@ describe ActiveInteraction::HashFilter do
         let(:value) { { a: Object.new } }
 
         it 'raises an error' do
-          expect { result }.to raise_error ActiveInteraction::InvalidValue
+          expect {
+            result
+          }.to raise_error ActiveInteraction::InvalidNestedValue
         end
       end
     end

data/spec/active_interaction/integration/array_interaction_spec.rb

@@ -53,17 +53,23 @@ describe ArrayInteraction do
     end
   end
 
-  context 'with an invalidly nested default' do
-    it 'raises an error' do
-      expect {
-        klass = Class.new(ActiveInteraction::Base) do
-          array :a do
-            array default: []
-          end
+  context 'with a validly nested default' do
+    let(:described_class) do
+      Class.new(ActiveInteraction::Base) do
+        array :a do
+          array default: [rand]
         end
-        # TODO: Fail when defining class, not running it.
-        klass.run(a: [])
-      }.to raise_error ArgumentError
+        def execute; a end
+      end
+    end
+    let(:options) { { a: [] } }
+
+    it 'does not raise an error' do
+      expect { described_class.run(options) }.to_not raise_error
+    end
+
+    it 'ignores the nested default value' do
+      expect(described_class.run!(options)).to eq options[:a]
     end
   end
 end

data/spec/active_interaction/integration/hash_interaction_spec.rb

@@ -53,17 +53,23 @@ describe HashInteraction do
     end
   end
 
-  context 'with an invalidly nested default' do
-    it 'raises an error' do
-      expect {
-        klass = Class.new(ActiveInteraction::Base) do
-          hash :a do
-            hash :x, default: {}
-          end
+  context 'with a validly nested default' do
+    let(:described_class) do
+      Class.new(ActiveInteraction::Base) do
+        hash :a do
+          hash :x, default: { y: rand }
         end
-        # TODO: Fail when defining class, not running it.
-        klass.run(a: {})
-      }.to raise_error ArgumentError
+        def execute; a end
+      end
+    end
+    let(:options) { { a: { x: {} } } }
+
+    it 'does not raise an error' do
+      expect { described_class.run(options) }.to_not raise_error
+    end
+
+    it 'merges the nested default value' do
+      expect(described_class.run!(options)[:x]).to have_key(:y)
     end
   end
 end

data/spec/support/interactions.rb

@@ -57,6 +57,11 @@ shared_examples_for 'an interaction' do |type, generator, filter_options = {}|
       expect(result[:default]).to_not be_nil
     end
 
+    it 'does not return nil for :default when given nil' do
+      options.merge!(default: nil)
+      expect(result[:default]).to_not be_nil
+    end
+
     it 'returns nil for :nil_default' do
       expect(result[:nil_default]).to be_nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Aaron Lasseigne