frozen_record 0.19.0 → 0.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1006ddbdc9f21010a819e6085800b05fc549c9b513c75431b329f20d46e055a
-  data.tar.gz: b3f65c04430375bf7fe2be7ecd233515e9a8b4a1dc7ebc29a430fa4934fad8be
+  metadata.gz: 9a5344be7378de1fb30f456b1a44b455dce2cec5d5db848058e8f3a137eb0ae7
+  data.tar.gz: a8ed04973c5c1edd7600d180c8fc827bdb9312ec0a7e602d408373eb86ff2749
 SHA512:
-  metadata.gz: db63b827feb659e1228812947551db15ef777b33c71b38d3d9c77aa304d148b2e23eaaa6075e3dda90bd759abd9774635030bd01947b6d7b61fa01a53114601c
-  data.tar.gz: a11f92b0a5ff35033c348b69735821969f33a93fdca861f58b3dd4c5a58263da643ce6efe6c9f7f473e754615e91c94712dce7901f7d49b2893bd3a808b9bc7b
+  metadata.gz: 8ec04aa72dfbee08525e8f4d6bea2413e7c84142f0f3bb8f6b8dc57538be10dcedfb07a7fd12f0c2992f292fb91ea492c8b6a21ab431470de551647b218b5dc2
+  data.tar.gz: 03ac7a0e64dd6caa6f519611096130c4bb33ac77467792b4c48d9a368f31abb91a22ed4a0d370e94e76b1a63b91aaec06b3bee1d38fcc9761edc47ac4beabe16

data/lib/frozen_record/base.rb

@@ -21,7 +21,8 @@ module FrozenRecord
     FALSY_VALUES = [false, nil, 0, -''].to_set
 
     class_attribute :base_path, :primary_key, :backend, :auto_reloading, :default_attributes, instance_accessor: false
-    class_attribute :index_definitions, instance_accessor: false, default: {}.freeze
+    class_attribute :index_definitions, instance_accessor: false
+    self.index_definitions = {}.freeze
 
     self.primary_key = 'id'
 

data/lib/frozen_record/compact.rb

@@ -18,7 +18,9 @@ module FrozenRecord
           @attributes = list_attributes(records).freeze
           build_attributes_cache
           define_attribute_methods(@attributes.to_a)
-          records.map { |r| load(r) }.freeze
+          records = records.map { |r| load(r) }.freeze
+          index_definitions.values.each { |index| index.build(records) }
+          records
         end
       end
 

data/lib/frozen_record/deduplication.rb

@@ -24,7 +24,7 @@ module FrozenRecord
           return data if data.frozen?
           data.map! { |d| deep_deduplicate!(d) }.freeze
         when String
-          -data
+          -data.freeze
         else
           data.duplicable? ? data.freeze : data
         end
@@ -44,9 +44,9 @@ module FrozenRecord
           # String#-@ doesn't deduplicate the string if it's tainted.
           # So in such case we need to untaint it first.
           if data.tainted?
-            -(+data).untaint
+            -(+data).untaint.freeze
           else
-            -data
+            -data.freeze
           end
         else
           data.duplicable? ? data.freeze : data

data/lib/frozen_record/index.rb

@@ -20,6 +20,19 @@ module FrozenRecord
     end
 
     def query(value)
+      case value
+      when Array, Range
+        lookup_multi(value)
+      else
+        lookup(value)
+      end
+    end
+
+    def lookup_multi(values)
+      values.flat_map { |v| lookup(v) }
+    end
+
+    def lookup(value)
       @index.fetch(value, EMPTY_ARRAY)
     end
 
@@ -42,13 +55,19 @@ module FrozenRecord
       true
     end
 
-    def query(value)
+    def lookup_multi(values)
+      results = @index.values_at(*values)
+      results.compact!
+      results
+    end
+
+    def lookup(value)
       record = @index[value]
       record ? [record] : EMPTY_ARRAY
     end
 
     def build(records)
-      @index = records.to_h { |r| [r[attribute], r] }
+      @index = records.each_with_object({}) { |r, index| index[r[attribute]] = r }
       if @index.size != records.size
         raise AttributeNonUnique, "#{model}##{attribute.inspect} is not unique."
       end

data/lib/frozen_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FrozenRecord
-  VERSION = '0.19.0'
+  VERSION = '0.19.5'
 end

data/spec/scope_spec.rb

@@ -207,6 +207,14 @@ describe 'querying' do
       countries = Country.where(name: 'France', continent: 'Europe')
       expect(countries.length).to be == 1
     end
+
+    it 'can use indices with inclusion query' do
+      countries = Country.where(continent: ['Europe', 'North America'])
+      expect(countries.length).to be == 3
+
+      countries = Country.where(name: ['France', 'Canada'])
+      expect(countries.length).to be == 2
+    end
   end
 
   describe '.where.not' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.5
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel