active_interaction 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc5f59cdd588429a58556cea7b70aa0c43a6a13c523a682cac266cfc7ab76a1
-  data.tar.gz: 9a58db1735b436ae91a70baf9c2eab9ef4851a20a9e51c05c6f243af6e3c282b
+  metadata.gz: 65047712d1df9c67700202a27f83054c30fccbdf3d7bf7e0478c01e5bea07fc8
+  data.tar.gz: b39bb6c7d8784cf842eb266e3955fdbc1082c5a4f96c30bdcbdd10074294ea6d
 SHA512:
-  metadata.gz: c78b1f82d8593a238a2076f7351146e51079d163d963cc830d9e086bbc82bd791fbc95527d4fc829e3c38039bb77ce06fefe82520f5b6f2148a64384a8e3a339
-  data.tar.gz: 362a8b86512c8ef05d9582a377000e06e2b8b0855c112458020911fa77477c3c98cd10555e81d259cfc767f79c1eb8b03e9ec12124cfca38c552208006e1a70a
+  metadata.gz: 5ca04e342b3b82a29724e113600ca12bebdc303de3c66c51299fc490cd8686e3a062c77498ccd53e33f02a9dc0e05dc5a44ee26be911af6e59bfcca1b2d41d65
+  data.tar.gz: a09744ecbd57a5c69ee845235942c2f2063bfb70f509a9bd6384f45690a35218e6c48c632b2388701f910746614b43b040803329e5310e24ea291267eddd3234

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [4.0.1][] (2021-05-26)
+
+## Fix
+
+- Fix regression of filter name relaxing.
+- [#495][] - Fix time filter ignoring time zones
+
 # [4.0.0][] (2021-01-10)
 
 ## Changed

data/lib/active_interaction/filters/time_filter.rb

@@ -39,9 +39,17 @@ module ActiveInteraction
       Time.respond_to?(:zone) && !Time.zone.nil?
     end
 
+    def klass
+      if time_with_zone?
+        Time.zone
+      else
+        super
+      end
+    end
+
     def klasses
       if time_with_zone?
-        super + [Time.zone.class]
+        [Time.zone.at(0).class, Time]
       else
         super
       end

data/lib/active_interaction/inputs.rb

@@ -18,8 +18,14 @@ module ActiveInteraction
       def reserved?(name)
         name.to_s.start_with?('_interaction_') ||
           name == :syscall ||
-          Base.method_defined?(name) ||
-          Base.private_method_defined?(name)
+          (
+            Base.method_defined?(name) &&
+            !Object.method_defined?(name)
+          ) ||
+          (
+            Base.private_method_defined?(name) &&
+            !Object.private_method_defined?(name)
+          )
       end
 
       def process(inputs)

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/concerns/hashable_spec.rb

@@ -25,7 +25,7 @@ describe ActiveInteraction::Hashable do
       end
 
       context 'with a block' do
-        let(:block) { proc {} } # rubocop:disable Lint/EmptyBlock
+        let(:block) { proc {} }
         let(:hash) { subject.hash(*arguments, &block) }
 
         it 'calls method_missing' do

data/spec/active_interaction/integration/time_interaction_spec.rb

@@ -12,11 +12,11 @@ TimeWithZone = Class.new do
   end
 
   def at(*args)
-    Time.at(*args)
+    TimeWithZone.new(Time.at(*args) + 1)
   end
 
   def parse(*args)
-    Time.parse(*args)
+    TimeWithZone.new(Time.parse(*args) + 1)
   rescue ArgumentError
     nil
   end
@@ -43,7 +43,7 @@ describe TimeInteraction do
       let(:a) { rand(1 << 16) }
 
       it 'returns the correct value' do
-        expect(result[:a]).to eq Time.zone.at(a)
+        expect(result[:a]).to eq TimeWithZone.new(0).at(a)
       end
     end
 
@@ -51,7 +51,7 @@ describe TimeInteraction do
       let(:a) { '2011-12-13T14:15:16Z' }
 
       it 'returns the correct value' do
-        expect(result[:a]).to eq Time.zone.parse(a)
+        expect(result[:a]).to eq TimeWithZone.new(0).parse(a)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -247,7 +247,6 @@ files:
 - lib/active_interaction/locale/it.yml
 - lib/active_interaction/locale/ja.yml
 - lib/active_interaction/locale/pt-BR.yml
-- lib/active_interaction/modules/input_processor.rb
 - lib/active_interaction/modules/validation.rb
 - lib/active_interaction/version.rb
 - spec/active_interaction/base_spec.rb

data/lib/active_interaction/modules/input_processor.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveInteraction
-  # Groups inputs ending in "(*N*i)" into {GroupedInput}.
-  #
-  # @private
-  module InputProcessor
-    class << self
-      GROUPED_INPUT_PATTERN = /\A(.+)\((\d+)i\)\z/.freeze
-      private_constant :GROUPED_INPUT_PATTERN
-
-      # Checking `syscall` is the result of what appears to be a bug in Ruby.
-      # https://bugs.ruby-lang.org/issues/15597
-      def reserved?(name)
-        name.to_s.start_with?('_interaction_') ||
-          name == :syscall ||
-          (
-            Base.method_defined?(name) &&
-            !Object.method_defined?(name)
-          ) ||
-          (
-            Base.private_method_defined?(name) &&
-            !Object.private_method_defined?(name)
-          )
-      end
-
-      def process(inputs)
-        inputs.stringify_keys.sort.each_with_object({}) do |(k, v), h|
-          next if reserved?(k)
-
-          if (match = GROUPED_INPUT_PATTERN.match(k))
-            assign_to_group!(h, *match.captures, v)
-          else
-            h[k.to_sym] = v
-          end
-        end
-      end
-
-      private
-
-      def assign_to_group!(inputs, key, index, value)
-        key = key.to_sym
-
-        inputs[key] = GroupedInput.new unless inputs[key].is_a?(GroupedInput)
-        inputs[key][index] = value
-      end
-    end
-  end
-end