active_interaction 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b1db83e71226e6160a36354484c59cd312fcdc2
-  data.tar.gz: 13ab7a0625523b7cc531197d697a03ee5c52b14e
+  metadata.gz: 1127329ea0197658f720d8fe6c1ae7d993f5f9dc
+  data.tar.gz: 4b58e248170a453276474a749b109782e12501c8
 SHA512:
-  metadata.gz: d7daa784b53f26ae7fd99ee906874e551c98dfb1db49cf0a248fd7aca7878f44adaa070a1014862d9c1f1038504912581069e887a0167ae4c2ac61b552991a12
-  data.tar.gz: 367a7f33d4386b31020fa29a204219a89231c2dc1b0670cb91b06b5eb00394529121cb181734b9b478a6c19b55d55f007acc51952c184518a22f870b969c0f4e
+  metadata.gz: b461f9b41d8dd0447c34b9c724b249ad62c29d4fe34c98f1a2e6965f99db9828a68b501d78b459d8dd1e24ccbf5ee03d3678d57b0a1182e7fdc0db3683f40bcb
+  data.tar.gz: 745be14ea173b524346a1e38f9f89631b0e828db3c47ea3e543b4864c4df8929ea7fd2fb5cb5a44cc829d1bf1c4b0339b43faa657b65443a3ae5b954cc6e0b50

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [Master][]
 
+# [0.10.1][] (2013-12-20)
+
+- Fix bug that prevented parsing strings as times when ActiveSupport was
+  available.
+
 # [0.10.0][] (2013-12-19)
 
 - Support casting "true" and "false" as booleans.
@@ -97,10 +102,11 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v0.10.0...master
-  [0.10.0]: https://github.com/orgsync/active_interaction/compare/v0.9.1...0.10.0
-  [0.9.1]: https://github.com/orgsync/active_interaction/compare/v0.9.0...0.9.1
-  [0.9.0]: https://github.com/orgsync/active_interaction/compare/v0.9.0...0.9.0
+  [master]: https://github.com/orgsync/active_interaction/compare/v0.10.1...master
+  [0.10.1]: https://github.com/orgsync/active_interaction/compare/v0.10.0...v0.10.1
+  [0.10.0]: https://github.com/orgsync/active_interaction/compare/v0.9.1...v0.10.0
+  [0.9.1]: https://github.com/orgsync/active_interaction/compare/v0.9.0...v0.9.1
+  [0.9.0]: https://github.com/orgsync/active_interaction/compare/v0.8.0...v0.9.0
   [0.8.0]: https://github.com/orgsync/active_interaction/compare/v0.7.0...v0.8.0
   [0.7.0]: https://github.com/orgsync/active_interaction/compare/v0.6.1...v0.7.0
   [0.6.1]: https://github.com/orgsync/active_interaction/compare/v0.6.0...v0.6.1

data/README.md

@@ -25,7 +25,7 @@ This project uses [semantic versioning][].
 Add it to your Gemfile:
 
 ```ruby
-gem 'active_interaction', '~> 0.10.0'
+gem 'active_interaction', '~> 0.10.1'
 ```
 
 And then execute:

data/lib/active_interaction/filters/abstract_date_time_filter.rb

@@ -5,7 +5,7 @@ module ActiveInteraction
   class AbstractDateTimeFilter < Filter
     def cast(value)
       case value
-      when klass
+      when value_class
         value
       when String
         begin
@@ -35,5 +35,9 @@ module ActiveInteraction
     def klass
       fail NotImplementedError
     end
+
+    def value_class
+      klass
+    end
   end
 end

data/lib/active_interaction/filters/time_filter.rb

@@ -27,7 +27,7 @@ module ActiveInteraction
     def cast(value)
       case value
       when Numeric
-        time.at(value)
+        klass.at(value)
       else
         super
       end
@@ -36,15 +36,15 @@ module ActiveInteraction
     private
 
     def klass
-      time.at(0).class
-    end
-
-    def time
       if Time.respond_to?(:zone) && !Time.zone.nil?
         Time.zone
       else
         Time
       end
     end
+
+    def value_class
+      klass.at(0).class
+    end
   end
 end

data/lib/active_interaction/version.rb

@@ -2,5 +2,5 @@
 
 # rubocop:disable Documentation
 module ActiveInteraction
-  VERSION = Gem::Version.new('0.10.0')
+  VERSION = Gem::Version.new('0.10.1')
 end

data/spec/active_interaction/base_spec.rb

@@ -4,13 +4,9 @@ require 'spec_helper'
 
 InteractionWithFilter = Class.new(TestInteraction) do
   float :thing
-
-  def execute
-    thing
-  end
 end
 
-AddInteraction = Class.new(ActiveInteraction::Base) do
+AddInteraction = Class.new(TestInteraction) do
   float :x, :y
 
   def execute
@@ -18,7 +14,7 @@ AddInteraction = Class.new(ActiveInteraction::Base) do
   end
 end
 
-InterruptInteraction = Class.new(ActiveInteraction::Base) do
+InterruptInteraction = Class.new(TestInteraction) do
   model :x, :y,
     class: Object,
     default: nil
@@ -64,10 +60,6 @@ describe ActiveInteraction::Base do
           attr_reader :thing
 
           validates :thing, presence: true
-
-          def execute
-            thing
-          end
         end
       end
       let(:thing) { SecureRandom.hex }
@@ -129,7 +121,7 @@ describe ActiveInteraction::Base do
   describe '.method_missing(filter_type, *args, &block)' do
     it 'raises an error for an invalid filter type' do
       expect do
-        Class.new(described_class) do
+        Class.new(TestInteraction) do
           not_a_valid_filter_type :thing
         end
       end.to raise_error NoMethodError
@@ -137,7 +129,7 @@ describe ActiveInteraction::Base do
 
     it do
       expect do
-        Class.new(described_class) do
+        Class.new(TestInteraction) do
           float :_interaction_thing
         end
       end.to raise_error ActiveInteraction::InvalidFilterError
@@ -157,10 +149,8 @@ describe ActiveInteraction::Base do
 
     context 'with multiple filters' do
       let(:described_class) do
-        Class.new(ActiveInteraction::Base) do
+        Class.new(TestInteraction) do
           float :thing1, :thing2
-
-          def execute; end
         end
       end
 
@@ -253,7 +243,7 @@ describe ActiveInteraction::Base do
         end
 
         it 'sets the result' do
-          expect(result).to eq thing
+          expect(result[:thing]).to eq thing
         end
 
         it 'calls transaction' do
@@ -280,7 +270,7 @@ describe ActiveInteraction::Base do
         before { inputs.merge!(thing: thing) }
 
         it 'returns the result' do
-          expect(result).to eq thing
+          expect(result[:thing]).to eq thing
         end
       end
     end

data/spec/active_interaction/integration/array_interaction_spec.rb

@@ -9,10 +9,6 @@ ArrayInteraction = Class.new(TestInteraction) do
   array :b, default: [[]] do
     array
   end
-
-  def execute
-    inputs
-  end
 end
 
 describe ArrayInteraction do

data/spec/active_interaction/integration/hash_interaction_spec.rb

@@ -9,10 +9,6 @@ HashInteraction = Class.new(TestInteraction) do
   hash :b, default: {} do
     hash :x, default: {}
   end
-
-  def execute
-    inputs
-  end
 end
 
 describe HashInteraction do

data/spec/active_interaction/integration/time_interaction_spec.rb

@@ -4,30 +4,28 @@ require 'spec_helper'
 
 TimeZone = Class.new do
   def self.at(*args)
-    TimeWithZone.at(*args)
+    TimeWithZone.new(Time.at(*args))
+  end
+
+  def self.parse(*args)
+    TimeWithZone.new(Time.parse(*args))
   end
 end
 
 TimeWithZone = Class.new do
-  def self.at(*args)
-    new(Time.at(*args))
-  end
+  attr_reader :time
 
   def initialize(time)
     @time = time
   end
 
   def ==(other)
-    @time == other
+    time == other.time
   end
 end
 
 TimeInteraction = Class.new(TestInteraction) do
   time :a
-
-  def execute
-    a
-  end
 end
 
 describe TimeInteraction do
@@ -35,15 +33,28 @@ describe TimeInteraction do
   it_behaves_like 'an interaction', :time, -> { Time.now }
 
   context 'with a time zone' do
-    let(:a) { rand(1 << 16) }
+    let(:a) { nil }
 
     before do
-      allow(Time).to receive(:zone).and_return(TimeZone)
       inputs.merge!(a: a)
+
+      allow(Time).to receive(:zone).and_return(TimeZone)
+    end
+
+    context 'with an integer' do
+      let(:a) { rand(1 << 16) }
+
+      it 'returns the correct value' do
+        expect(result[:a]).to eq TimeZone.at(a)
+      end
     end
 
-    it 'returns the correct value' do
-      expect(result).to eq Time.at(a)
+    context 'with a string' do
+      let(:a) { '2011-12-13T14:15:16Z' }
+
+      it 'returns the correct value' do
+        expect(result[:a]).to eq TimeZone.parse(a)
+      end
     end
   end
 end

data/spec/support/interactions.rb

@@ -6,6 +6,7 @@ TestInteraction = Class.new(ActiveInteraction::Base) do
   end
 
   def execute
+    inputs
   end
 end
 
@@ -25,16 +26,6 @@ shared_examples_for 'an interaction' do |type, generator, filter_options = {}|
       send(type, :default, filter_options.merge(default: generator.call))
       send(type, :defaults_1, :defaults_2,
            filter_options.merge(default: generator.call))
-
-      def execute
-        {
-          required: required,
-          optional: optional,
-          default: default,
-          defaults_1: defaults_1,
-          defaults_2: defaults_2
-        }
-      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel