frozen_record 0.25.5 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8fc155c1a350f49fbc79e245cc768722c9880cd0010b7829a33aea0ac55ab69
-  data.tar.gz: a16dde142d53022fb3b76b8262326d774342f4158b7d1ec018bf0a4879d41d77
+  metadata.gz: e162699e1ec4c32223be26afd36c1222bedeea90b8d0f26e05407641c9f01ccd
+  data.tar.gz: f4f6dcb51344bf99558e278a746e4ae5527355ed8771c7be26186af2cab630a1
 SHA512:
-  metadata.gz: 4a315f98d4d6c79dc0ac6146715fdee499d383fc9d5e550bbdc7278655a19da2b744923ed41f7f445fc4175f575f6ea1330e77381edfe77fa5dbd4152e6446bb
-  data.tar.gz: d9e7d61a94c6504ecb0c3fc4e298487bfa30a5d9fd7b527657fc51259246aa23030567f676d2ff06595dca1b1de7a78281bb2380b19ae23145ccd04397dd0799
+  metadata.gz: 594beed9888fc9379882815828f1d85a0941b143b03d177662fd02a8460867135003eeeb1391ad473f393c78f299c9e0c3ed45c9dcee88dee7bc7940ce3662c4
+  data.tar.gz: bcc049e4643b24bca1c98f8947a924c97f829a2a66798fbe798cbeba744d9934c0b81cbb2bb5c29f686d8d6af723f99299312d56e7e484524021c57613d02f4d

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
         minimal: [ false, true ]
     name: Ruby ${{ matrix.ruby }} tests, minimal=${{ matrix.minimal }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Unreleased
 
+- Fix `Model.find_by` fastpath raising an error when called before records are loaded.
+
+# v0.26.1
+
+- Optimized single attribute lookup.
+
+# v0.26.0
+
+- Drop dependency on `dedup` gem.
+
 # v0.25.5
 
 - `FrozenRecord::Base#==` now returns `false` if the primary key is `nil` (to match the `ActiveRecord::Base` implementation)

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://secure.travis-ci.org/byroot/frozen_record.svg)](http://travis-ci.org/byroot/frozen_record)
 [![Gem Version](https://badge.fury.io/rb/frozen_record.svg)](http://badge.fury.io/rb/frozen_record)
 
-Activec Record-like interface for **read only** access to static data files of reasonable size.
+Active Record-like interface for **read only** access to static data files of reasonable size.
 
 ## Installation
 
@@ -156,7 +156,7 @@ The primary key isn't indexed by default.
 
 ## Limitations
 
-Frozen Record is not meant to operate or large unindexed datasets.
+Frozen Record is not meant to operate on large unindexed datasets.
 
 To ensure that it doesn't happen by accident, you can set `FrozenRecord::Base.max_records_scan = 500` (or whatever limit makes sense to you), in your development and test environments.
 This setting will cause Frozen Record to raise an error if it has to scan more than `max_records_scan` records. This property can also be set on a per model basis.

data/benchmark/querying

@@ -23,6 +23,13 @@ class LargeCountry < Country
   end
 end
 
+LargeCountry.eager_load!
+
+puts "=== unique index lookup ==="
+Benchmark.ips do |x|
+  x.report('pk lookup') { LargeCountry.find_by(name: "Canada1") }
+end
+
 puts "=== simple scalar match ==="
 Benchmark.ips do |x|
   x.report('simple') { LargeCountry.nato.size }

data/frozen_record.gemspec

@@ -20,7 +20,6 @@ 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 'rake'
   spec.add_development_dependency 'rspec'

data/lib/frozen_record/backends/json.rb

@@ -19,16 +19,16 @@ module FrozenRecord
 
         if supports_freeze
           def load(file_path)
-            JSON.load_file(file_path, freeze: true) || Dedup::EMPTY_ARRAY
+            JSON.load_file(file_path, freeze: true) || [].freeze
           end
         else
           def load(file_path)
-            Dedup.deep_intern!(JSON.load_file(file_path) || Dedup::EMPTY_ARRAY)
+            JSON.load_file(file_path) || [].freeze
           end
         end
       else
         def load(file_path)
-          Dedup.deep_intern!(JSON.parse(File.read(file_path)) || Dedup::EMPTY_ARRAY)
+          JSON.parse(File.read(file_path)) || [].freeze
         end
       end
     end

data/lib/frozen_record/backends/yaml.rb

@@ -56,27 +56,27 @@ module FrozenRecord
 
       if YAML.respond_to?(:unsafe_load_file)
         def load_file(path)
-          YAML.unsafe_load_file(path, freeze: true) || Dedup::EMPTY_ARRAY
+          YAML.unsafe_load_file(path, freeze: true) || [].freeze
         end
 
         def load_string(yaml)
-          YAML.unsafe_load(yaml, freeze: true) || Dedup::EMPTY_ARRAY
+          YAML.unsafe_load(yaml, freeze: true) || [].freeze
         end
       elsif supports_freeze
         def load_file(path)
-          YAML.load_file(path, freeze: true) || Dedup::EMPTY_ARRAY
+          YAML.load_file(path, freeze: true) || [].freeze
         end
 
         def load_string(yaml)
-          YAML.load(yaml, freeze: true) || Dedup::EMPTY_ARRAY
+          YAML.load(yaml, freeze: true) || [].freeze
         end
       else
         def load_file(path)
-          Dedup.deep_intern!(YAML.load_file(path) || Dedup::EMPTY_ARRAY)
+          YAML.load_file(path) || [].freeze
         end
 
         def load_string(yaml)
-          Dedup.deep_intern!(YAML.load(yaml) || Dedup::EMPTY_ARRAY)
+          YAML.load(yaml) || [].freeze
         end
       end
     end

data/lib/frozen_record/base.rb

@@ -69,7 +69,7 @@ module FrozenRecord
       alias_method :set_default_attributes, :default_attributes=
       private :set_default_attributes
       def default_attributes=(default_attributes)
-        set_default_attributes(Dedup.deep_intern!(default_attributes.transform_keys(&:to_s)))
+        set_default_attributes(default_attributes.transform_keys(&:to_s))
       end
 
       alias_method :set_primary_key, :primary_key=
@@ -107,7 +107,7 @@ module FrozenRecord
         store[:scope] = scope
       end
 
-      delegate :each, :find, :find_each, :find_by_id, :find_by, :find_by!, :where, :first, :first!, :last, :last!,
+      delegate :each, :find_each, :where, :first, :first!, :last, :last!,
                :pluck, :ids, :order, :limit, :offset, :minimum, :maximum, :average, :sum, :count,
                to: :current_scope
 
@@ -123,6 +123,32 @@ module FrozenRecord
         end
       end
 
+      def find_by_id(id)
+        find_by(primary_key => id)
+      end
+
+      def find(id)
+        raise RecordNotFound, "Can't lookup record without ID" unless id
+        find_by(primary_key => id) or raise RecordNotFound, "Couldn't find a record with ID = #{id.inspect}"
+      end
+
+      def find_by(criterias)
+        if criterias.size == 1
+          criterias.each do |attribute, value|
+            attribute = attribute.to_s
+            if index = index_definitions[attribute]
+              load_records
+              return index.lookup(value).first
+            end
+          end
+        end
+        current_scope.find_by(criterias)
+      end
+
+      def find_by!(criterias)
+        find_by(criterias) or raise RecordNotFound, "No record matched"
+      end
+
       def add_index(attribute, unique: false)
         index = unique ? UniqueIndex.new(self, attribute) : Index.new(self, attribute)
         self.index_definitions = index_definitions.merge(index.attribute => index).freeze
@@ -156,10 +182,15 @@ module FrozenRecord
         load_records
       end
 
+      def unload!
+        @records = nil
+        index_definitions.values.each(&:reset)
+        undefine_attribute_methods
+      end
+
       def load_records(force: false)
         if force || (auto_reloading && file_changed?)
-          @records = nil
-          undefine_attribute_methods
+          unload!
         end
 
         @records ||= begin

data/lib/frozen_record/compact.rb

@@ -62,7 +62,7 @@ module FrozenRecord
 
     def attributes=(attributes)
       self.class.attributes.each do |attr|
-        instance_variable_set(self.class._attributes_cache[attr], Dedup.deep_intern!(attributes[attr]))
+        instance_variable_set(self.class._attributes_cache[attr], attributes[attr])
       end
     end
 

data/lib/frozen_record/minimal.rb

@@ -4,8 +4,6 @@ require 'yaml'
 require 'set'
 require 'active_model'
 
-require 'dedup'
-
 require 'frozen_record/version'
 require 'frozen_record/scope'
 require 'frozen_record/index'

data/lib/frozen_record/scope.rb

@@ -34,12 +34,17 @@ module FrozenRecord
     end
 
     def find_by_id(id)
-      matching_records.find { |r| r.id == id }
+      find_by(@klass.primary_key => id)
     end
 
     def find(id)
       raise RecordNotFound, "Can't lookup record without ID" unless id
-      find_by_id(id) or raise RecordNotFound, "Couldn't find a record with ID = #{id.inspect}"
+
+      scope = self
+      if @limit || @offset
+        scope = limit(nil).offset(nil)
+      end
+      scope.find_by_id(id) or raise RecordNotFound, "Couldn't find a record with ID = #{id.inspect}"
     end
 
     def find_by(criterias)

data/lib/frozen_record/version.rb

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

data/spec/scope_spec.rb

@@ -101,7 +101,6 @@ describe 'querying' do
       country = Country.find_by_id(42)
       expect(country).to be_nil
     end
-
   end
 
   describe '.find_by' do
@@ -116,6 +115,11 @@ describe 'querying' do
       expect(country).to be_nil
     end
 
+    it 'load records' do
+      Country.unload!
+      country = Country.find_by(name: 'France')
+      expect(country.name).to be == 'France'
+    end
   end
 
   describe '.find_by!' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.25.5
+  version: 0.26.2
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -24,20 +24,6 @@ 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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -137,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: ActiveRecord like interface to read only access and query static YAML files