Merge branch 'master' into v0.3.0

CHANGELOG.md

@@ -3,6 +3,10 @@
 - Use default value when given an explicit `nil`.
 - Allow nested default values.
 
+# [0.2.1][] (2013-08-06)
+
+- Fix setting a default value on more than one attribute at a time.
+
 # [0.2.0][] (2013-07-16)
 
 - Wrap interactions in ActiveRecord transactions if they're available.
@@ -28,7 +32,8 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v0.2.0...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v0.2.1...master
+  [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
   [0.1.3]: https://github.com/orgsync/active_interaction/compare/v0.1.2...v0.1.3
   [0.1.2]: https://github.com/orgsync/active_interaction/compare/v0.1.1...v0.1.2

README.md

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

lib/active_interaction/version.rb

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

spec/support/interactions.rb

@@ -14,14 +14,17 @@
       send(type, :default, filter_options.merge(default: generator.call))
       send(type, :nil_default,
            filter_options.merge(allow_nil: true, default: nil))
-      send(type, :multi_default_1, :multi_default_2, filter_options.merge(default: generator.call))
+      send(type, :defaults_1, :defaults_2,
+           filter_options.merge(default: generator.call))
 
       def execute
         {
           required: required,
           optional: optional,
           default: default,
-          nil_default: nil_default
+          nil_default: nil_default,
+          defaults_1: defaults_1,
+          defaults_2: defaults_2
         }
       end
     end
@@ -63,6 +66,14 @@ def execute
       expect(result[:nil_default]).to be_nil
     end
 
+    it 'does not return nil for :defaults_1' do
+      expect(result[:defaults_1]).to_not be_nil
+    end
+
+    it 'does not return nil for :defaults_2' do
+      expect(result[:defaults_2]).to_not be_nil
+    end
+
     context 'with options[:optional]' do
       let(:optional) { generator.call }
 
@@ -81,10 +92,6 @@ def execute
       it 'returns the correct value for :default' do
         expect(result[:default]).to eq default
       end
-
-      it 'sets the default on multiple attributes' do
-        expect(outcome).to be_valid
-      end
     end
   end
 end