Merge pull request #251 from orgsync/activerecordable

Split our ActiveRecord related methods

lib/active_interaction.rb

@@ -6,6 +6,7 @@
 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'

lib/active_interaction/base.rb

@@ -29,6 +29,7 @@ module ActiveInteraction
   #   end
   class Base
     include ActiveModelable
+    include ActiveRecordable
     include Runnable
 
     define_callbacks :type_check
@@ -181,31 +182,6 @@ def initialize(inputs = {})
       process_inputs(inputs.symbolize_keys)
     end
 
-    # Returns the column object for the named filter.
-    #
-    # @param name [Symbol] The name of a filter.
-    #
-    # @example
-    #   class Interaction < ActiveInteraction::Base
-    #     string :email, default: nil
-    #
-    #     def execute; end
-    #   end
-    #
-    #   Interaction.new.column_for_attribute(:email)
-    #   # => #<ActiveInteraction::FilterColumn:0x007faebeb2a6c8 @type=:string>
-    #
-    #   Interaction.new.column_for_attribute(:not_a_filter)
-    #   # => nil
-    #
-    # @return [FilterColumn, nil]
-    #
-    # @since 1.2.0
-    def column_for_attribute(name)
-      filter = self.class.filters[name]
-      FilterColumn.intern(filter.database_column_type) if filter
-    end
-
     # @!method compose(other, inputs = {})
     #   Run another interaction and return its result. If the other interaction
     #     fails, halt execution.

lib/active_interaction/concerns/active_recordable.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+
+module ActiveInteraction
+  # Implement the minimal ActiveRecord interface.
+  #
+  # @private
+  module ActiveRecordable
+    # Returns the column object for the named filter.
+    #
+    # @param name [Symbol] The name of a filter.
+    #
+    # @example
+    #   class Interaction < ActiveInteraction::Base
+    #     string :email, default: nil
+    #
+    #     def execute; end
+    #   end
+    #
+    #   Interaction.new.column_for_attribute(:email)
+    #   # => #<ActiveInteraction::FilterColumn:0x007faebeb2a6c8 @type=:string>
+    #
+    #   Interaction.new.column_for_attribute(:not_a_filter)
+    #   # => nil
+    #
+    # @return [FilterColumn, nil]
+    #
+    # @since 1.2.0
+    def column_for_attribute(name)
+      filter = self.class.filters[name]
+      FilterColumn.intern(filter.database_column_type) if filter
+    end
+  end
+end

spec/active_interaction/base_spec.rb

@@ -313,31 +313,6 @@ def execute
     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 }

spec/active_interaction/concerns/active_recordable_spec.rb

@@ -0,0 +1,36 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+InteractionWithFilter = Class.new(TestInteraction) do
+  float :thing
+end
+
+describe ActiveInteraction::ActiveRecordable do
+  include_context 'interactions'
+
+  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) { 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
+end