active_interaction 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c1d5b914798cc9b8b70729d645f8ef4a0d4031f
-  data.tar.gz: ae3a8b0db8afdd311a44d9c73e1fcb2788d11086
+  metadata.gz: 0b77e2393588e6b32887a4a38847e14b8f347191
+  data.tar.gz: ef3b09ab34ef2b7937a457f5cab2648f0cb7e8cc
 SHA512:
-  metadata.gz: 95496b5a5f1b4d837b7d2e1231c38ae6522aac69fd0bcc5f5c70739f26428299e4aaf89d43791558b97c5f90b5e4e422b9ade2db76aec0371da27fcb078a9fa8
-  data.tar.gz: 7fcb37ddb4a3bd9beb005401448304314a6996fe99c0b4e6ddcb1f684c456cd861fcfdaddc75aa7a7ff24571f1a52f2783406c6ff8af519d5295d6c1287df61d
+  metadata.gz: 5af88c5f9d4b7da0b6e6adc2039d393e0b2fdbac83268b28a8015dce6cf926ec59465201e298e90ce6f4a8f6cd77d5d3641bd787eaaaf0cd2e314646237f66c3
+  data.tar.gz: ebdfcf778480fa4874e04551d07cb2495df8845238d1b79868c0905c77e309f5c9130892c888c241786cf6d7d78b3b914d5bdf374ef513fb78b1e3c8dcd2fdba

data/CHANGELOG.md

@@ -1,7 +1,13 @@
 # [Master][]
 
+# [1.2.1][] (2014-05-02)
+
+- Fix a bug that marked model inputs as invalid even if they returned true for
+  `object.is_a?(klass)`.
+
 # [1.2.0][] (2014-04-30)
 
+- Add support for Rails-style date and time parameters like `date(1i)`.
 - Add a decimal filter.
 - Add support for disabling and modifying transactions through the
   `transaction` helper method.
@@ -193,7 +199,8 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v1.2.0...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v1.2.1...master
+  [1.2.1]: https://github.com/orgsync/active_interaction/compare/v1.2.0...v1.2.1
   [1.2.0]: https://github.com/orgsync/active_interaction/compare/v1.1.7...v1.2.0
   [1.1.7]: https://github.com/orgsync/active_interaction/compare/v1.1.6...v1.1.7
   [1.1.6]: https://github.com/orgsync/active_interaction/compare/v1.1.5...v1.1.6

data/lib/active_interaction.rb

@@ -37,6 +37,8 @@ require 'active_interaction/filters/time_filter'
 
 require 'active_interaction/base'
 
+require 'active_interaction/backports'
+
 I18n.load_path << File.expand_path(
   File.join(%w[active_interaction locale en.yml]), File.dirname(__FILE__))
 
@@ -47,5 +49,5 @@ I18n.load_path << File.expand_path(
 #
 # @since 1.0.0
 #
-# @version 1.2.0
+# @version 1.2.1
 module ActiveInteraction end

data/lib/active_interaction/backports.rb

@@ -0,0 +1,28 @@
+# coding: utf-8
+
+# rubocop:disable Documentation
+module ActiveInteraction
+  class GroupedInput
+    # Required for Ruby <= 1.9.3.
+    def [](name)
+      send(name)
+    end unless method_defined?(:[])
+
+    # Required for Ruby <= 1.9.3.
+    def []=(name, value)
+      send("#{name}=", value)
+    end unless method_defined?(:[]=)
+  end
+end
+
+# @private
+class Hash
+  # Required for Rails <= 4.0.2.
+  def transform_keys
+    result = {}
+    each_key do |key|
+      result[yield(key)] = self[key]
+    end
+    result
+  end unless method_defined?(:transform_keys)
+end

data/lib/active_interaction/filters/hash_filter.rb

@@ -73,14 +73,8 @@ module ActiveInteraction
       options.fetch(:strip, true)
     end
 
-    # Switch to `transform_keys` once we support only Rails 4.0.2+
     def stringify_the_symbol_keys(hash)
-      new_hash = {}
-      hash.each_key do |key|
-        new_key = key.is_a?(Symbol) ? key.to_s : key
-        new_hash[new_key] = hash[key]
-      end
-      new_hash
+      hash.transform_keys { |key| key.is_a?(Symbol) ? key.to_s : key }
     end
   end
 end

data/lib/active_interaction/filters/model_filter.rb

@@ -19,8 +19,9 @@ module ActiveInteraction
   # @private
   class ModelFilter < Filter
     def cast(value, reconstantize = true)
-      case value
-      when @klass ||= klass
+      @klass ||= klass
+
+      if matches?(value)
         value
       else
         return super(value) unless reconstantize
@@ -41,5 +42,13 @@ module ActiveInteraction
     rescue NameError
       raise InvalidClassError, klass_name.inspect
     end
+
+    # @param value [Object]
+    #
+    # @return [Boolean]
+    def matches?(value)
+      @klass === value || # rubocop:disable CaseEquality
+        value.is_a?(@klass)
+    end
   end
 end

data/lib/active_interaction/grouped_input.rb

@@ -9,16 +9,5 @@ module ActiveInteraction
   #
   # @private
   class GroupedInput < OpenStruct
-    unless method_defined?(:[])
-      def [](name)
-        send(name)
-      end
-    end
-
-    unless method_defined?(:[]=)
-      def []=(name, value)
-        send("#{name}=", value)
-      end
-    end
   end
 end

data/lib/active_interaction/version.rb

@@ -5,5 +5,5 @@ module ActiveInteraction
   # The version number.
   #
   # @return [Gem::Version]
-  VERSION = Gem::Version.new('1.2.0')
+  VERSION = Gem::Version.new('1.2.1')
 end

data/spec/active_interaction/filters/model_filter_spec.rb

@@ -62,6 +62,40 @@ describe ActiveInteraction::ModelFilter, :filter do
           expect { filter }.to_not raise_error
         end
       end
+
+      context 'with bidirectional class comparisons' do
+        let(:case_equality) { false }
+        let(:class_equality) { false }
+
+        before do
+          allow(Model).to receive(:===).and_return(case_equality)
+          allow(value).to receive(:is_a?).and_return(class_equality)
+        end
+
+        context 'without case or class equality' do
+          it 'raises an error' do
+            expect do
+              result
+            end.to raise_error ActiveInteraction::InvalidValueError
+          end
+        end
+
+        context 'with case equality' do
+          let(:case_equality) { true }
+
+          it 'returns the instance' do
+            expect(result).to eql value
+          end
+        end
+
+        context 'with class equality' do
+          let(:class_equality) { true }
+
+          it 'returns the instance' do
+            expect(result).to eql value
+          end
+        end
+      end
     end
 
     context 'with class as a superclass' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -155,6 +155,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/active_interaction.rb
+- lib/active_interaction/backports.rb
 - lib/active_interaction/base.rb
 - lib/active_interaction/concerns/active_modelable.rb
 - lib/active_interaction/concerns/hashable.rb