active_interaction 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c363a94aaacce981bd5b48b6681e193a01f7449
-  data.tar.gz: 81bdc016e4c55ead1dc8d632fd361c1752ce4b9d
+  metadata.gz: 86843e7e3d2f88ef4972b87361eab66961892eeb
+  data.tar.gz: dc9517aa3246d6310f114a3cb9ee3055f33a4e6c
 SHA512:
-  metadata.gz: 44c0c3dd501b88f1c23301a1b7baccbe3518a3b9f494c6c46ecf756d13e3825ca0886db66bde70bcc8db43c18df3ed9f3dbc129e0a53cb5044328bbc55be68e8
-  data.tar.gz: d9199c57073feb9afd9f22d84a026eb6bdb66f0713c8e9a0f43a0b5f96ee3b07ab02dd433789c61dbabfeb18d13395911ce3ab7479fdb911c512752aa250183e
+  metadata.gz: 38e2212cb6e9a0ae10687cc07533e28406ca15d09c918fe5b7bf29202a4c384cf8179701878b360deaa17aa6d64965f65eeb9122292027553a1e7a075c6be936
+  data.tar.gz: 8049e3bab1696a64021bb89e37c5106351332b2eafb73d73c44bf62b6328fd3567ff0e0403c987a10e023386ba057be2c2906b9ad079701184ee76584570afc9

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [Master][]
 
+# [0.5.0][]
+
+- Allow adding errors in `execute` method with `errors.add`.
+- Prevent manually setting the outcome's result.
+
 # [0.4.0][]
 
 - Support i18n translations.
@@ -43,7 +48,8 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v0.4.0...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v0.5.0...master
+  [0.5.0]: https://github.com/orgsync/active_interaction/compare/v0.4.0...v0.5.0
   [0.4.0]: https://github.com/orgsync/active_interaction/compare/v0.3.0...v0.4.0
   [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

data/README.md

@@ -15,6 +15,8 @@ to this.
 Take back control. Slim down models and wrangle monstrous controller
 methods with ActiveInteraction.
 
+Check out the full [documentation][] on RubyDoc.info.
+
 ## Installation
 
 This project uses [semantic versioning][].
@@ -22,7 +24,7 @@ This project uses [semantic versioning][].
 Add it to your Gemfile:
 
 ```ruby
-gem 'active_interaction', '~> 0.4.0'
+gem 'active_interaction', '~> 0.5.0'
 ```
 
 And then execute:

data/lib/active_interaction/base.rb

@@ -44,22 +44,24 @@ module ActiveInteraction
       false
     end
 
+    # @private
     def self.i18n_scope
       :active_interaction
     end
 
+    # @private
     def i18n_scope
       self.class.i18n_scope
     end
 
     extend OverloadHash
 
-    # Returns the output from {#execute} if there are no validation errors or
-    #   `nil` otherwise.
-    #
-    # @return [Nil] if there are validation errors.
-    # @return [Object] if there are no validation errors.
-    attr_reader :result
+    validate do
+      return unless @_interaction_errors
+      @_interaction_errors.each do |attribute, message|
+        errors.add(attribute, message)
+      end
+    end
 
     # @private
     def initialize(options = {})
@@ -89,6 +91,20 @@ module ActiveInteraction
       raise NotImplementedError
     end
 
+    # Returns the output from {#execute} if there are no validation errors or
+    #   `nil` otherwise.
+    #
+    # @return [Nil] if there are validation errors.
+    # @return [Object] if there are no validation errors.
+    def result
+      @_interaction_result
+    end
+
+    # @private
+    def valid?(*args)
+      super || instance_variable_set(:@_interaction_result, nil)
+    end
+
     # @private
     def self.transaction
       return unless block_given?
@@ -114,7 +130,13 @@ module ActiveInteraction
       new(options).tap do |interaction|
         if interaction.valid?
           result = transaction { interaction.execute }
-          interaction.instance_variable_set(:@result, result)
+
+          if interaction.errors.empty?
+            interaction.instance_variable_set(:@_interaction_result, result)
+          else
+            interaction.instance_variable_set(:@_interaction_errors,
+              interaction.errors.dup)
+          end
         end
       end
     end

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/base_spec.rb

@@ -148,6 +148,28 @@ describe ActiveInteraction::Base do
         expect(outcome).to be_a described_class
       end
 
+      context 'setting the result' do
+        let(:described_class) do
+          Class.new(ActiveInteraction::Base) do
+            boolean :attribute
+
+            validate do
+              @_interaction_result = SecureRandom.hex
+              errors.add(:attribute, SecureRandom.hex)
+            end
+
+            def self.name
+              SecureRandom.hex
+            end
+          end
+        end
+
+        it 'sets the result to nil' do
+          expect(outcome).to be_invalid
+          expect(outcome.result).to be_nil
+        end
+      end
+
       context 'failing validations' do
         it 'returns an invalid outcome' do
           expect(outcome).to be_invalid
@@ -161,6 +183,27 @@ describe ActiveInteraction::Base do
       context 'passing validations' do
         before { options.merge!(thing: thing) }
 
+        context 'failing runtime validations' do
+          before do
+            @execute = described_class.instance_method(:execute)
+            described_class.send(:define_method, :execute) do
+              errors.add(:thing, SecureRandom.hex)
+            end
+          end
+
+          after do
+            described_class.send(:define_method, :execute, @execute)
+          end
+
+          it 'returns an invalid outcome' do
+            expect(outcome).to be_invalid
+          end
+
+          it 'sets the result to nil' do
+            expect(outcome.result).to be_nil
+          end
+        end
+
         it 'returns a valid outcome' do
           expect(outcome).to be_valid
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: Manage application specific business logic.