frozen_record 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75dfc07a86429e4dcc6a17c076aa87081a19e812b3d9b8d9722281d8a14aba9
-  data.tar.gz: a445c878d8cddaa87cb59db1213cf4099e3cbf10fa854d92fbd28669867dad4a
+  metadata.gz: 8f755e0e4bce41d9687a8b29eedad265593319156b8d086e81c355d6cdbf15dd
+  data.tar.gz: bb63057b31078536220168e6430ee0099cad053bdfd35a1a2567c054fe26e780
 SHA512:
-  metadata.gz: 54b3c787e7c0f028c8c58a2a1fb214a5b3ac0c4b8b06ac4a42d4a35526baa0c50573967a7aa7faad0921c028d19d985dda831257f2244b1ba5af56960187ced1
-  data.tar.gz: 8159f7e45d32256ab9565bbf5ff81c6685e912c57603f97b335f8c5dbb2529b4153bb0e2937e4c709da9a78d0f303f485e33daf4933aa129be9599313964ec8d
+  metadata.gz: 22929e50f2c0eec95d863222171cf81ab52531396118259ff4107240d5ce7d9828f70198b133a126bedb0f11cea7858814ab1fdabbcf31e9840aaad23cb9c614
+  data.tar.gz: 43c61d4238b44945bcd94bea89864ba0c4a06d0b53669e9a27d00ae2ba27673817ef5104c710e341c0ed286d544195f3a7615bac306c6cc8424c5afd0453a921

data/frozen_record.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.5'
 
   spec.add_runtime_dependency 'activemodel'
+  spec.add_runtime_dependency 'dedup'
+
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/frozen_record.rb

@@ -5,12 +5,13 @@ require 'set'
 require 'active_support/all'
 require 'active_model'
 
+require 'dedup'
+
 require 'frozen_record/version'
 require 'frozen_record/scope'
 require 'frozen_record/index'
 require 'frozen_record/base'
 require 'frozen_record/compact'
-require 'frozen_record/deduplication'
 
 module FrozenRecord
   RecordNotFound = Class.new(StandardError)

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'
 
@@ -51,7 +52,7 @@ module FrozenRecord
       alias_method :set_default_attributes, :default_attributes=
       private :set_default_attributes
       def default_attributes=(default_attributes)
-        set_default_attributes(Deduplication.deep_deduplicate!(default_attributes.stringify_keys))
+        set_default_attributes(Dedup.deep_intern!(default_attributes.stringify_keys))
       end
 
       alias_method :set_primary_key, :primary_key=
@@ -146,7 +147,7 @@ module FrozenRecord
         @records ||= begin
           records = backend.load(file_path)
           records.each { |r| assign_defaults!(r) }
-          records = Deduplication.deep_deduplicate!(records)
+          records = Dedup.deep_intern!(records)
           @attributes = list_attributes(records).freeze
           define_attribute_methods(@attributes.to_a)
           records = records.map { |r| load(r) }.freeze

data/lib/frozen_record/compact.rb

@@ -14,11 +14,13 @@ module FrozenRecord
         @records ||= begin
           records = backend.load(file_path)
           records.each { |r| assign_defaults!(r) }
-          records = Deduplication.deep_deduplicate!(records)
+          records = Dedup.deep_intern!(records)
           @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
 
@@ -65,7 +67,7 @@ module FrozenRecord
 
     def attributes=(attributes)
       self.class.attributes.each do |attr|
-        instance_variable_set(self.class._attributes_cache[attr], Deduplication.deep_deduplicate!(attributes[attr]))
+        instance_variable_set(self.class._attributes_cache[attr], Dedup.deep_intern!(attributes[attr]))
       end
     end
 

data/lib/frozen_record/index.rb

@@ -67,7 +67,7 @@ module FrozenRecord
     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/scope.rb

@@ -2,7 +2,7 @@
 
 module FrozenRecord
   class Scope
-    BLACKLISTED_ARRAY_METHODS = [
+    DISALLOWED_ARRAY_METHODS = [
       :compact!, :flatten!, :reject!, :reverse!, :rotate!, :map!,
       :shuffle!, :slice!, :sort!, :sort_by!, :delete_if,
       :keep_if, :pop, :shift, :delete_at, :compact
@@ -233,7 +233,7 @@ module FrozenRecord
     end
 
     def array_delegable?(method)
-      Array.method_defined?(method) && BLACKLISTED_ARRAY_METHODS.exclude?(method)
+      Array.method_defined?(method) && DISALLOWED_ARRAY_METHODS.exclude?(method)
     end
 
     def where!(criterias)

data/lib/frozen_record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dedup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,13 +132,11 @@ files:
 - lib/frozen_record/backends/yaml.rb
 - lib/frozen_record/base.rb
 - lib/frozen_record/compact.rb
-- lib/frozen_record/deduplication.rb
 - lib/frozen_record/index.rb
 - lib/frozen_record/railtie.rb
 - lib/frozen_record/scope.rb
 - lib/frozen_record/test_helper.rb
 - lib/frozen_record/version.rb
-- spec/deduplication_spec.rb
 - spec/fixtures/animals.json
 - spec/fixtures/cars.yml
 - spec/fixtures/countries.yml.erb
@@ -156,12 +168,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.2
 signing_key:
 specification_version: 4
 summary: ActiveRecord like interface to read only access and query static YAML files
 test_files:
-- spec/deduplication_spec.rb
 - spec/fixtures/animals.json
 - spec/fixtures/cars.yml
 - spec/fixtures/countries.yml.erb

data/lib/frozen_record/deduplication.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/object/duplicable'
-
-module FrozenRecord
-  module Deduplication
-    extend self
-
-    # We deduplicate data in place because it is assumed it directly
-    # comes from the parser, and won't be held by anyone.
-    #
-    # Frozen Hashes and Arrays are ignored because they are likely
-    # the result of the use of YAML anchor. Meaning we already deduplicated
-    # them.
-    if RUBY_VERSION >= '2.7'
-      def deep_deduplicate!(data)
-        case data
-        when Hash
-          return data if data.frozen?
-          data.transform_keys! { |k| deep_deduplicate!(k) }
-          data.transform_values! { |v| deep_deduplicate!(v) }
-          data.freeze
-        when Array
-          return data if data.frozen?
-          data.map! { |d| deep_deduplicate!(d) }.freeze
-        when String
-          -data
-        else
-          data.duplicable? ? data.freeze : data
-        end
-      end
-    else
-      def deep_deduplicate!(data)
-        case data
-        when Hash
-          return data if data.frozen?
-          data.transform_keys! { |k| deep_deduplicate!(k) }
-          data.transform_values! { |v| deep_deduplicate!(v) }
-          data.freeze
-        when Array
-          return data if data.frozen?
-          data.map! { |d| deep_deduplicate!(d) }.freeze
-        when String
-          # 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
-          else
-            -data
-          end
-        else
-          data.duplicable? ? data.freeze : data
-        end
-      end
-    end
-  end
-end

data/spec/deduplication_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe 'deduplication' do
-
-  it 'deduplicate string values' do
-    pending("Strings can't be deduplicated before Ruby 2.5") if RUBY_VERSION < '2.5'
-
-    records = [
-      { 'name' => 'George'.dup },
-    ]
-
-    expect(records[0]['name']).to_not equal 'George'.freeze
-    FrozenRecord::Deduplication.deep_deduplicate!(records)
-    expect(records[0]['name']).to equal 'George'.freeze
-  end
-
-  it 'handles duplicated references' do
-    # This simulates the YAML anchor behavior
-    tags = { 'foo' => 'bar' }
-    records = [
-      { 'name' => 'George', 'tags' => tags },
-      { 'name' => 'Peter', 'tags' => tags },
-    ]
-
-    expect(records[0]['tags']).to_not be_frozen
-    FrozenRecord::Deduplication.deep_deduplicate!(records)
-    expect(records[0]['tags']).to be_frozen
-    expect(records[0]['tags']).to equal records[1]['tags']
-  end
-
-end