frozen_record 0.24.1 → 0.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b99597156ea028c8d0cbd66024b901d55a5e26679030266367caa8ec81353946
-  data.tar.gz: 12e4756a7a49d32010298b4320f447d9b18afd76efe969a1f3a32e7d890592de
+  metadata.gz: e254d236ad017c1f92834767dfb9f8daa686965ff6d3328543e6707be703280e
+  data.tar.gz: ea51bf7bdbae4103e9cb43bbe204e276efb9dea1e4cc6f36e11edac9977a6175
 SHA512:
-  metadata.gz: fcb9c7aa9c820dfa50b431d36bef98d39488be55fa034edaed7aefde063a919134af0d945e3233ca5a6efbc3c3798245a5ea5741b5ae1f4d8dad1b0189b1bf7e
-  data.tar.gz: df184ce79d274a9fe8a6fcb70c9548bb18f17c1e8da143c88d2ab9f2aedec746314a21ee2e591e191fd248f8d5e332dfdcc379f316d09fcb070a5284724f43ad
+  metadata.gz: ca56d88a30cd1636ddeaed686c056a0352d295f3f0441c2b0a4861b5dcac7786497f140dbc351d0d332e862a03173ca5ace48fe880c1e1c934216034bfaa211a
+  data.tar.gz: 7522b566accc6d996eb79bb574f977ff82913e6d678b153cb7f0b58fd36dc0db7572611c769ac416c354673900412362f71da85573f3ea2cbc97675e1bbae1cb

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Unreleased
 
+# v0.25.2
+
+- Fix FrozenRecord.ignore_max_records_scan not applying
+
+# v0.25.1
+
+- More reliable way to disable max_records_scan checks when loading records.
+
+# v0.25.0
+
+- Disable max_records_scan checks when loading records.
+- Add `FrozenRecord::Base.with_max_record_scan` for more easily allowing larger amount in specific tests.
+
 # v0.24.1
 
 - Fix index selection not applying some restrictions.

data/lib/frozen_record/base.rb

@@ -6,6 +6,19 @@ require 'frozen_record/backends'
 module FrozenRecord
   SlowQuery = Class.new(StandardError)
 
+  class << self
+    attr_accessor :enforce_max_records_scan
+
+    def ignore_max_records_scan
+      previous = enforce_max_records_scan
+      self.enforce_max_records_scan = false
+      yield
+    ensure
+      self.enforce_max_records_scan = previous
+    end
+  end
+  @enforce_max_records_scan = true
+
   class Base
     extend ActiveSupport::DescendantsTracker
     extend ActiveModel::Naming
@@ -45,6 +58,14 @@ module FrozenRecord
     end
 
     class << self
+      def with_max_records_scan(value)
+        previous_max_records_scan = max_records_scan
+        self.max_records_scan = value
+        yield
+      ensure
+        self.max_records_scan = previous_max_records_scan
+      end
+
       alias_method :set_default_attributes, :default_attributes=
       private :set_default_attributes
       def default_attributes=(default_attributes)
@@ -148,7 +169,7 @@ module FrozenRecord
           end
           @attributes = list_attributes(records).freeze
           define_attribute_methods(@attributes.to_a)
-          records = records.map { |r| load(r) }.freeze
+          records = FrozenRecord.ignore_max_records_scan { records.map { |r| load(r) }.freeze }
           index_definitions.values.each { |index| index.build(records) }
           records
         end

data/lib/frozen_record/scope.rb

@@ -202,7 +202,7 @@ module FrozenRecord
         end
       end
 
-      if @klass.max_records_scan && records.size > @klass.max_records_scan
+      if FrozenRecord.enforce_max_records_scan && @klass.max_records_scan && records.size > @klass.max_records_scan
         raise SlowQuery, "Scanning #{records.size} records is too slow, the allowed maximum is #{@klass.max_records_scan}. Try to find a better index or consider an alternative storage"
       end
 

data/lib/frozen_record/version.rb

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

data/spec/fixtures/prices.yml.erb

@@ -0,0 +1,13 @@
+<% 100.times.map { |i| "plan_#{i}"}.each do |plan_name| %>
+  <% ["base", "online", "retail"].each do |type| %>
+    <% [nil, "USD", "EUR", "GBP", "JPY"].each do |currency| %>
+     <% ["monthly", "annual", "biennial", "triennial"].each do |period| %>
+- plan_name: <%= plan_name %>
+  type: <%= type %>
+  period: <%= period %>
+  currency: <%= currency %>
+  amount: 10.0
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/spec/scope_spec.rb

@@ -476,17 +476,28 @@ describe 'querying' do
 
   context 'when max_records_scan is set' do
 
-    around :each do |example|
-      FrozenRecord::Base.max_records_scan = 1
-      example.run
-      FrozenRecord::Base.max_records_scan = nil
-    end
-
     it 'raises on slow queries' do
       expect {
-        Country.where(king: "Louis").to_a
+        FrozenRecord::Base.with_max_records_scan(1) do
+          Country.where(king: "Louis").to_a
+        end
       }.to raise_error(FrozenRecord::SlowQuery)
     end
 
+    it 'is accurate' do
+      FrozenRecord::Base.with_max_records_scan(60) do
+        expect(Price.count).to be == 6_000
+
+        Price.where(plan_name: "plan_24", currency: [nil, "EUR"], period: "monthly", type: "base").each do |price|
+          expect(price.plan_name).to be == "plan_24"
+          unless price.currency.nil?
+            expect(price.currency).to be  == "EUR"
+          end
+          expect(price.period).to be == "monthly"
+          expect(price.type).to be == "base"
+        end
+      end
+    end
+
   end
 end

data/spec/support/price.rb

@@ -0,0 +1,13 @@
+class Price < FrozenRecord::Base
+  add_index :plan_name
+  add_index :currency
+end
+
+module Compact
+  class Price < ::Price
+    include FrozenRecord::Compact
+    def self.file_path
+      superclass.file_path
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.2
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -105,6 +105,7 @@ files:
 - spec/fixtures/cars.yml
 - spec/fixtures/continents.yml.erb
 - spec/fixtures/countries.yml.erb
+- spec/fixtures/prices.yml.erb
 - spec/fixtures/test_helper/continents.yml.erb
 - spec/fixtures/test_helper/countries.yml.erb
 - spec/frozen_record_spec.rb
@@ -115,6 +116,7 @@ files:
 - spec/support/car.rb
 - spec/support/continent.rb
 - spec/support/country.rb
+- spec/support/price.rb
 - spec/test_helper_spec.rb
 homepage: https://github.com/byroot/frozen_record
 licenses:
@@ -144,6 +146,7 @@ test_files:
 - spec/fixtures/cars.yml
 - spec/fixtures/continents.yml.erb
 - spec/fixtures/countries.yml.erb
+- spec/fixtures/prices.yml.erb
 - spec/fixtures/test_helper/continents.yml.erb
 - spec/fixtures/test_helper/countries.yml.erb
 - spec/frozen_record_spec.rb
@@ -154,4 +157,5 @@ test_files:
 - spec/support/car.rb
 - spec/support/continent.rb
 - spec/support/country.rb
+- spec/support/price.rb
 - spec/test_helper_spec.rb