active_interaction 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcb762bfdc148c4eeb1e277f07e13c60fb3944d8
-  data.tar.gz: 7676378a761abeadec3fecc6e350dd27a7fbdd37
+  metadata.gz: e565176aa5fba8541adcb1bff86f9deb7b88de08
+  data.tar.gz: 071ae728292232470bf81b5ae049c7e51444ef8f
 SHA512:
-  metadata.gz: 4abdb88c3887e65abed055d535a49ebf8ff9ccd42fba9798315c3f0cb7646461c60007381867c32a8a5f8b4c87082bd4a8bedd3905e3fec041cd0457daed94e9
-  data.tar.gz: b8c6e2b73a547575e9eaa92c3d412044174e3ea1196dd6a868ad17fb657cdbb495a5455f9411ba5bba9f1c76350bf7505ac78f576cae5b8a7080e0e5a751751b
+  metadata.gz: 049b8e1805135d5a6f4a800e7fcefd68d6d6f26513d75f48cede2aebf83120ea52815d7bf02f94c39417b4222de08e29e571aaf63717c5857dca7688cb09acfa
+  data.tar.gz: 94d18809c216c9fe7df17ff6b57b7b9e994ff0b1f097f432838856f038d48c6a2c16e7580324967754d643118b54d62f0d0549d23c936bff78177089455933bb

data/README.md

@@ -66,13 +66,13 @@ Read more on [the project page][] or check out [the full documentation][].
 Add it to your Gemfile:
 
 ``` rb
-gem 'active_interaction', '~> 3.2'
+gem 'active_interaction', '~> 3.4'
 ```
 
 Or install it manually:
 
 ``` sh
-$ gem install active_interaction --version '~> 3.2'
+$ gem install active_interaction --version '~> 3.4'
 ```
 
 This project uses [Semantic Versioning][]. Check out [the change log][] for a
@@ -604,6 +604,27 @@ IntegerInteraction.run!(limit: 10)
 # => [10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0]
 ```
 
+When a `String` is passed into an `integer` input, the value will be coerced.
+Coercion is based on `Kernel#Integer` which attempts to detect the base being used.
+However, you may want to specify the `base` for the conversion to something more
+sensible (e.g. `base: 10`).
+
+``` rb
+class IntegerInteraction < ActiveInteraction::Base
+  integer :limit1, base: 10
+  integer :limit2
+  
+  def execute
+    [limit1, limit2]
+  end
+end
+
+IntegerInteraction.run!(limit1: "08", limit2: 8)
+# => [8, 8]
+IntegerInteraction.run!(limit1: "08", limit2: "08")
+# ArgumentError: invalid value for Integer(): "08"
+```
+
 ## Rails
 
 ActiveInteraction plays nicely with Rails. You can use interactions to handle

data/lib/active_interaction/concerns/runnable.rb

@@ -59,23 +59,27 @@ module ActiveInteraction
     # @param (see ClassMethods.run)
     #
     # @return (see #result)
+    #
+    # @raise [Interrupt]
     def compose(other, *args)
       outcome = other.run(*args)
 
-      if outcome.valid?
-        outcome.result
-      else
-        throw :interrupt, outcome.errors
-      end
+      raise Interrupt, outcome.errors if outcome.invalid?
+
+      outcome.result
     end
 
     # @return (see #result=)
     # @return [nil]
-    def run
+    def run # rubocop:disable MethodLength
       return unless valid?
 
       result_or_errors = run_callbacks(:execute) do
-        catch(:interrupt) { execute }
+        begin
+          execute
+        rescue Interrupt => interrupt
+          interrupt.errors
+        end
       end
 
       self.result =
@@ -92,11 +96,11 @@ module ActiveInteraction
     def run!
       run
 
-      if valid?
-        result
-      else
+      unless valid?
         raise InvalidInteractionError, errors.full_messages.join(', ')
       end
+
+      result
     end
 
     #

data/lib/active_interaction/errors.rb

@@ -75,6 +75,21 @@ module ActiveInteraction
     end
   end
 
+  # Used by {Runnable} to signal a failure when composing.
+  #
+  # @private
+  class Interrupt < Error
+    attr_reader :errors
+
+    # @param errors [Runnable]
+    def initialize(errors)
+      super()
+
+      @errors = errors
+    end
+  end
+  private_constant :Interrupt
+
   # An extension that provides the ability to merge other errors into itself.
   class Errors < ActiveModel::Errors
     # Merge other errors into this one.

data/lib/active_interaction/filters/integer_filter.rb

@@ -17,5 +17,18 @@ module ActiveInteraction
   # @private
   class IntegerFilter < AbstractNumericFilter
     register :integer
+
+    private
+
+    # @return [Integer]
+    def base
+      options.fetch(:base, 0)
+    end
+
+    def convert(value, context)
+      Integer(value, base)
+    rescue ArgumentError
+      _cast(value, context)
+    end
   end
 end

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/concerns/hashable_spec.rb

@@ -9,8 +9,8 @@ describe ActiveInteraction::Hashable do
     context 'with no arguments' do
       let(:hash) { subject.hash }
 
-      it 'returns a Fixnum' do
-        expect(hash).to be_a Fixnum
+      it 'returns an Integer' do
+        expect(hash).to be_an Integer
       end
     end
 

data/spec/active_interaction/concerns/runnable_spec.rb

@@ -5,6 +5,14 @@ require 'spec_helper'
 describe ActiveInteraction::Runnable do
   include_context 'concerns', ActiveInteraction::Runnable
 
+  class WrappableFailingInteraction
+    include ActiveInteraction::Runnable
+
+    def execute
+      errors.add(:base)
+    end
+  end
+
   shared_context 'with an error' do
     before { instance.errors.add(:base) }
   end
@@ -64,30 +72,22 @@ describe ActiveInteraction::Runnable do
       include_examples 'set_callback examples', :execute
 
       context 'execute with composed interaction' do
-        class InnerInteraction
-          include ActiveInteraction::Runnable
-
-          def execute
-            errors.add(:base)
-          end
-        end
-
-        class OuterInteraction
+        class WithFailingCompose
           include ActiveInteraction::Runnable
 
           def execute
-            compose(InnerInteraction)
+            compose(WrappableFailingInteraction)
           end
         end
 
         context 'around' do
           it 'is yielded errors from composed interactions' do
             block_result = nil
-            OuterInteraction.set_callback :execute, :around do |_, block|
+            WithFailingCompose.set_callback :execute, :around do |_, block|
               block_result = block.call
             end
 
-            OuterInteraction.run
+            WithFailingCompose.run
             expect(block_result).to be_an(ActiveInteraction::Errors)
             expect(block_result).to include(:base)
           end
@@ -96,11 +96,11 @@ describe ActiveInteraction::Runnable do
         context 'after' do
           it 'is yielded errors from composed interactions' do
             has_run = false
-            OuterInteraction.set_callback :execute, :after do
+            WithFailingCompose.set_callback :execute, :after do
               has_run = true
             end
 
-            OuterInteraction.run
+            WithFailingCompose.run
             expect(has_run).to be_truthy
           end
         end
@@ -242,6 +242,26 @@ describe ActiveInteraction::Runnable do
         expect(outcome).to be_valid
       end
     end
+
+    context 'with failing composition' do
+      class CheckInnerForFailure
+        include ActiveInteraction::Runnable
+
+        attr_reader :caught_error
+
+        def execute
+          compose(WrappableFailingInteraction)
+        rescue
+          @caught_error = true
+          raise
+        end
+      end
+
+      it 'throws an error from the inner interaction' do
+        outcome = CheckInnerForFailure.run
+        expect(outcome.caught_error).to be true
+      end
+    end
   end
 
   describe '.run!' do

data/spec/active_interaction/filters/integer_filter_spec.rb

@@ -42,6 +42,14 @@ describe ActiveInteraction::IntegerFilter, :filter do
         end.to raise_error ActiveInteraction::InvalidValueError
       end
     end
+
+    it 'supports different bases' do
+      expect(filter.cast('07', nil)).to eql 7
+      expect do
+        filter.cast('08', nil)
+      end.to raise_error ActiveInteraction::InvalidValueError
+      expect(described_class.new(name, base: 10).cast('08', nil)).to eql 8
+    end
   end
 
   describe '#database_column_type' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -107,14 +107,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.44.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.44.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement