frozen_record 0.25.4 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45e9d1a344670234462c22c5d74da8b8e1bf4b726b14b447d1abe646632aae26
-  data.tar.gz: 96c4daa09b3b7b46f332e082ff94f91683d5da82b378bf32398bcbc88f4c4c7c
+  metadata.gz: 4e4a597e4419873da69776c887c5ef35c812f785493cd9597d3d3ced891578ab
+  data.tar.gz: d46b86085ceeee261b39a281aab1c62a2551e872ad1f4696e8a7325b7cfa9a7a
 SHA512:
-  metadata.gz: a78872e27a9341f152867b4ee1d281c4512cff485e8c07fd343abab52fd71bb461e0c98c221460e3bce95bf63b7eaff49dd66d1c9166ca4f357eccd65531dcf8
-  data.tar.gz: 3b05ceacab2a957f44818338b2b71555d65baa66dd6cf1e5ee55b21cc0e6c8eb307d4c3ea8af9e7d00bc09ea0d3ce0712e8598225e9f952c0422cb2ddad1694c
+  metadata.gz: 8e68a5dfb1d888de4f6dc72bb42ffdc1c08af87229b7bd0dcf107d1da9b48ef5b948adea5652b132cb497a1a8c15b513aa7ba8beea7c863b06f19de14ae02865
+  data.tar.gz: f787b5072efd3997fb41942c1d9b6014ee872d6faec12a4c5a77ef489a7039ed980987bbf4102ed7d9c5cd2b296e49c1bd6a25f578559969d200d875d6cdf877

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,17 @@
 # Unreleased
 
+# 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)
+
 # v0.25.4
 
 - Minor Ruby 3.2 compatiblity fix (regarding `ruby2_keywords`).

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,31 @@ 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]
+              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
@@ -252,7 +277,7 @@ module FrozenRecord
     alias_method :attribute, :[]
 
     def ==(other)
-      super || other.is_a?(self.class) && other.id == id
+      super || other.is_a?(self.class) && !id.nil? && other.id == id
     end
 
     def persisted?

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.4'
+  VERSION = '0.26.1'
 end

data/spec/frozen_record_spec.rb

@@ -149,6 +149,13 @@ RSpec.shared_examples 'main' do
       expect(country).to be == second_country
     end
 
+    it 'returns false if both instances are from the same class and their ids are nil' do
+      country = country_model.new(id: nil)
+      second_country = country_model.new(id: nil)
+
+      expect(country).to_not be == second_country
+    end
+
     it 'returns false if both instances are not from the same class' do
       country = country_model.first
       car = car_model.new(id: country.id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.25.4
+  version: 0.26.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-08-11 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.3.7
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: ActiveRecord like interface to read only access and query static YAML files