frozen_record 0.19.2 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 501a982beb96747b9e2dfd6250e9685e73ffbb2932cb5fddb84b7b44f778c3dd
-  data.tar.gz: 9396c1416991e6a932d8a16fa430471c531281be58e8547af8a1900ebf68d4cc
+  metadata.gz: 4c98f13b693b4c7bceae48a308722c3681a678033855f40995a10fd82c0faee8
+  data.tar.gz: ff4ef784946b6fc9f067caf8e26d50433c3c396716ead1c953dd324528861ab2
 SHA512:
-  metadata.gz: be0b8317169536a900a01769866f5b7b181974ed24dfd812abcfbd5b332324da1d8d9870c80c89af50bb3fa1565342a5e1229b198b8b6fc141d93c237566a152
-  data.tar.gz: 3a4c490e06150033c098905817842e6c2cc9b2719262f28f53e063de34815236910e18da5cf3e9848f4aed1e1db2e738d2b33dcce90f429fa1cdba2840cf4556
+  metadata.gz: e25090babf81d5ffa18a26acecf5af68d3424866b848508838ded880196d2178f994ce586be9bee8d63db71b3c84159ed2b4fac2c7e90f26414b9fbff4c69598
+  data.tar.gz: 384749f211db239a1d3964c16d5c23d4af4261ee052d6c0fa16f15f0d6a0ce5710df898b1f4e290c9cfa77c553d214668ab383ca33b09fbb82a03266db7a0324

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

@@ -52,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=
@@ -147,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/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
@@ -227,13 +227,14 @@ module FrozenRecord
         super
       end
     end
+    ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
 
     def delegate_to_class(*args, &block)
       scoping { @klass.public_send(*args, &block) }
     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.2'
+  VERSION = '0.20.1'
 end

data/spec/scope_spec.rb

@@ -193,6 +193,11 @@ describe 'querying' do
       expect(countries.length).to be == 0
     end
 
+    it 'is chainable with methods of the form `def method(*args, **kargs)' do
+      countries = Country.republics.continent_and_capital('Europe', capital: 'Paris')
+      expect(countries.length).to be == 1
+    end
+
     it 'can be used with arrays' do
       countries = Country.where(id: [1,2])
       expect(countries.length).to be == 2

data/spec/support/country.rb

@@ -12,6 +12,10 @@ class Country < FrozenRecord::Base
     where(nato: true)
   end
 
+  def self.continent_and_capital(continent, capital:)
+    where(continent: continent, capital: capital)
+  end
+
   def reverse_name
     name.reverse
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.20.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-10-19 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.0.2
+rubygems_version: 3.1.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