active_interaction 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0449466d5aadcc60fb21146f2f69cad47097698a
-  data.tar.gz: d88a740e6c885e713a2829b7a26902e9712a57c8
+  metadata.gz: 3b1db83e71226e6160a36354484c59cd312fcdc2
+  data.tar.gz: 13ab7a0625523b7cc531197d697a03ee5c52b14e
 SHA512:
-  metadata.gz: 3563d4d5944e8316c3a75c9450c52a411a626436b9acc87380b92890cd393f1cd743f1b6cd2b3a7159a5e963aac06c2bc21dcdb494616337c4d2fb654cfa0ac5
-  data.tar.gz: 58cb5f5101acce859c491c3eb3a5d8c0117d46f31c966007f3d86a34244c87ac8810493204161dcdee1d840d5954730d88b06c6173e10cdf9366f41542feec66
+  metadata.gz: d7daa784b53f26ae7fd99ee906874e551c98dfb1db49cf0a248fd7aca7878f44adaa070a1014862d9c1f1038504912581069e887a0167ae4c2ac61b552991a12
+  data.tar.gz: 367a7f33d4386b31020fa29a204219a89231c2dc1b0670cb91b06b5eb00394529121cb181734b9b478a6c19b55d55f007acc51952c184518a22f870b969c0f4e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [Master][]
 
+# [0.10.0][] (2013-12-19)
+
+- Support casting "true" and "false" as booleans.
+- Fix bug that allowed subclasses to mutate the filters on their superclasses.
+
 # [0.9.1][] (2013-12-17)
 
 - Fix I18n deprecation warning.
@@ -92,7 +97,8 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v0.9.1...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v0.10.0...master
+  [0.10.0]: https://github.com/orgsync/active_interaction/compare/v0.9.1...0.10.0
   [0.9.1]: https://github.com/orgsync/active_interaction/compare/v0.9.0...0.9.1
   [0.9.0]: https://github.com/orgsync/active_interaction/compare/v0.9.0...0.9.0
   [0.8.0]: https://github.com/orgsync/active_interaction/compare/v0.7.0...v0.8.0

data/README.md

@@ -25,7 +25,7 @@ This project uses [semantic versioning][].
 Add it to your Gemfile:
 
 ```ruby
-gem 'active_interaction', '~> 0.9.1'
+gem 'active_interaction', '~> 0.10.0'
 ```
 
 And then execute:
@@ -278,7 +278,9 @@ p Interaction.run.errors.messages
 
 ## Credits
 
-This project was inspired by the fantastic work done in [Mutations][].
+ActiveInteraction is brought to you by [@AaronLasseigne][] and
+[@tfausak][] from [@orgsync][]. We were inspired by the fantastic
+work done in [Mutations][].
 
   [#41]: https://github.com/orgsync/active_interaction/issues/41
   [#79]: https://github.com/orgsync/active_interaction/issues/79
@@ -287,6 +289,9 @@ This project was inspired by the fantastic work done in [Mutations][].
   [3]: https://coveralls.io/r/orgsync/active_interaction "Coverage Status"
   [4]: https://codeclimate.com/github/orgsync/active_interaction "Code Climate"
   [5]: https://gemnasium.com/orgsync/active_interaction "Dependency Status"
+  [@AaronLasseigne]: https://github.com/AaronLasseigne
+  [@orgsync]: https://github.com/orgsync
+  [@tfausak]: https://github.com/tfausak
   [build status]: https://travis-ci.org/orgsync/active_interaction.png
   [code climate]: https://codeclimate.com/github/orgsync/active_interaction.png
   [coverage status]: https://coveralls.io/repos/orgsync/active_interaction/badge.png

data/lib/active_interaction/base.rb

@@ -45,23 +45,7 @@ module ActiveInteraction
       @_interaction_result = nil
       @_interaction_runtime_errors = nil
 
-      inputs.each do |key, value|
-        if key.to_s.start_with?('_interaction_')
-          fail InvalidValueError, key.inspect
-        end
-
-        instance_variable_set("@#{key}", value)
-      end
-
-      inputs = inputs.symbolize_keys
-      self.class.filters.each do |filter|
-        begin
-          send("#{filter.name}=", filter.clean(inputs[filter.name]))
-        # rubocop: disable HandleExceptions
-        rescue InvalidValueError, MissingValueError
-          # Validators (#input_errors) will add errors if appropriate.
-        end
-      end
+      process_inputs(inputs.symbolize_keys)
     end
 
     # Returns the inputs provided to {.run} or {.run!} after being cast based
@@ -127,7 +111,6 @@ module ActiveInteraction
           result = transaction do
             begin
               interaction.execute
-            # rubocop:disable HandleExceptions
             rescue Interrupt
               # Inner interaction failed. #compose handles merging errors.
             end
@@ -166,6 +149,24 @@ module ActiveInteraction
 
     private
 
+    def process_inputs(inputs)
+      inputs.each do |key, value|
+        if key.to_s.start_with?('_interaction_')
+          fail InvalidValueError, key.inspect
+        end
+
+        instance_variable_set("@#{key}", value)
+      end
+
+      self.class.filters.each do |filter|
+        begin
+          send("#{filter.name}=", filter.clean(inputs[filter.name]))
+        rescue InvalidValueError, MissingValueError
+          # Validators (#input_errors) will add errors if appropriate.
+        end
+      end
+    end
+
     def input_errors
       Validation.validate(self.class.filters, inputs).each do |error|
         errors.add_sym(*error)
@@ -191,11 +192,11 @@ module ActiveInteraction
       fail Interrupt
     end
 
-    def self.inherited(subclass)
-      instance_var = :@_interaction_filters
+    def self.inherited(klass)
+      new_filters = Filters.new
+      filters.each { |f| new_filters.add(f) }
 
-      subclass.instance_variable_set(
-        instance_var, instance_variable_get(instance_var))
+      klass.instance_variable_set(:@_interaction_filters, new_filters)
     end
   end
 end

data/lib/active_interaction/filters/boolean_filter.rb

@@ -3,8 +3,9 @@
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to
-    #   the attributes are Booleans. The String `"1"` is converted to `true`
-    #   and `"0"` is converted to `false`.
+    #   the attributes are Booleans. The strings `"1"` and `"true"`
+    #   (case-insensitive) are converted to `true` while the strings `"0"` and
+    #   `"false"` are converted to `false`.
     #
     # @macro filter_method_params
     #
@@ -20,9 +21,9 @@ module ActiveInteraction
   class BooleanFilter < Filter
     def cast(value)
       case value
-      when FalseClass, '0'
+      when FalseClass, '0', /\Afalse\z/i
         false
-      when TrueClass, '1'
+      when TrueClass, '1', /\Atrue\z/i
         true
       else
         super

data/lib/active_interaction/modules/core.rb

@@ -2,7 +2,6 @@
 
 begin
   require 'active_record'
-# rubocop:disable HandleExceptions
 rescue LoadError
   # ActiveRecord is an optional dependency.
 end

data/lib/active_interaction/version.rb

@@ -2,5 +2,5 @@
 
 # rubocop:disable Documentation
 module ActiveInteraction
-  VERSION = Gem::Version.new('0.9.1')
+  VERSION = Gem::Version.new('0.10.0')
 end

data/spec/active_interaction/base_spec.rb

@@ -10,6 +10,24 @@ InteractionWithFilter = Class.new(TestInteraction) do
   end
 end
 
+AddInteraction = Class.new(ActiveInteraction::Base) do
+  float :x, :y
+
+  def execute
+    x + y
+  end
+end
+
+InterruptInteraction = Class.new(ActiveInteraction::Base) do
+  model :x, :y,
+    class: Object,
+    default: nil
+
+  def execute
+    compose(AddInteraction, inputs)
+  end
+end
+
 describe ActiveInteraction::Base do
   include_context 'interactions'
 
@@ -287,24 +305,6 @@ describe ActiveInteraction::Base do
     let(:x) { rand }
     let(:y) { rand }
 
-    AddInteraction = Class.new(ActiveInteraction::Base) do
-      float :x, :y
-
-      def execute
-        x + y
-      end
-    end
-
-    InterruptInteraction = Class.new(ActiveInteraction::Base) do
-      model :x, :y,
-        class: Object,
-        default: nil
-
-      def execute
-        compose(AddInteraction, inputs)
-      end
-    end
-
     context 'with valid composition' do
       before do
         inputs.merge!(x: x, y: y)
@@ -338,17 +338,20 @@ describe ActiveInteraction::Base do
   end
 
   context 'inheritance' do
-    it 'keeps the filters of the parent class' do
-      ParentInteraction = Class.new(ActiveInteraction::Base) do
-        boolean :x,
-          default: nil
+    let(:described_class) { InteractionWithFilter }
 
-        def execute
-          inputs
-        end
-      end
+    def filters(klass)
+      klass.filters.map(&:name)
+    end
+
+    it 'includes the filters from the superclass' do
+      expect(filters(Class.new(described_class))).to include :thing
+    end
+
+    it 'does not mutate the filters on the superclass' do
+      Class.new(described_class) { float :other_thing }
 
-      expect(Class.new(ParentInteraction).run!).to eql(x: nil)
+      expect(filters(described_class)).to_not include :other_thing
     end
   end
 end

data/spec/active_interaction/filter_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 class ActiveInteraction::TestFilter < ActiveInteraction::Filter; end
+class TestFilter < ActiveInteraction::Filter; end
 
 describe ActiveInteraction::Filter, :filter do
   include_context 'filters'
@@ -20,4 +21,23 @@ describe ActiveInteraction::Filter, :filter do
 
     let(:described_class) { ActiveInteraction::TestFilter }
   end
+
+  context TestFilter do
+    let(:described_class) { TestFilter }
+
+    describe '.factory' do
+      it 'returns a Filter' do
+        expect(described_class.factory(described_class.name.to_sym))
+          .to eq described_class
+      end
+    end
+
+    describe '.slug' do
+      it 'raises an error' do
+        expect do
+          described_class.slug
+        end.to raise_error ActiveInteraction::InvalidClassError
+      end
+    end
+  end
 end

data/spec/active_interaction/filters/abstract_date_time_filter_spec.rb

@@ -0,0 +1,15 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+describe ActiveInteraction::AbstractDateTimeFilter, :filter do
+  include_context 'filters'
+
+  describe '#cast' do
+    let(:value) { nil }
+
+    it 'raises an error' do
+      expect { filter.cast(value) }.to raise_error NotImplementedError
+    end
+  end
+end

data/spec/active_interaction/filters/abstract_numeric_filter_spec.rb

@@ -0,0 +1,15 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+describe ActiveInteraction::AbstractNumericFilter, :filter do
+  include_context 'filters'
+
+  describe '#cast' do
+    let(:value) { nil }
+
+    it 'raises an error' do
+      expect { filter.cast(value) }.to raise_error NotImplementedError
+    end
+  end
+end

data/spec/active_interaction/filters/boolean_filter_spec.rb

@@ -7,35 +7,19 @@ describe ActiveInteraction::BooleanFilter, :filter do
   it_behaves_like 'a filter'
 
   describe '#cast' do
-    context 'with false' do
-      let(:value) { false }
-
-      it 'returns false' do
-        expect(filter.cast(value)).to be_false
-      end
-    end
-
-    context 'with true' do
-      let(:value) { true }
-
-      it 'returns true' do
-        expect(filter.cast(value)).to be_true
+    context 'falsey' do
+      [false, '0', 'false', 'FALSE'].each do |value|
+        it "returns false for #{value.inspect}" do
+          expect(filter.cast(value)).to be_false
+        end
       end
     end
 
-    context 'with "0"' do
-      let(:value) { '0' }
-
-      it 'returns false' do
-        expect(filter.cast(value)).to be_false
-      end
-    end
-
-    context 'with "1"' do
-      let(:value) { '1' }
-
-      it 'returns true' do
-        expect(filter.cast(value)).to be_true
+    context 'truthy' do
+      [true, '1', 'true', 'TRUE'].each do |value|
+        it "returns true for #{value.inspect}" do
+          expect(filter.cast(value)).to be_true
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -193,6 +193,8 @@ files:
 - spec/active_interaction/base_spec.rb
 - spec/active_interaction/errors_spec.rb
 - spec/active_interaction/filter_spec.rb
+- spec/active_interaction/filters/abstract_date_time_filter_spec.rb
+- spec/active_interaction/filters/abstract_numeric_filter_spec.rb
 - spec/active_interaction/filters/array_filter_spec.rb
 - spec/active_interaction/filters/boolean_filter_spec.rb
 - spec/active_interaction/filters/date_filter_spec.rb
@@ -258,6 +260,8 @@ test_files:
 - spec/active_interaction/base_spec.rb
 - spec/active_interaction/errors_spec.rb
 - spec/active_interaction/filter_spec.rb
+- spec/active_interaction/filters/abstract_date_time_filter_spec.rb
+- spec/active_interaction/filters/abstract_numeric_filter_spec.rb
 - spec/active_interaction/filters/array_filter_spec.rb
 - spec/active_interaction/filters/boolean_filter_spec.rb
 - spec/active_interaction/filters/date_filter_spec.rb