active_interaction 1.6.1 → 2.0.0

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/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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -179,7 +179,6 @@ files:
 - lib/active_interaction/concerns/hashable.rb
 - lib/active_interaction/concerns/missable.rb
 - lib/active_interaction/concerns/runnable.rb
-- lib/active_interaction/concerns/transactable.rb
 - lib/active_interaction/errors.rb
 - lib/active_interaction/filter.rb
 - lib/active_interaction/filter_column.rb
@@ -196,7 +195,7 @@ files:
 - lib/active_interaction/filters/hash_filter.rb
 - lib/active_interaction/filters/integer_filter.rb
 - lib/active_interaction/filters/interface_filter.rb
-- lib/active_interaction/filters/model_filter.rb
+- lib/active_interaction/filters/object_filter.rb
 - lib/active_interaction/filters/string_filter.rb
 - lib/active_interaction/filters/symbol_filter.rb
 - lib/active_interaction/filters/time_filter.rb
@@ -211,7 +210,6 @@ files:
 - spec/active_interaction/concerns/hashable_spec.rb
 - spec/active_interaction/concerns/missable_spec.rb
 - spec/active_interaction/concerns/runnable_spec.rb
-- spec/active_interaction/concerns/transactable_spec.rb
 - spec/active_interaction/errors_spec.rb
 - spec/active_interaction/filter_column_spec.rb
 - spec/active_interaction/filter_spec.rb
@@ -228,7 +226,7 @@ files:
 - spec/active_interaction/filters/hash_filter_spec.rb
 - spec/active_interaction/filters/integer_filter_spec.rb
 - spec/active_interaction/filters/interface_filter_spec.rb
-- spec/active_interaction/filters/model_filter_spec.rb
+- spec/active_interaction/filters/object_filter_spec.rb
 - spec/active_interaction/filters/string_filter_spec.rb
 - spec/active_interaction/filters/symbol_filter_spec.rb
 - spec/active_interaction/filters/time_filter_spec.rb
@@ -243,7 +241,7 @@ files:
 - spec/active_interaction/integration/hash_interaction_spec.rb
 - spec/active_interaction/integration/integer_interaction_spec.rb
 - spec/active_interaction/integration/interface_interaction_spec.rb
-- spec/active_interaction/integration/model_interaction_spec.rb
+- spec/active_interaction/integration/object_interaction_spec.rb
 - spec/active_interaction/integration/string_interaction_spec.rb
 - spec/active_interaction/integration/symbol_interaction_spec.rb
 - spec/active_interaction/integration/time_interaction_spec.rb
@@ -273,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Manage application specific business logic.
@@ -284,7 +282,6 @@ test_files:
 - spec/active_interaction/concerns/hashable_spec.rb
 - spec/active_interaction/concerns/missable_spec.rb
 - spec/active_interaction/concerns/runnable_spec.rb
-- spec/active_interaction/concerns/transactable_spec.rb
 - spec/active_interaction/errors_spec.rb
 - spec/active_interaction/filter_column_spec.rb
 - spec/active_interaction/filter_spec.rb
@@ -301,7 +298,7 @@ test_files:
 - spec/active_interaction/filters/hash_filter_spec.rb
 - spec/active_interaction/filters/integer_filter_spec.rb
 - spec/active_interaction/filters/interface_filter_spec.rb
-- spec/active_interaction/filters/model_filter_spec.rb
+- spec/active_interaction/filters/object_filter_spec.rb
 - spec/active_interaction/filters/string_filter_spec.rb
 - spec/active_interaction/filters/symbol_filter_spec.rb
 - spec/active_interaction/filters/time_filter_spec.rb
@@ -316,7 +313,7 @@ test_files:
 - spec/active_interaction/integration/hash_interaction_spec.rb
 - spec/active_interaction/integration/integer_interaction_spec.rb
 - spec/active_interaction/integration/interface_interaction_spec.rb
-- spec/active_interaction/integration/model_interaction_spec.rb
+- spec/active_interaction/integration/object_interaction_spec.rb
 - spec/active_interaction/integration/string_interaction_spec.rb
 - spec/active_interaction/integration/symbol_interaction_spec.rb
 - spec/active_interaction/integration/time_interaction_spec.rb

data/lib/active_interaction/concerns/transactable.rb

@@ -1,81 +0,0 @@
-# coding: utf-8
-
-begin
-  require 'active_record'
-rescue LoadError
-  module ActiveRecord # rubocop:disable Style/Documentation
-    Rollback = Class.new(ActiveInteraction::Error)
-
-    class Base # rubocop:disable Style/Documentation
-      def self.transaction(*)
-        yield
-      rescue Rollback
-      end
-    end
-  end
-end
-
-module ActiveInteraction
-  # @private
-  #
-  # Execute code in a transaction. If ActiveRecord isn't available, don't do
-  # anything special.
-  #
-  # @since 1.2.0
-  module Transactable
-    extend ActiveSupport::Concern
-
-    # @yield []
-    def transaction
-      return unless block_given?
-
-      if self.class.transaction?
-        ActiveRecord::Base.transaction(self.class.transaction_options) do
-          yield
-        end
-      else
-        yield
-      end
-    end
-
-    module ClassMethods # rubocop:disable Style/Documentation
-      # @param klass [Class]
-      def inherited(klass)
-        klass.transaction_without_deprecation(
-          transaction?, transaction_options.dup)
-
-        super
-      end
-
-      # @param enable [Boolean]
-      # @param options [Hash]
-      #
-      # @return [nil]
-      def transaction(enable, options = {})
-        @_interaction_transaction_enabled = enable
-        @_interaction_transaction_options = options
-
-        nil
-      end
-      ActiveInteraction.deprecate self, :transaction
-
-      # @return [Boolean]
-      def transaction?
-        unless defined?(@_interaction_transaction_enabled)
-          @_interaction_transaction_enabled = true
-        end
-
-        @_interaction_transaction_enabled
-      end
-
-      # @return [Hash]
-      def transaction_options
-        unless defined?(@_interaction_transaction_options)
-          @_interaction_transaction_options = {}
-        end
-
-        @_interaction_transaction_options
-      end
-    end
-  end
-end

data/spec/active_interaction/concerns/transactable_spec.rb

@@ -1,135 +0,0 @@
-# coding: utf-8
-
-require 'spec_helper'
-
-describe ActiveRecord::Base do
-  describe '.transaction' do
-    it 'raises an error' do
-      expect { described_class.transaction }.to raise_error LocalJumpError
-    end
-
-    it 'silently rescues ActiveRecord::Rollback' do
-      expect do
-        described_class.transaction do
-          fail ActiveRecord::Rollback
-        end
-      end.to_not raise_error
-    end
-
-    context 'with a block' do
-      it 'yields to the block' do
-        expect { |b| described_class.transaction(&b) }.to yield_with_no_args
-      end
-
-      it 'accepts an argument' do
-        expect { described_class.transaction(nil) {} }.to_not raise_error
-      end
-    end
-  end
-end
-
-describe ActiveInteraction::Transactable do
-  include_context 'concerns', ActiveInteraction::Transactable
-
-  describe '.transaction' do
-    it 'returns nil' do
-      expect(klass.transaction(true)).to be_nil
-    end
-
-    it 'accepts a flag parameter' do
-      expect { klass.transaction(true) }.to_not raise_error
-    end
-
-    it 'also accepts an options parameter' do
-      expect { klass.transaction(true, {}) }.to_not raise_error
-    end
-  end
-
-  describe '.transaction?' do
-    it 'defaults to true' do
-      expect(klass.transaction?).to be_truthy
-    end
-
-    it 'returns the stored value' do
-      klass.transaction(false)
-      expect(klass.transaction?).to be_falsey
-    end
-
-    context 'with a subclass' do
-      before { klass.transaction(false) }
-
-      let(:subclass) { Class.new(klass) }
-
-      it 'inherits from the superclass' do
-        expect(subclass.transaction?).to be_falsey
-      end
-    end
-  end
-
-  describe '.transaction_options' do
-    let(:h) { { rand => rand } }
-
-    it 'defaults to an empty hash' do
-      expect(klass.transaction_options).to eql({})
-    end
-
-    it 'returns the stored value' do
-      klass.transaction(klass.transaction?, h)
-      expect(klass.transaction_options).to eql h
-    end
-
-    context 'with a subclass' do
-      before { klass.transaction(klass.transaction?, h) }
-
-      let(:subclass) { Class.new(klass) }
-
-      it 'inherits from the superclass' do
-        expect(subclass.transaction_options).to eql h
-      end
-    end
-  end
-
-  describe '#transaction' do
-    let(:block) { -> { value } }
-    let(:result) { instance.transaction(&block) }
-    let(:value) { double }
-
-    before do
-      allow(ActiveRecord::Base).to receive(:transaction).and_call_original
-    end
-
-    it 'returns nil' do
-      expect(instance.transaction).to be_nil
-    end
-
-    context 'with transactions disabled' do
-      before do
-        klass.transaction(false)
-      end
-
-      it 'returns the value of the block' do
-        expect(result).to eql value
-      end
-
-      it 'does not call ActiveRecord::Base.transaction' do
-        expect(ActiveRecord::Base).to_not have_received(:transaction)
-      end
-    end
-
-    context 'with transactions enabled' do
-      before do
-        klass.transaction(true)
-      end
-
-      it 'returns the value of the block' do
-        expect(result).to eql value
-      end
-
-      it 'calls ActiveRecord::Base.transaction' do
-        result
-        expect(ActiveRecord::Base).to have_received(:transaction)
-          .once.with(klass.transaction_options, &block)
-      end
-    end
-  end
-end