blind_index 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 030c05f4653c350dbbfc5dd2f39727e44819c286865b27a18ac10c6e94fca449
-  data.tar.gz: f92d3e7d76a1b9ae65fe55bc1cf39e4a133dd633f2c620f0fa75dd0f35df8a55
+  metadata.gz: 80c561a0a96707de1176ae314d4d884e03390de9b8c4e23049d3649d7576937e
+  data.tar.gz: ea819c68b4d1a44c492799225d3250a86186cca1a355a3ab2e65a02069ae4062
 SHA512:
-  metadata.gz: aa5d431804b50709280499845fd4609b0d576328c01a9be87f5d6cffeeb0a37d9fa10eba6a0f5fa33ccae83056bb939e25b85373839ba3d232f1488c88ce6d36
-  data.tar.gz: ddec86434f1b6908763d454a7fa67507bbb0b98bf30c0038b4331dae26d314c58c4a9312b3db1ffff087aa8a3162e8e30cc4082c60f8aadccb688e78d80c4934
+  metadata.gz: 44835258443127734b6940287e1768935884c86b53d90bb5c39a9a5db372b937649f81e5a6f16d9e4605cb78b19824759b019461491176cb4b2e0bfd1330858d
+  data.tar.gz: ddeeb0f625335d49e86ab0a5ff2350a7ae8c5b74ffd0322d7504763818b05ee6c648ea0d85b395c2f197266adfcb18015b37e556d6cbee04aea32f943d0123cd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.0 (2020-09-07)
+
+- Added support for `where` with table in Active Record 5.2+
+
 ## 2.1.1 (2020-08-14)
 
 - Fixed `version` option

data/README.md

@@ -296,13 +296,13 @@ Unfortunately, blind indexes can’t be used for `LIKE`, `ILIKE`, or full-text s
 For `LIKE`, use:
 
 ```ruby
-User.find { |u| u.email.include?("value") }
+User.select { |u| u.email.include?("value") }
 ```
 
 For `ILIKE`, use:
 
 ```ruby
-User.find { |u| u.email =~ /value/i }
+User.select { |u| u.email =~ /value/i }
 ```
 
 For full-text or fuzzy searching, use a gem like [FuzzyMatch](https://github.com/seamusabshere/fuzzy_match):

data/lib/blind_index.rb

@@ -141,9 +141,13 @@ ActiveSupport.on_load(:active_record) do
   ActiveRecord::TableMetadata.prepend(BlindIndex::Extensions::TableMetadata)
   ActiveRecord::DynamicMatchers::Method.prepend(BlindIndex::Extensions::DynamicMatchers)
 
-  unless ActiveRecord::VERSION::STRING.start_with?("5.1.")
+  unless ActiveRecord::VERSION::STRING.to_f == 5.1
     ActiveRecord::Validations::UniquenessValidator.prepend(BlindIndex::Extensions::UniquenessValidator)
   end
+
+  if ActiveRecord::VERSION::STRING.to_f >= 5.2
+    ActiveRecord::PredicateBuilder.prepend(BlindIndex::Extensions::PredicateBuilder)
+  end
 end
 
 ActiveSupport.on_load(:mongoid) do

data/lib/blind_index/extensions.rb

@@ -1,22 +1,24 @@
 module BlindIndex
   module Extensions
     module TableMetadata
-      def resolve_column_aliases(hash)
-        new_hash = super
-        if has_blind_indexes?
-          hash.each do |key, _|
-            if key.respond_to?(:to_sym) && (bi = klass.blind_indexes[key.to_sym]) && !new_hash[key].is_a?(ActiveRecord::StatementCache::Substitute)
-              value = new_hash.delete(key)
-              new_hash[bi[:bidx_attribute]] =
-                if value.is_a?(Array)
-                  value.map { |v| BlindIndex.generate_bidx(v, **bi) }
-                else
-                  BlindIndex.generate_bidx(value, **bi)
-                end
+      if ActiveRecord::VERSION::STRING.to_f < 5.2
+        def resolve_column_aliases(hash)
+          new_hash = super
+          if has_blind_indexes?
+            hash.each_key do |key|
+              if key.respond_to?(:to_sym) && (bi = klass.blind_indexes[key.to_sym]) && !new_hash[key].is_a?(ActiveRecord::StatementCache::Substitute)
+                value = new_hash.delete(key)
+                new_hash[bi[:bidx_attribute]] =
+                  if value.is_a?(Array)
+                    value.map { |v| BlindIndex.generate_bidx(v, **bi) }
+                  else
+                    BlindIndex.generate_bidx(value, **bi)
+                  end
+              end
             end
           end
+          new_hash
         end
-        new_hash
       end
 
       # memoize for performance
@@ -28,6 +30,23 @@ module BlindIndex
       end
     end
 
+    module PredicateBuilder
+      # https://github.com/rails/rails/commit/56f30962b84fc53b76001301fb830c1594fd377e
+      def build(attribute, value, *args)
+        if table.has_blind_indexes? && (bi = table.send(:klass).blind_indexes[attribute.name.to_sym]) && !value.is_a?(ActiveRecord::StatementCache::Substitute)
+          attribute = attribute.relation[bi[:bidx_attribute]]
+          value =
+            if value.is_a?(Array)
+              value.map { |v| BlindIndex.generate_bidx(v, **bi) }
+            else
+              BlindIndex.generate_bidx(value, **bi)
+            end
+        end
+
+        super(attribute, value, *args)
+      end
+    end
+
     module UniquenessValidator
       def validate_each(record, attribute, value)
         klass = record.class
@@ -38,7 +57,7 @@ module BlindIndex
       end
 
       # change attribute name here instead of validate_each for better error message
-      if ActiveRecord::VERSION::STRING >= "5.2"
+      if ActiveRecord::VERSION::STRING.to_f >= 5.2
         def build_relation(klass, attribute, value)
           if klass.respond_to?(:blind_indexes) && (bi = klass.blind_indexes[attribute])
             attribute = bi[:bidx_attribute]

data/lib/blind_index/version.rb

@@ -1,3 +1,3 @@
 module BlindIndex
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blind_index
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport