active_interaction 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.2
+
+- `execute` will now have the filtered version of the values passed to `run` or `run!` as was intended.
+
 # 0.1.1
 
 - Correct gemspec dependencies on activemodel.

data/README.md

@@ -21,7 +21,7 @@ This project uses [semantic versioning][].
 Add it to your Gemfile:
 
 ~~~ rb
-gem 'active_interaction', '~> 0.1.1'
+gem 'active_interaction', '~> 0.1.2'
 ~~~
 
 And then execute:

data/lib/active_interaction/base.rb

@@ -58,7 +58,7 @@ module ActiveInteraction
 
       options.each do |attribute, value|
         if respond_to?("#{attribute}=")
-          send("#{attribute}=", value)
+          send("_filter__#{attribute}=", value)
         else
           instance_variable_set("@#{attribute}", value)
         end
@@ -118,6 +118,19 @@ module ActiveInteraction
 
     # @private
     def self.filter_attr_accessor(filter, attribute, options, &block)
+      filter_attr_writer = "_filter__#{attribute}="
+      define_method(filter_attr_writer) do |value|
+        filtered_value =
+          begin
+            filter.prepare(attribute, value, options, &block)
+          rescue InvalidValue, MissingValue
+            value
+          end
+
+        instance_variable_set("@#{attribute}", filtered_value)
+      end
+      private filter_attr_writer
+
       attr_writer attribute
 
       if options.has_key?(:default)

data/lib/active_interaction/filter.rb

@@ -21,7 +21,7 @@ module ActiveInteraction
           return_nil(options[:allow_nil])
         else
           bad_value
-        end
+      end
     end
 
     def self.return_nil(allow_nil)

data/lib/active_interaction/filters/array_filter.rb

@@ -48,7 +48,7 @@ module ActiveInteraction
       if filter_methods.count > 1
         raise ArgumentError, 'Array filter blocks can only contain one filter.'
       else
-        filter_method = filter_methods.first
+        filter_methods.first
       end
     end
     private_class_method :get_filter_method

data/lib/active_interaction/filters/file_filter.rb

@@ -28,7 +28,7 @@ module ActiveInteraction
 
     def self.extract_file(value)
       if value.respond_to?(:tempfile)
-        value = value.tempfile
+        value.tempfile
       else
         value
       end

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/base_spec.rb

@@ -4,16 +4,6 @@ describe ActiveInteraction::Base do
   let(:options) { {} }
   subject(:interaction) { described_class.new(options) }
 
-  class InteractionWithAttribute < described_class
-    attr_reader :thing
-
-    validates :thing, presence: true
-
-    def execute
-      thing
-    end
-  end
-
   class InteractionWithFilter < described_class
     float :thing
 
@@ -22,12 +12,6 @@ describe ActiveInteraction::Base do
     end
   end
 
-  class InteractionWithFilters < described_class
-    float :thing1, :thing2
-
-    def execute; end
-  end
-
   describe '.new(options = {})' do
     it 'does not allow :result as an option' do
       options.merge!(result: nil)
@@ -39,8 +23,22 @@ describe ActiveInteraction::Base do
       expect { interaction }.to raise_error ArgumentError
     end
 
-    describe InteractionWithAttribute do
-      let(:described_class) { InteractionWithAttribute }
+    context 'with an attribute' do
+      let(:described_class) do
+        Class.new(ActiveInteraction::Base) do
+          attr_reader :thing
+
+          validates :thing, presence: true
+
+          def self.model_name
+            ActiveModel::Name.new(self, nil, SecureRandom.hex)
+          end
+
+          def execute
+            thing
+          end
+        end
+      end
       let(:thing) { SecureRandom.hex }
 
       context 'failing validations' do
@@ -63,19 +61,50 @@ describe ActiveInteraction::Base do
         end
       end
     end
+
+    describe InteractionWithFilter do
+      let(:described_class) { InteractionWithFilter }
+
+      context 'failing validations' do
+        before { options.merge!(thing: thing) }
+
+        context 'InvalidValue' do
+          let(:thing) { 'a' }
+
+          it 'sets the attribute to the filtered value' do
+            expect(interaction.thing).to equal thing
+          end
+        end
+
+        context 'MissingValue' do
+          let(:thing) { nil }
+
+          it 'sets the attribute to the filtered value' do
+            expect(interaction.thing).to equal thing
+          end
+        end
+      end
+
+      context 'passing validations' do
+        before { options.merge!(thing: 1) }
+
+        it 'sets the attribute to the filtered value' do
+          expect(interaction.thing).to eql 1.0
+        end
+      end
+    end
   end
 
   describe '.method_missing(filter_type, *args, &block)' do
-    it 'raises an error for invalid filter types' do
+    it 'raises an error for an invalid filter type' do
       expect {
-        class InteractionWithInvalidFilter < described_class
+        Class.new(described_class) do
           not_a_valid_filter_type :thing
-          def execute; end
         end
       }.to raise_error NoMethodError
     end
 
-    describe InteractionWithFilter do
+    context 'with a filter' do
       let(:described_class) { InteractionWithFilter }
 
       it 'adds an attr_reader' do
@@ -87,8 +116,14 @@ describe ActiveInteraction::Base do
       end
     end
 
-    describe InteractionWithFilters do
-      let(:described_class) { InteractionWithFilters }
+    context 'with multiple filters' do
+      let(:described_class) do
+        Class.new(ActiveInteraction::Base) do
+          float :thing1, :thing2
+
+          def execute; end
+        end
+      end
 
       %w(thing1 thing2).each do |thing|
         it "adds an attr_reader for #{thing}" do
@@ -102,7 +137,7 @@ describe ActiveInteraction::Base do
     end
   end
 
-  describe InteractionWithFilter do
+  context 'with a filter' do
     let(:described_class) { InteractionWithFilter }
     let(:thing) { rand }
 

data/spec/active_interaction/filter_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module ActiveInteraction
-  class TestFilter < Filter; end
+  TestFilter = Class.new(Filter)
 end
 
 describe ActiveInteraction::Filter do

data/spec/active_interaction/filters/file_filter_spec.rb

@@ -14,7 +14,7 @@ describe ActiveInteraction::FileFilter do
     end
 
     context 'with a Tempfile' do
-      let(:value) { Tempfile.new('temp') }
+      let(:value) { Tempfile.new(SecureRandom.hex) }
 
       it 'returns the Tempfile' do
         expect(result).to equal value
@@ -22,7 +22,7 @@ describe ActiveInteraction::FileFilter do
     end
 
     context 'with a object that responds to `tempfile`' do
-      let(:value) { double(tempfile: Tempfile.new('temp')) }
+      let(:value) { double(tempfile: Tempfile.new(SecureRandom.hex)) }
 
       it 'returns the Tempfile' do
         expect(result).to equal value.tempfile

metadata

@@ -2,7 +2,7 @@
 name: active_interaction
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3542562646665336521
+      hash: 669983182544330814
       version: '0'
   none: false
 requirements: []