active_interaction 1.4.1 → 2.0.0

data/lib/active_interaction.rb

@@ -2,13 +2,35 @@
 
 require 'active_model'
 
+# Manage application specific business logic.
+#
+# @author Aaron Lasseigne <aaron.lasseigne@gmail.com>
+# @author Taylor Fausak <taylor@fausak.me>
+#
+# @since 1.0.0
+#
+# @version 2.0.0
+module ActiveInteraction
+  DEPRECATOR =
+    if ::ActiveSupport::Deprecation.respond_to?(:new)
+      ::ActiveSupport::Deprecation.new('2', 'ActiveInteraction')
+    end
+  private_constant :DEPRECATOR
+
+  def self.deprecate(klass, method, message = nil)
+    options = { method => message }
+    options.merge!(deprecator: DEPRECATOR) if DEPRECATOR
+    klass.deprecate(options)
+  end
+end
+
 require 'active_interaction/version'
 require 'active_interaction/errors'
 
 require 'active_interaction/concerns/active_modelable'
+require 'active_interaction/concerns/active_recordable'
 require 'active_interaction/concerns/hashable'
 require 'active_interaction/concerns/missable'
-require 'active_interaction/concerns/transactable'
 require 'active_interaction/concerns/runnable'
 
 require 'active_interaction/grouped_input'
@@ -19,6 +41,7 @@ require 'active_interaction/modules/validation'
 require 'active_interaction/filter_column'
 require 'active_interaction/filter'
 require 'active_interaction/filters/abstract_filter'
+require 'active_interaction/filters/interface_filter'
 require 'active_interaction/filters/abstract_date_time_filter'
 require 'active_interaction/filters/abstract_numeric_filter'
 require 'active_interaction/filters/array_filter'
@@ -30,8 +53,7 @@ require 'active_interaction/filters/file_filter'
 require 'active_interaction/filters/float_filter'
 require 'active_interaction/filters/hash_filter'
 require 'active_interaction/filters/integer_filter'
-require 'active_interaction/filters/interface_filter'
-require 'active_interaction/filters/model_filter'
+require 'active_interaction/filters/object_filter'
 require 'active_interaction/filters/string_filter'
 require 'active_interaction/filters/symbol_filter'
 require 'active_interaction/filters/time_filter'
@@ -42,13 +64,3 @@ require 'active_interaction/backports'
 
 I18n.load_path.unshift(*Dir[File.expand_path(
   File.join(%w[active_interaction locale *.yml]), File.dirname(__FILE__))])
-
-# Manage application specific business logic.
-#
-# @author Aaron Lasseigne <aaron.lasseigne@gmail.com>
-# @author Taylor Fausak <taylor@fausak.me>
-#
-# @since 1.0.0
-#
-# @version 1.4.1
-module ActiveInteraction end

data/spec/active_interaction/base_spec.rb

@@ -19,7 +19,7 @@ AddInteraction = Class.new(TestInteraction) do
 end
 
 InterruptInteraction = Class.new(TestInteraction) do
-  model :x, :y,
+  object :x, :y,
     class: Object,
     default: nil
 
@@ -248,8 +248,9 @@ describe ActiveInteraction::Base do
           before do
             @execute = described_class.instance_method(:execute)
             described_class.send(:define_method, :execute) do
-              errors.add(:thing, 'error')
-              errors.add_sym(:thing, :error, 'error')
+              errors.add(:thing, 'is invalid')
+              errors.add(:thing, :invalid)
+              true
             end
           end
 
@@ -263,16 +264,22 @@ describe ActiveInteraction::Base do
             expect(outcome).to be_invalid
           end
 
-          it 'sets the result to nil' do
-            expect(result).to be_nil
+          it 'sets the result' do
+            expect(result).to be true
           end
 
           it 'has errors' do
-            expect(outcome.errors.messages[:thing]).to eql %w[error error]
+            expect(outcome.errors.messages[:thing]).to eql [
+              'is invalid',
+              'is invalid'
+            ]
           end
 
-          it 'has symbolic errors' do
-            expect(outcome.errors.symbolic[:thing]).to eql [:error]
+          it 'has detailed errors' do
+            expect(outcome.errors.details[:thing]).to eql [
+              { error: 'is invalid' },
+              { error: :invalid }
+            ]
           end
         end
 
@@ -283,12 +290,6 @@ describe ActiveInteraction::Base do
         it 'sets the result' do
           expect(result[:thing]).to eql thing
         end
-
-        it 'calls #transaction' do
-          expect_any_instance_of(described_class).to receive(:transaction)
-            .once.with(no_args)
-          outcome
-        end
       end
     end
 
@@ -313,31 +314,6 @@ describe ActiveInteraction::Base do
     end
   end
 
-  describe '#column_for_attribute(name)' do
-    let(:described_class) { InteractionWithFilter }
-    let(:column) { outcome.column_for_attribute(name) }
-
-    context 'name is not an input name' do
-      let(:name) { SecureRandom.hex }
-
-      it 'returns nil if the attribute cannot be found' do
-        expect(column).to be_nil
-      end
-    end
-
-    context 'name is an input name' do
-      let(:name) { InteractionWithFilter.filters.keys.first }
-
-      it 'returns a FilterColumn' do
-        expect(column).to be_a ActiveInteraction::FilterColumn
-      end
-
-      it 'returns a FilterColumn of type boolean' do
-        expect(column.type).to eql :float
-      end
-    end
-  end
-
   describe '#inputs' do
     let(:described_class) { InteractionWithFilter }
     let(:other_val) { SecureRandom.hex }

data/spec/active_interaction/concerns/active_recordable_spec.rb

@@ -0,0 +1,51 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+InteractionWithFloatFilter = Class.new(TestInteraction) do
+  float :thing
+end
+
+describe ActiveInteraction::ActiveRecordable do
+  include_context 'interactions'
+
+  let(:described_class) { InteractionWithFloatFilter }
+
+  describe '#column_for_attribute(name)' do
+    let(:column) { outcome.column_for_attribute(name) }
+
+    context 'name is not an input name' do
+      let(:name) { SecureRandom.hex }
+
+      it 'returns nil if the attribute cannot be found' do
+        expect(column).to be_nil
+      end
+    end
+
+    context 'name is an input name' do
+      let(:name) { described_class.filters.keys.first }
+
+      it 'returns a FilterColumn' do
+        expect(column).to be_a ActiveInteraction::FilterColumn
+      end
+
+      it 'returns a FilterColumn of type boolean' do
+        expect(column.type).to eql :float
+      end
+    end
+  end
+
+  describe '#has_attribute?' do
+    it 'returns true if the filter exists' do
+      expect(outcome.has_attribute?(:thing)).to be_truthy
+    end
+
+    it 'works with strings' do
+      expect(outcome.has_attribute?('thing')).to be_truthy
+    end
+
+    it 'returns false if the filter does not exist' do
+      expect(outcome.has_attribute?(:not_a_filter)).to be_falsey
+    end
+  end
+end

data/spec/active_interaction/concerns/runnable_spec.rb

@@ -101,9 +101,9 @@ describe ActiveInteraction::Runnable do
     context 'with an error' do
       include_context 'with an error'
 
-      it 'does not set the result' do
+      it 'sets the result' do
         instance.result = result
-        expect(instance.result).to be_nil
+        expect(instance.result).to eql result
       end
     end
 
@@ -180,38 +180,6 @@ describe ActiveInteraction::Runnable do
       end
     end
 
-    context 'with an execute where composition fails' do
-      before do
-        interaction = Class.new(TestInteraction) do
-          validate { errors.add(:base) }
-        end
-
-        klass.send(:define_method, :execute) { compose(interaction) }
-      end
-
-      it 'rolls back the transaction' do
-        instance = klass.new
-
-        allow(instance).to receive(:raise)
-        instance.send(:run)
-        expect(instance).to have_received(:raise)
-          .with(ActiveRecord::Rollback)
-      end
-
-      context 'without a transaction' do
-        before { klass.transaction(false) }
-
-        it 'does not roll back' do
-          instance = klass.new
-
-          allow(instance).to receive(:raise)
-          instance.send(:run)
-          expect(instance).to_not have_received(:raise)
-            .with(ActiveRecord::Rollback)
-        end
-      end
-    end
-
     context 'with invalid post-execution state' do
       before do
         klass.class_exec do

data/spec/active_interaction/errors_spec.rb

@@ -17,88 +17,6 @@ describe ActiveInteraction::Errors do
 
   subject(:errors) { described_class.new(klass.new) }
 
-  describe '#add_sym' do
-    it 'defaults to :invalid' do
-      errors.add_sym(:attribute)
-      expect(errors.symbolic[:attribute]).to eql [:invalid]
-    end
-
-    it 'adds a symbol' do
-      errors.add_sym(:attribute, :symbol)
-      expect(errors.symbolic[:attribute]).to eql [:symbol]
-    end
-
-    it 'accepts a message' do
-      errors.add_sym(:attribute, :symbol, 'message')
-      expect(errors.symbolic[:attribute]).to eql [:symbol]
-    end
-
-    it 'accepts a message and options' do
-      errors.add_sym(:attribute, :symbol, 'message', key: :value)
-      expect(errors.symbolic[:attribute]).to eql [:symbol]
-    end
-
-    context 'calling #add' do
-      before do
-        allow(errors).to receive(:add)
-      end
-
-      it 'with the default' do
-        errors.add_sym(:attribute)
-        expect(errors).to have_received(:add).once
-          .with(:attribute, :invalid, {})
-      end
-
-      it 'with a symbol' do
-        errors.add_sym(:attribute, :symbol)
-        expect(errors).to have_received(:add).once
-          .with(:attribute, :symbol, {})
-      end
-
-      it 'with a symbol and message' do
-        errors.add_sym(:attribute, :symbol, 'message')
-        expect(errors).to have_received(:add).once
-          .with(:attribute, 'message', {})
-      end
-
-      it 'with a symbol, message and options' do
-        errors.add_sym(:attribute, :symbol, 'message', key: :value)
-        expect(errors).to have_received(:add).once
-          .with(:attribute, 'message', key: :value)
-      end
-    end
-  end
-
-  describe '#initialize' do
-    it 'sets symbolic to an empty hash' do
-      expect(errors.symbolic).to eql({})
-    end
-  end
-
-  describe '#initialize_dup' do
-    let(:errors_dup) { errors.dup }
-
-    before do
-      errors.add_sym(:attribute)
-    end
-
-    it 'dups symbolic' do
-      expect(errors_dup.symbolic).to eql errors.symbolic
-      expect(errors_dup.symbolic).to_not equal errors.symbolic
-    end
-  end
-
-  describe '#clear' do
-    before do
-      errors.add_sym(:attribute)
-    end
-
-    it 'clears symbolic' do
-      errors.clear
-      expect(errors.symbolic).to be_empty
-    end
-  end
-
   describe '#merge!' do
     let(:other) { described_class.new(klass.new) }
 
@@ -119,18 +37,18 @@ describe ActiveInteraction::Errors do
       end
     end
 
-    context 'with a symbolic error' do
+    context 'with a detailed error' do
       before do
-        other.add_sym(:attribute)
+        other.add(:attribute)
       end
 
       it 'adds the error' do
         errors.merge!(other)
-        expect(errors.symbolic[:attribute]).to eql [:invalid]
+        expect(errors.details[:attribute]).to eql [{ error: :invalid }]
       end
     end
 
-    context 'with an interpolated symbolic error' do
+    context 'with an interpolated detailed error' do
       before do
         I18n.backend.store_translations('en',
           activemodel: {
@@ -145,10 +63,9 @@ describe ActiveInteraction::Errors do
                 }
               }
             }
-          }
-        )
+          })
 
-        other.add_sym(:attribute, :invalid_type, type: nil)
+        other.add(:attribute, :invalid_type, type: nil)
       end
 
       it 'does not raise an error' do

data/spec/active_interaction/filters/array_filter_spec.rb

@@ -84,8 +84,8 @@ describe ActiveInteraction::ArrayFilter, :filter do
       end
     end
 
-    context 'with a nested model filter' do
-      let(:block) { proc { model } }
+    context 'with a nested object filter' do
+      let(:block) { proc { object } }
       let(:name) { :objects }
       let(:value) { [Object.new] }
 

data/spec/active_interaction/filters/file_filter_spec.rb

@@ -25,11 +25,11 @@ describe ActiveInteraction::FileFilter, :filter do
       end
     end
 
-    context 'with an object that responds to #tempfile' do
-      let(:value) { double(tempfile: Tempfile.new(SecureRandom.hex)) }
+    context 'with an object that responds to #eof?' do
+      let(:value) { double(eof?: true) }
 
-      it 'returns the Tempfile' do
-        expect(result).to eq value.tempfile
+      it 'returns the object' do
+        expect(result).to eq value
       end
     end
   end

data/spec/active_interaction/filters/hash_filter_spec.rb

@@ -37,7 +37,7 @@ describe ActiveInteraction::HashFilter, :filter do
       let(:block) { proc { hash :a } }
 
       context 'with a Hash' do
-        let(:value) { { a: {} } }
+        let(:value) { { 'a' => {} } }
 
         it 'returns the Hash' do
           expect(result).to eql value
@@ -75,22 +75,6 @@ describe ActiveInteraction::HashFilter, :filter do
         end
       end
     end
-
-    context 'keys are symbolized' do
-      let(:value) { { 'a' => 'a', 1 => 1 } }
-
-      before do
-        options.merge!(strip: false)
-      end
-
-      it 'symbolizes String keys' do
-        expect(result).to have_key :a
-      end
-
-      it 'leaves other keys alone' do
-        expect(result).to have_key 1
-      end
-    end
   end
 
   describe '#default' do

data/spec/active_interaction/filters/{model_filter_spec.rb → object_filter_spec.rb}

@@ -2,19 +2,19 @@
 
 require 'spec_helper'
 
-class Model; end
+class Thing; end
 class Things; end
 
-describe ActiveInteraction::ModelFilter, :filter do
+describe ActiveInteraction::ObjectFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 
   before do
-    options.merge!(class: Model)
+    options.merge!(class: Thing)
   end
 
   describe '#cast' do
-    let(:value) { Model.new }
+    let(:value) { Thing.new }
     let(:result) { filter.cast(value) }
 
     context 'with class as a Class' do
@@ -25,9 +25,9 @@ describe ActiveInteraction::ModelFilter, :filter do
       it 'handles reconstantizing' do
         expect(result).to eql value
 
-        Object.send(:remove_const, :Model)
-        class Model; end
-        value = Model.new
+        Object.send(:remove_const, :Thing)
+        class Thing; end
+        value = Thing.new
 
         expect(filter.cast(value)).to eql value
       end
@@ -35,10 +35,10 @@ describe ActiveInteraction::ModelFilter, :filter do
       it 'handles reconstantizing subclasses' do
         filter
 
-        Object.send(:remove_const, :Model)
-        class Model; end
-        class Submodel < Model; end
-        value = Submodel.new
+        Object.send(:remove_const, :Thing)
+        class Thing; end
+        class SubThing < Thing; end
+        value = SubThing.new
 
         expect(filter.cast(value)).to eql value
       end
@@ -46,7 +46,7 @@ describe ActiveInteraction::ModelFilter, :filter do
       it 'does not overflow the stack' do
         klass = Class.new do
           def self.name
-            Model.name
+            Thing.name
           end
         end
 
@@ -56,8 +56,8 @@ describe ActiveInteraction::ModelFilter, :filter do
       end
 
       context 'without the class available' do
-        before { Object.send(:remove_const, :Model) }
-        after { class Model; end }
+        before { Object.send(:remove_const, :Thing) }
+        after { class Thing; end }
 
         it 'does not raise an error on initialization' do
           expect { filter }.to_not raise_error
@@ -69,7 +69,7 @@ describe ActiveInteraction::ModelFilter, :filter do
         let(:class_equality) { false }
 
         before do
-          allow(Model).to receive(:===).and_return(case_equality)
+          allow(Thing).to receive(:===).and_return(case_equality)
           allow(value).to receive(:is_a?).and_return(class_equality)
         end
 
@@ -101,7 +101,7 @@ describe ActiveInteraction::ModelFilter, :filter do
 
     context 'with class as a superclass' do
       before do
-        options.merge!(class: Model.superclass)
+        options.merge!(class: Thing.superclass)
       end
 
       it 'returns the instance' do
@@ -111,7 +111,7 @@ describe ActiveInteraction::ModelFilter, :filter do
 
     context 'with class as a String' do
       before do
-        options.merge!(class: Model.name)
+        options.merge!(class: Thing.name)
       end
 
       it 'returns the instance' do

data/spec/active_interaction/i18n_spec.rb

@@ -85,8 +85,7 @@ describe I18nInteraction do
             }
           },
           types: TYPES.each_with_object({}) { |e, a| a[e] = e.reverse }
-        }
-      )
+        })
 
       @locale = I18n.locale
       I18n.locale = 'hsilgne'

data/spec/active_interaction/integration/array_interaction_spec.rb

@@ -39,6 +39,16 @@ describe ArrayInteraction do
     end
   end
 
+  context 'with an invalid default as a proc' do
+    it 'does not raise an error' do
+      expect do
+        Class.new(ActiveInteraction::Base) do
+          array :a, default: -> { Object.new }
+        end
+      end.to_not raise_error
+    end
+  end
+
   context 'with an invalid nested default' do
     it 'raises an error' do
       expect do

data/spec/active_interaction/integration/hash_interaction_spec.rb

@@ -21,11 +21,11 @@ describe HashInteraction do
     before { inputs.merge!(a: a) }
 
     it 'returns the correct value for :a' do
-      expect(result[:a]).to eql a.symbolize_keys
+      expect(result[:a]).to eql a.with_indifferent_access
     end
 
     it 'returns the correct value for :b' do
-      expect(result[:b]).to eql(x: {})
+      expect(result[:b]).to eql('x' => {})
     end
   end
 
@@ -39,6 +39,16 @@ describe HashInteraction do
     end
   end
 
+  context 'with an invalid default as a proc' do
+    it 'does not raise an error' do
+      expect do
+        Class.new(ActiveInteraction::Base) do
+          array :a, default: -> { Object.new }
+        end
+      end.to_not raise_error
+    end
+  end
+
   context 'with an invalid nested default' do
     it 'raises an error' do
       expect do

data/spec/active_interaction/integration/interface_interaction_spec.rb

@@ -4,9 +4,18 @@ require 'spec_helper'
 require 'json'
 require 'yaml'
 
-describe 'InterfaceInteraction' do
+InterfaceInteraction = Class.new(TestInteraction) do
+  interface :anything
+end
+
+describe InterfaceInteraction do
+  include_context 'interactions'
   it_behaves_like 'an interaction',
     :interface,
     -> { [JSON, YAML].sample },
     methods: [:dump, :load]
+
+  it 'succeeds when given nil' do
+    expect { result }.to_not raise_error
+  end
 end

data/spec/active_interaction/integration/object_interaction_spec.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+ObjectInteraction = Class.new(TestInteraction) do
+  object :object
+end
+
+describe ObjectInteraction do
+  include_context 'interactions'
+  it_behaves_like 'an interaction', :object, -> { // }, class: Regexp
+
+  it 'succeeds when given nil' do
+    expect { result }.to_not raise_error
+  end
+end

data/spec/active_interaction/modules/validation_spec.rb

@@ -42,7 +42,7 @@ describe ActiveInteraction::Validation do
           type = I18n.translate(
             "#{ActiveInteraction::Base.i18n_scope}.types.#{filter.class.slug}")
 
-          expect(result).to eql [[filter.name, :invalid_type, nil, type: type]]
+          expect(result).to eql [[filter.name, :invalid_type, type: type]]
         end
       end
 
@@ -65,7 +65,6 @@ describe ActiveInteraction::Validation do
           expect(result).to eql [[
             filter.name,
             :invalid_nested,
-            nil,
             { name: name.inspect, value: value.inspect }
           ]]
         end