active_interaction 0.9.0 → 0.9.1

data/lib/active_interaction/filters/time_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to

data/lib/active_interaction/modules/active_model.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   # @private
   module ActiveModel

data/lib/active_interaction/modules/core.rb

@@ -1,5 +1,8 @@
+# coding: utf-8
+
 begin
   require 'active_record'
+# rubocop:disable HandleExceptions
 rescue LoadError
   # ActiveRecord is an optional dependency.
 end
@@ -49,7 +52,7 @@ module ActiveInteraction
       if outcome.valid?
         outcome.result
       else
-        raise InvalidInteractionError, outcome.errors.full_messages.join(', ')
+        fail InvalidInteractionError, outcome.errors.full_messages.join(', ')
       end
     end
 

data/lib/active_interaction/modules/method_missing.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   # @private
   module MethodMissing

data/lib/active_interaction/modules/overload_hash.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   # @private
   module OverloadHash

data/lib/active_interaction/modules/validation.rb

@@ -1,19 +1,24 @@
+# coding: utf-8
+
 module ActiveInteraction
   # @private
   module Validation
     def self.validate(filters, inputs)
-      filters.reduce([]) do |errors, filter|
+      filters.each_with_object([]) do |filter, errors|
         begin
           filter.cast(inputs[filter.name])
-
-          errors
         rescue InvalidValueError
-          type = I18n.translate("#{Base.i18n_scope}.types.#{filter.class.slug}")
-          errors << [filter.name, :invalid, nil, type: type]
+          errors << [filter.name, :invalid, nil, type: type(filter)]
         rescue MissingValueError
           errors << [filter.name, :missing]
         end
       end
     end
+
+    private
+
+    def self.type(filter)
+      I18n.translate("#{Base.i18n_scope}.types.#{filter.class.slug}")
+    end
   end
 end

data/lib/active_interaction/version.rb

@@ -1,3 +1,6 @@
+# coding: utf-8
+
+# rubocop:disable Documentation
 module ActiveInteraction
-  VERSION = Gem::Version.new('0.9.0')
+  VERSION = Gem::Version.new('0.9.1')
 end

data/spec/active_interaction/base_spec.rb

@@ -1,33 +1,43 @@
+# coding: utf-8
+
 require 'spec_helper'
 
-describe ActiveInteraction::Base do
-  include_context 'interactions'
+InteractionWithFilter = Class.new(TestInteraction) do
+  float :thing
 
-  subject(:interaction) { described_class.new(options) }
+  def execute
+    thing
+  end
+end
 
-  class InteractionWithFilter < described_class
-    float :thing
+describe ActiveInteraction::Base do
+  include_context 'interactions'
 
-    def execute
-      thing
-    end
-  end
+  subject(:interaction) { described_class.new(inputs) }
 
-  describe '.new(options = {})' do
+  describe '.new(inputs = {})' do
     it 'does not allow :_interaction_* as an option' do
       key = :"_interaction_#{SecureRandom.hex}"
-      options.merge!(key => nil)
-      expect {
+      inputs.merge!(key => nil)
+      expect do
         interaction
-      }.to raise_error ActiveInteraction::InvalidValueError
+      end.to raise_error ActiveInteraction::InvalidValueError
     end
 
     it 'does not allow "_interaction_*" as an option' do
       key = "_interaction_#{SecureRandom.hex}"
-      options.merge!(key => nil)
-      expect {
+      inputs.merge!(key => nil)
+      expect do
         interaction
-      }.to raise_error ActiveInteraction::InvalidValueError
+      end.to raise_error ActiveInteraction::InvalidValueError
+    end
+
+    context 'with invalid inputs' do
+      let(:inputs) { nil }
+
+      it 'raises an error' do
+        expect { interaction }.to raise_error ArgumentError
+      end
     end
 
     context 'with an attribute' do
@@ -45,7 +55,7 @@ describe ActiveInteraction::Base do
       let(:thing) { SecureRandom.hex }
 
       context 'failing validations' do
-        before { options.merge!(thing: nil) }
+        before { inputs.merge!(thing: nil) }
 
         it 'returns an invalid outcome' do
           expect(interaction).to be_invalid
@@ -53,7 +63,7 @@ describe ActiveInteraction::Base do
       end
 
       context 'passing validations' do
-        before { options.merge!(thing: thing) }
+        before { inputs.merge!(thing: thing) }
 
         it 'returns a valid outcome' do
           expect(interaction).to be_valid
@@ -69,7 +79,7 @@ describe ActiveInteraction::Base do
       let(:described_class) { InteractionWithFilter }
 
       context 'failing validations' do
-        before { options.merge!(thing: thing) }
+        before { inputs.merge!(thing: thing) }
 
         context 'with an invalid value' do
           let(:thing) { 'a' }
@@ -89,7 +99,7 @@ describe ActiveInteraction::Base do
       end
 
       context 'passing validations' do
-        before { options.merge!(thing: 1) }
+        before { inputs.merge!(thing: 1) }
 
         it 'sets the attribute to the filtered value' do
           expect(interaction.thing).to eql 1.0
@@ -100,11 +110,11 @@ describe ActiveInteraction::Base do
 
   describe '.method_missing(filter_type, *args, &block)' do
     it 'raises an error for an invalid filter type' do
-      expect {
+      expect do
         Class.new(described_class) do
           not_a_valid_filter_type :thing
         end
-      }.to raise_error NoMethodError
+      end.to raise_error NoMethodError
     end
 
     it do
@@ -152,7 +162,7 @@ describe ActiveInteraction::Base do
     let(:described_class) { InteractionWithFilter }
     let(:thing) { rand }
 
-    describe '.run(options = {})' do
+    describe '.run(inputs = {})' do
       it "returns an instance of #{described_class}" do
         expect(outcome).to be_a described_class
       end
@@ -186,7 +196,7 @@ describe ActiveInteraction::Base do
       end
 
       context 'passing validations' do
-        before { options.merge!(thing: thing) }
+        before { inputs.merge!(thing: thing) }
 
         context 'failing runtime validations' do
           before do
@@ -231,25 +241,25 @@ describe ActiveInteraction::Base do
         it 'calls transaction' do
           allow(described_class).to receive(:transaction)
           outcome
-          expect(described_class).to have_received(:transaction).once.
-            with(no_args)
+          expect(described_class).to have_received(:transaction).once
+            .with(no_args)
         end
       end
     end
 
-    describe '.run!(options = {})' do
-      subject(:result) { described_class.run!(options) }
+    describe '.run!(inputs = {})' do
+      subject(:result) { described_class.run!(inputs) }
 
       context 'failing validations' do
         it 'raises an error' do
-          expect {
+          expect do
             result
-          }.to raise_error ActiveInteraction::InvalidInteractionError
+          end.to raise_error ActiveInteraction::InvalidInteractionError
         end
       end
 
       context 'passing validations' do
-        before { options.merge!(thing: thing) }
+        before { inputs.merge!(thing: thing) }
 
         it 'returns the result' do
           expect(result).to eq thing
@@ -261,7 +271,7 @@ describe ActiveInteraction::Base do
   describe '#inputs' do
     let(:described_class) { InteractionWithFilter }
     let(:other_val) { SecureRandom.hex }
-    let(:options) { {thing: 1, other: other_val} }
+    let(:inputs) { { thing: 1, other: other_val } }
 
     it 'casts filtered inputs' do
       expect(interaction.inputs[:thing]).to eql 1.0
@@ -297,7 +307,7 @@ describe ActiveInteraction::Base do
 
     context 'with valid composition' do
       before do
-        options.merge!(x: x, y: y)
+        inputs.merge!(x: x, y: y)
       end
 
       it 'is valid' do
@@ -315,8 +325,8 @@ describe ActiveInteraction::Base do
       end
 
       it 'has the correct errors' do
-        expect(outcome.errors[:base]).
-          to match_array ['X is required', 'Y is required']
+        expect(outcome.errors[:base])
+          .to match_array ['X is required', 'Y is required']
       end
     end
   end
@@ -326,4 +336,19 @@ describe ActiveInteraction::Base do
       expect { interaction.execute }.to raise_error NotImplementedError
     end
   end
+
+  context 'inheritance' do
+    it 'keeps the filters of the parent class' do
+      ParentInteraction = Class.new(ActiveInteraction::Base) do
+        boolean :x,
+          default: nil
+
+        def execute
+          inputs
+        end
+      end
+
+      expect(Class.new(ParentInteraction).run!).to eql(x: nil)
+    end
+  end
 end

data/spec/active_interaction/errors_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::Errors do
@@ -18,22 +20,22 @@ describe ActiveInteraction::Errors do
   describe '#add_sym' do
     it 'defaults to :invalid' do
       errors.add_sym(:attribute)
-      expect(errors.symbolic).to eq({ attribute: [:invalid] })
+      expect(errors.symbolic[:attribute]).to eq [:invalid]
     end
 
     it 'adds a symbol' do
       errors.add_sym(:attribute, :symbol)
-      expect(errors.symbolic).to eq({ attribute: [:symbol] })
+      expect(errors.symbolic[:attribute]).to eq [:symbol]
     end
 
     it 'accepts a message' do
       errors.add_sym(:attribute, :symbol, 'message')
-      expect(errors.symbolic).to eq({ attribute: [:symbol] })
+      expect(errors.symbolic[:attribute]).to eq [:symbol]
     end
 
     it 'accepts a message and options' do
-      errors.add_sym(:attribute, :symbol, 'message', { key: :value })
-      expect(errors.symbolic).to eq({ attribute: [:symbol] })
+      errors.add_sym(:attribute, :symbol, 'message', key: :value)
+      expect(errors.symbolic[:attribute]).to eq [:symbol]
     end
 
     context 'calling #add' do
@@ -43,26 +45,26 @@ describe ActiveInteraction::Errors do
 
       it 'with the default' do
         errors.add_sym(:attribute)
-        expect(errors).to have_received(:add).once.
-          with(:attribute, :invalid, {})
+        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, {})
+        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', {})
+        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 })
+        errors.add_sym(:attribute, :symbol, 'message', key: :value)
+        expect(errors).to have_received(:add).once
+          .with(:attribute, 'message', key: :value)
       end
     end
   end
@@ -96,4 +98,36 @@ describe ActiveInteraction::Errors do
       expect(errors.symbolic).to be_empty
     end
   end
+
+  describe '#merge!' do
+    let(:other) { described_class.new(klass.new) }
+
+    context 'with an error' do
+      before do
+        other.add(:attribute)
+      end
+
+      it 'adds the error' do
+        errors.merge!(other)
+        expect(errors.messages[:attribute]).to eq ['is invalid']
+      end
+
+      it 'does not add duplicate errors' do
+        other.add(:attribute)
+        errors.merge!(other)
+        expect(errors.messages[:attribute]).to eq ['is invalid']
+      end
+    end
+
+    context 'with a symbolic error' do
+      before do
+        other.add_sym(:attribute)
+      end
+
+      it 'adds the error' do
+        errors.merge!(other)
+        expect(errors.symbolic[:attribute]).to eq [:invalid]
+      end
+    end
+  end
 end

data/spec/active_interaction/filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 class ActiveInteraction::TestFilter < ActiveInteraction::Filter; end
@@ -7,9 +9,9 @@ describe ActiveInteraction::Filter, :filter do
 
   describe '.slug' do
     it 'raises an error' do
-      expect {
+      expect do
         described_class.slug
-      }.to raise_error ActiveInteraction::InvalidClassError
+      end.to raise_error ActiveInteraction::InvalidClassError
     end
   end
 

data/spec/active_interaction/filters/array_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::ArrayFilter, :filter do
@@ -5,7 +7,12 @@ describe ActiveInteraction::ArrayFilter, :filter do
   it_behaves_like 'a filter'
 
   context 'with multiple nested filters' do
-    let(:block) { Proc.new { array; array } }
+    let(:block) do
+      proc do
+        array
+        array
+      end
+    end
 
     it 'raises an error' do
       expect { filter }.to raise_error ActiveInteraction::InvalidFilterError
@@ -13,7 +20,7 @@ describe ActiveInteraction::ArrayFilter, :filter do
   end
 
   context 'with a nested name' do
-    let(:block) { Proc.new { array :a } }
+    let(:block) { proc { array :a } }
 
     it 'raises an error' do
       expect { filter }.to raise_error ActiveInteraction::InvalidFilterError
@@ -21,7 +28,7 @@ describe ActiveInteraction::ArrayFilter, :filter do
   end
 
   context 'with a nested default' do
-    let(:block) { Proc.new { array default: nil } }
+    let(:block) { proc { array default: nil } }
 
     it 'raises an error' do
       expect { filter }.to raise_error ActiveInteraction::InvalidDefaultError
@@ -46,7 +53,7 @@ describe ActiveInteraction::ArrayFilter, :filter do
     end
 
     context 'with a nested filter' do
-      let(:block) { Proc.new { array } }
+      let(:block) { proc { array } }
 
       context 'with an Array' do
         let(:value) { [] }
@@ -68,9 +75,9 @@ describe ActiveInteraction::ArrayFilter, :filter do
         let(:value) { [[], false, 0.0, {}, 0, '', :''] }
 
         it 'raises an error' do
-          expect{
+          expect do
             filter.cast(value)
-          }.to raise_error ActiveInteraction::InvalidValueError
+          end.to raise_error ActiveInteraction::InvalidValueError
         end
       end
     end