activerecord_any_of 2.0.1 → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5ab240782530ddad6e3dd50748a79a0a4a924d856db8b116b41f1e88ccd82b31
4
- data.tar.gz: 32063f28c9e58cb7ea8e1c75632321903ffa1cf2a84867953e3f6453908d7570
3
+ metadata.gz: 92f4fcfc4f4e943285de5882c8133e38d44b4decea581d2b0685c4133626f254
4
+ data.tar.gz: a64bf9c0d9e3e65555af122a46d764024df99288c1d6bf096ef0d1ee4b099bd4
5
5
  SHA512:
6
- metadata.gz: e0539ca1b4224eb879b000ad86dc650a2f3bb9f7d737ece3e3d7c728540a185ca0aef0332e09b6e6ed377f37dd21357353f12c32f8f536a6c451bf3446b1da94
7
- data.tar.gz: 4e14ceda1dbf47a56b07ece910000e9fff1d9400bd147493878a70de0247b0733bc4e5db8bb6beea2d76ae43f32493375e3569aef5fcac270655f9399e46abba
6
+ metadata.gz: 02d35b9440b45546546a6daa1f08aa2973d8000fbc906d4df9f670cb554bc28e2c5d696b42e096106675704aa951251997c426e7fb2a1bca5deddfa462885d20
7
+ data.tar.gz: f9d2faab578bc6ff582a352d79d05feea0402707cb7f50606b32e16361b229167fadf1bb194bc1ad573e38c56fb4f1ff13e07214206035d979bca2f93aa37b6c
@@ -80,15 +80,26 @@ module ActiverecordAnyOf
80
80
  end
81
81
  end
82
82
 
83
+ def values_for(query)
84
+ return unless query.respond_to?(:right)
85
+
86
+ if query.right.is_a?(Array)
87
+ values = query.right
88
+ values.map!(&:value) unless IS_RAILS_6
89
+ values
90
+ else
91
+ return unless query.right.respond_to?(:value)
92
+
93
+ query.right.value
94
+ end
95
+ end
96
+
83
97
  def queries_bind_values
84
98
  queries.map do |query|
85
99
  if query.respond_to?(:children)
86
- map_multiple_bind_values(query)
100
+ query.children.map { |c| values_for(c) }
87
101
  else
88
- next unless query.respond_to?(:right)
89
- next unless query.right.respond_to?(:value)
90
-
91
- query.right.value
102
+ values_for(query)
92
103
  end
93
104
  end.flatten.compact
94
105
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ActiverecordAnyOf
4
- VERSION = '2.0.1'
4
+ VERSION = '2.0.2'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activerecord_any_of
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 2.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Olivier El Mekki
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-06-30 00:00:00.000000000 Z
11
+ date: 2023-07-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord