active_interaction 0.9.0 → 0.9.1

data/spec/active_interaction/filters/boolean_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::BooleanFilter, :filter do

data/spec/active_interaction/filters/date_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::DateFilter, :filter do
@@ -43,18 +45,18 @@ describe ActiveInteraction::DateFilter, :filter do
       let(:value) { 'invalid' }
 
       it 'raises an error' do
-        expect {
+        expect do
           filter.cast(value)
-        }.to raise_error ActiveInteraction::InvalidValueError
+        end.to raise_error ActiveInteraction::InvalidValueError
       end
 
       context 'with format' do
         include_context 'with format'
 
         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

data/spec/active_interaction/filters/date_time_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::DateTimeFilter, :filter do
@@ -43,18 +45,18 @@ describe ActiveInteraction::DateTimeFilter, :filter do
       let(:value) { 'invalid' }
 
       it 'raises an error' do
-        expect {
+        expect do
           filter.cast(value)
-        }.to raise_error ActiveInteraction::InvalidValueError
+        end.to raise_error ActiveInteraction::InvalidValueError
       end
 
       context 'with format' do
         include_context 'with format'
 
         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

data/spec/active_interaction/filters/file_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::FileFilter, :filter do

data/spec/active_interaction/filters/float_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::FloatFilter, :filter do
@@ -33,9 +35,9 @@ describe ActiveInteraction::FloatFilter, :filter do
       let(:value) { 'invalid' }
 
       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

data/spec/active_interaction/filters/hash_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::HashFilter, :filter do
@@ -5,7 +7,7 @@ describe ActiveInteraction::HashFilter, :filter do
   it_behaves_like 'a filter'
 
   context 'with a nested nameless filter' do
-    let(:block) { Proc.new { hash } }
+    let(:block) { proc { hash } }
 
     it 'raises an error' do
       expect { filter }.to raise_error ActiveInteraction::InvalidFilterError
@@ -30,7 +32,7 @@ describe ActiveInteraction::HashFilter, :filter do
     end
 
     context 'with a nested filter' do
-      let(:block) { Proc.new { hash :a } }
+      let(:block) { proc { hash :a } }
 
       context 'with a Hash' do
         let(:value) { { a: {} } }
@@ -38,6 +40,16 @@ describe ActiveInteraction::HashFilter, :filter do
         it 'returns the Hash' do
           expect(filter.cast(value)).to eq value
         end
+
+        context 'with String keys' do
+          before do
+            value.stringify_keys!
+          end
+
+          it 'does not raise an error' do
+            expect { filter.cast(value) }.to_not raise_error
+          end
+        end
       end
     end
   end
@@ -59,9 +71,9 @@ describe ActiveInteraction::HashFilter, :filter do
       end
 
       it 'raises an error' do
-        expect {
+        expect do
           filter.default
-        }.to raise_error ActiveInteraction::InvalidDefaultError
+        end.to raise_error ActiveInteraction::InvalidDefaultError
       end
     end
   end

data/spec/active_interaction/filters/integer_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::IntegerFilter, :filter do
@@ -33,9 +35,9 @@ describe ActiveInteraction::IntegerFilter, :filter do
       let(:value) { 'invalid' }
 
       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

data/spec/active_interaction/filters/model_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 class Model; end
@@ -35,9 +37,9 @@ describe ActiveInteraction::ModelFilter, :filter do
       end
 
       it 'raises an error' do
-        expect {
+        expect do
           filter.cast(value)
-        }.to raise_error ActiveInteraction::InvalidClassError
+        end.to raise_error ActiveInteraction::InvalidClassError
       end
     end
   end

data/spec/active_interaction/filters/string_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::StringFilter, :filter do

data/spec/active_interaction/filters/symbol_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::SymbolFilter, :filter do

data/spec/active_interaction/filters/time_filter_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::TimeFilter, :filter do
@@ -43,18 +45,18 @@ describe ActiveInteraction::TimeFilter, :filter do
       let(:value) { 'invalid' }
 
       it 'raises an error' do
-        expect {
+        expect do
           filter.cast(value)
-        }.to raise_error ActiveInteraction::InvalidValueError
+        end.to raise_error ActiveInteraction::InvalidValueError
       end
 
       context 'with format' do
         include_context 'with format'
 
         it do
-          expect {
+          expect do
             filter.cast(value)
-          }.to raise_error ActiveInteraction::InvalidValueError
+          end.to raise_error ActiveInteraction::InvalidValueError
         end
       end
     end

data/spec/active_interaction/filters_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe ActiveInteraction::Filters do

data/spec/active_interaction/i18n_spec.rb

@@ -1,11 +1,11 @@
+# coding: utf-8
+
 require 'spec_helper'
 
-class I18nInteraction < ActiveInteraction::Base
+I18nInteraction = Class.new(TestInteraction) do
   hash :a do
     hash :x
   end
-
-  def execute; end
 end
 
 describe I18nInteraction do
@@ -47,7 +47,7 @@ describe I18nInteraction do
         end
 
         it 'returns the translation' do
-          options.merge!(a: Object.new)
+          inputs.merge!(a: Object.new)
           expect(outcome.errors[:a]).to eq [translation]
         end
       end
@@ -74,20 +74,20 @@ describe I18nInteraction do
     end
   end
 
-  context 'english'.reverse do
+  context 'hsilgne' do
     include_examples 'translation'
 
     before do
-      I18n.locale = 'english'.reverse
-
-      I18n.backend.store_translations(I18n.locale, active_interaction: {
+      I18n.backend.store_translations('hsilgne', active_interaction: {
         errors: { messages: {
           invalid: "%{type} #{'invalid'.reverse}",
           invalid_nested: 'invalid_nested'.reverse,
           missing: 'missing'.reverse
         } },
-        types: TYPES.reduce({}) { |a, e| a[e] = e.reverse; a }
+        types: TYPES.each_with_object({}) { |e, a| a[e] = e.reverse }
       })
+
+      I18n.locale = 'hsilgne'
     end
   end
 end

data/spec/active_interaction/integration/array_interaction_spec.rb

@@ -1,6 +1,8 @@
+# coding: utf-8
+
 require 'spec_helper'
 
-class ArrayInteraction < ActiveInteraction::Base
+ArrayInteraction = Class.new(TestInteraction) do
   array :a do
     array
   end
@@ -9,7 +11,7 @@ class ArrayInteraction < ActiveInteraction::Base
   end
 
   def execute
-    { a: a, b: b }
+    inputs
   end
 end
 
@@ -17,10 +19,10 @@ describe ArrayInteraction do
   include_context 'interactions'
   it_behaves_like 'an interaction', :array, -> { [] }
 
-  context 'with options[:a]' do
+  context 'with inputs[:a]' do
     let(:a) { [[]] }
 
-    before { options.merge!(a: a) }
+    before { inputs.merge!(a: a) }
 
     it 'returns the correct value for :a' do
       expect(result[:a]).to eq a
@@ -33,23 +35,23 @@ describe ArrayInteraction do
 
   context 'with an invalid default' do
     it 'raises an error' do
-      expect {
+      expect do
         Class.new(ActiveInteraction::Base) do
           array :a, default: Object.new
         end
-      }.to raise_error ActiveInteraction::InvalidDefaultError
+      end.to raise_error ActiveInteraction::InvalidDefaultError
     end
   end
 
   context 'with an invalid nested default' do
     it 'raises an error' do
-      expect {
+      expect do
         Class.new(ActiveInteraction::Base) do
           array :a, default: [Object.new] do
             array
           end
         end
-      }.to raise_error ActiveInteraction::InvalidDefaultError
+      end.to raise_error ActiveInteraction::InvalidDefaultError
     end
   end
 end

data/spec/active_interaction/integration/boolean_interaction_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe 'BooleanInteraction' do

data/spec/active_interaction/integration/date_interaction_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe 'DateInteraction' do

data/spec/active_interaction/integration/date_time_interaction_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe 'DateTimeInteraction' do

data/spec/active_interaction/integration/file_interaction_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe 'FileInteraction' do

data/spec/active_interaction/integration/float_interaction_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe 'FloatInteraction' do

data/spec/active_interaction/integration/hash_interaction_spec.rb

@@ -1,6 +1,8 @@
+# coding: utf-8
+
 require 'spec_helper'
 
-class HashInteraction < ActiveInteraction::Base
+HashInteraction = Class.new(TestInteraction) do
   hash :a do
     hash :x
   end
@@ -9,7 +11,7 @@ class HashInteraction < ActiveInteraction::Base
   end
 
   def execute
-    { a: a, b: b }
+    inputs
   end
 end
 
@@ -17,10 +19,10 @@ describe HashInteraction do
   include_context 'interactions'
   it_behaves_like 'an interaction', :hash, -> { {} }
 
-  context 'with options[:a]' do
+  context 'with inputs[:a]' do
     let(:a) { { x: {} } }
 
-    before { options.merge!(a: a) }
+    before { inputs.merge!(a: a) }
 
     it 'returns the correct value for :a' do
       expect(result[:a]).to eq a.symbolize_keys
@@ -33,23 +35,23 @@ describe HashInteraction do
 
   context 'with an invalid default' do
     it 'raises an error' do
-      expect {
+      expect do
         Class.new(ActiveInteraction::Base) do
           hash :a, default: Object.new
         end
-      }.to raise_error ActiveInteraction::InvalidDefaultError
+      end.to raise_error ActiveInteraction::InvalidDefaultError
     end
   end
 
   context 'with an invalid nested default' do
     it 'raises an error' do
-      expect {
+      expect do
         Class.new(ActiveInteraction::Base) do
           hash :a, default: { x: Object.new } do
             hash :x
           end
         end
-      }.to raise_error ActiveInteraction::InvalidDefaultError
+      end.to raise_error ActiveInteraction::InvalidDefaultError
     end
   end
 end

data/spec/active_interaction/integration/integer_interaction_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe 'IntegerInteraction' do

data/spec/active_interaction/integration/model_interaction_spec.rb

@@ -1,5 +1,7 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe 'ModelInteraction' do
-  it_behaves_like 'an interaction', :model, -> { Proc.new {} }, class: Proc
+  it_behaves_like 'an interaction', :model, -> { proc {} }, class: Proc
 end