ams_lazy_relationships 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e456a9f3d1ebd29b3ed4fe59af5bf075581657749f7a0c0b8ad95d720b5ab225
-  data.tar.gz: 8a2ccf2836ceba847cba01e6524a3f66ec5fcbdcb66f25ab28eb65a6b8042cdd
+  metadata.gz: f1bd7477000acf86df431b18cf326a86424d448ce14cfe042ae4e676fdddb09a
+  data.tar.gz: b9a4939240fa888c0c0e3cd6a17d3fec5acb90a8007cfe435adf5f694f518376
 SHA512:
-  metadata.gz: 760ff1224565b3f5249d044726deb3bd226cf23766c073fbce43fe7c3c24ae241a01a63e88fa79fa561d570389cd1a848113275daf36ad9ec9965d1715203740
-  data.tar.gz: 77c0fb34233ffeb48526ae020f0ca8ffc28f84a2d630004f3566e0b6798a7631fb2974c55623305272ee3f21771f3f74efbe5fc00e1c02b561346deff3c77a3f
+  metadata.gz: fc0fee20d57d9c19627118d5592daf52aaa69547cbb517be838ba317f475b41df076c5f12ee4be75f3e0791a8adab67315ddd3f232a5e57969ab225573e7c819
+  data.tar.gz: 60ac478470ed1ad82bcdd72b94c470d0f6456370b97c9c77f11a6835cc36ff3b2068c7fc71de279d1e559bea2b191a4f0dd73050b159eec9083113d5c4f4dc6d

data/.travis.yml

@@ -13,6 +13,8 @@ gemfile:
   - gemfiles/ams_0.10.10.gemfile
   - gemfiles/batch_loader_1.gemfile
   - gemfiles/batch_loader_2.gemfile
+  - gemfiles/rails_6.gemfile
+  - gemfiles/rails_7.gemfile
 cache: bundler
 rvm:
   - 2.5.3

data/Appraisals

@@ -29,3 +29,11 @@ end
 appraise "batch-loader-2" do
   gem "batch-loader", "~> 2"
 end
+
+appraise "rails-6" do
+  gem "activerecord", "~> 6"
+end
+
+appraise "rails-7" do
+  gem "activerecord", "~> 7"
+end

data/CHANGELOG.md

@@ -1,4 +1,19 @@
-# Change Log
+# Changelog
+
+## [v0.4.0](https://github.com/Bajena/ams_lazy_relationships/tree/v0.4.0) (2023-11-18)
+
+[Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/v0.3.2...v0.4.0)
+
+**Closed issues:**
+
+- How do you override association methods? [\#68](https://github.com/Bajena/ams_lazy_relationships/issues/68)
+- Throws exception in ruby 3.0.0 [\#58](https://github.com/Bajena/ams_lazy_relationships/issues/58)
+
+**Merged pull requests:**
+
+- Rails 7 support [\#85](https://github.com/Bajena/ams_lazy_relationships/pull/85) ([stokarenko](https://github.com/stokarenko))
+- Bump addressable from 2.7.0 to 2.8.0 [\#67](https://github.com/Bajena/ams_lazy_relationships/pull/67) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nokogiri from 1.11.3 to 1.11.4 [\#66](https://github.com/Bajena/ams_lazy_relationships/pull/66) ([dependabot[bot]](https://github.com/apps/dependabot))
 
 ## [v0.3.2](https://github.com/Bajena/ams_lazy_relationships/tree/v0.3.2) (2021-04-18)
 
@@ -12,6 +27,7 @@
 - Update rake requirement from ~\> 10.0 to ~\> 13.0 [\#53](https://github.com/Bajena/ams_lazy_relationships/pull/53) ([dependabot[bot]](https://github.com/apps/dependabot))
 
 ## [v0.3.1](https://github.com/Bajena/ams_lazy_relationships/tree/v0.3.1) (2021-04-14)
+
 [Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/v0.3.0...v0.3.1)
 
 **Closed issues:**
@@ -23,6 +39,7 @@
 - Lock minimum AMS version to 0.10.0.rc4 [\#60](https://github.com/Bajena/ams_lazy_relationships/pull/60) ([Bajena](https://github.com/Bajena))
 
 ## [v0.3.0](https://github.com/Bajena/ams_lazy_relationships/tree/v0.3.0) (2020-01-16)
+
 [Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/v0.2.0...v0.3.0)
 
 **Merged pull requests:**
@@ -35,13 +52,11 @@
 - Fix documentation for blocked relationships [\#45](https://github.com/Bajena/ams_lazy_relationships/pull/45) ([stokarenko](https://github.com/stokarenko))
 
 ## [v0.2.0](https://github.com/Bajena/ams_lazy_relationships/tree/v0.2.0) (2020-01-11)
-[Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/v0.1.5...v0.2.0)
 
-**Merged pull requests:**
-
-- Lazy dig [\#44](https://github.com/Bajena/ams_lazy_relationships/pull/44) ([stokarenko](https://github.com/stokarenko))
+[Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/v0.1.5...v0.2.0)
 
 ## [v0.1.5](https://github.com/Bajena/ams_lazy_relationships/tree/v0.1.5) (2020-01-08)
+
 [Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/v0.1.4...v0.1.5)
 
 **Closed issues:**
@@ -63,6 +78,7 @@
 - Bump loofah from 2.2.3 to 2.3.1 [\#31](https://github.com/Bajena/ams_lazy_relationships/pull/31) ([dependabot[bot]](https://github.com/apps/dependabot))
 
 ## [v0.1.4](https://github.com/Bajena/ams_lazy_relationships/tree/v0.1.4) (2019-06-02)
+
 [Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/v0.1.3...v0.1.4)
 
 **Closed issues:**
@@ -80,6 +96,7 @@
 - Require less restrictive batch loader version [\#26](https://github.com/Bajena/ams_lazy_relationships/pull/26) ([Bajena](https://github.com/Bajena))
 
 ## [v0.1.3](https://github.com/Bajena/ams_lazy_relationships/tree/v0.1.3) (2019-05-19)
+
 [Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/0.1.2...v0.1.3)
 
 **Closed issues:**
@@ -92,6 +109,7 @@
 - Do not yield cached associations data instantly in Association loader [\#23](https://github.com/Bajena/ams_lazy_relationships/pull/23) ([Bajena](https://github.com/Bajena))
 
 ## [0.1.2](https://github.com/Bajena/ams_lazy_relationships/tree/0.1.2) (2019-03-10)
+
 [Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/v0.1.1...0.1.2)
 
 **Closed issues:**
@@ -105,6 +123,7 @@
 - Fix superclass lazy relationships not loading properly on subclass [\#15](https://github.com/Bajena/ams_lazy_relationships/pull/15) ([willcosgrove](https://github.com/willcosgrove))
 
 ## [v0.1.1](https://github.com/Bajena/ams_lazy_relationships/tree/v0.1.1) (2019-01-09)
+
 [Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/v0.1.0...v0.1.1)
 
 **Merged pull requests:**
@@ -112,6 +131,9 @@
 - Relax batch-loader version [\#13](https://github.com/Bajena/ams_lazy_relationships/pull/13) ([Bajena](https://github.com/Bajena))
 
 ## [v0.1.0](https://github.com/Bajena/ams_lazy_relationships/tree/v0.1.0) (2018-12-30)
+
+[Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/a045c7e1c2d545a336cb79fec9e92f0f4c843651...v0.1.0)
+
 **Closed issues:**
 
 - Add changelog [\#10](https://github.com/Bajena/ams_lazy_relationships/issues/10)
@@ -132,4 +154,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile.lock

@@ -1,101 +1,97 @@
 PATH
   remote: .
   specs:
-    ams_lazy_relationships (0.3.2)
+    ams_lazy_relationships (0.4.0)
       active_model_serializers (>= 0.10.0.rc4)
       batch-loader
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.3.1)
-      actionview (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.3.1)
-      activesupport (= 6.1.3.1)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_model_serializers (0.10.12)
-      actionpack (>= 4.1, < 6.2)
-      activemodel (>= 4.1, < 6.2)
+    active_model_serializers (0.10.14)
+      actionpack (>= 4.1)
+      activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activemodel (6.1.3.1)
-      activesupport (= 6.1.3.1)
-    activerecord (6.1.3.1)
-      activemodel (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
-    activesupport (6.1.3.1)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.4.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    async (1.29.0)
+    async (2.6.5)
       console (~> 1.10)
-      nio4r (~> 2.3)
+      fiber-annotation
+      io-event (~> 1.1)
       timers (~> 4.1)
-    async-http (0.54.1)
-      async (~> 1.25)
-      async-io (~> 1.28)
-      async-pool (~> 0.2)
-      protocol-http (~> 0.21.0)
-      protocol-http1 (~> 0.13.0)
-      protocol-http2 (~> 0.14.0)
-    async-http-faraday (0.9.0)
+    async-http (0.61.0)
+      async (>= 1.25)
+      async-io (>= 1.28)
+      async-pool (>= 0.2)
+      protocol-http (~> 0.25.0)
+      protocol-http1 (~> 0.16.0)
+      protocol-http2 (~> 0.15.0)
+      traces (>= 0.10.0)
+    async-http-faraday (0.12.0)
       async-http (~> 0.42)
       faraday
-    async-io (1.30.2)
-      async (~> 1.14)
-    async-pool (0.3.5)
-      async (~> 1.25)
+    async-io (1.38.0)
+      async
+    async-pool (0.4.0)
+      async (>= 1.25)
+    base64 (0.2.0)
     batch-loader (2.0.1)
-    benchmark-memory (0.1.2)
-      memory_profiler (~> 0.9)
+    benchmark-memory (0.2.0)
+      memory_profiler (~> 1)
     builder (3.2.4)
     case_transform (0.2)
       activesupport
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    connection_pool (2.2.5)
-    console (1.11.1)
+    concurrent-ruby (1.2.2)
+    console (1.23.2)
+      fiber-annotation
       fiber-local
     crass (1.0.6)
-    db-query-matchers (0.10.0)
-      activesupport (>= 4.0, < 7)
-      rspec (~> 3.0)
-    diff-lcs (1.4.4)
-    docile (1.3.5)
-    erubi (1.10.0)
-    excon (0.80.1)
-    faraday (1.4.0)
-      faraday-excon (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    db-query-matchers (0.11.0)
+      activesupport (>= 4.0, < 7.1)
+      rspec (>= 3.0)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    erubi (1.12.0)
+    faraday (2.7.11)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-excon (1.0.0)
-      excon (>= 0.27.4)
-    faraday-http-cache (2.2.0)
+    faraday-http-cache (2.5.0)
       faraday (>= 0.8)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.0.3)
-      net-http-persistent (>= 3.1)
+    faraday-net_http (3.0.2)
+    fiber-annotation (0.2.0)
     fiber-local (1.0.0)
-    github_changelog_generator (1.16.1)
+    github_changelog_generator (1.16.4)
       activesupport
       async (>= 1.25.0)
       async-http-faraday
@@ -104,66 +100,63 @@ GEM
       octokit (~> 4.6)
       rainbow (>= 2.2.1)
       rake (>= 10.0)
-      retriable (~> 3.0)
-    i18n (1.8.10)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     imagen (0.1.8)
       parser (>= 2.5, != 2.5.1.1)
-    jaro_winkler (1.5.4)
+    io-event (1.3.3)
+    jaro_winkler (1.5.6)
     jsonapi-renderer (0.2.2)
-    loofah (2.9.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    memory_profiler (0.9.14)
-    method_source (0.9.2)
-    mini_portile2 (2.5.0)
-    minitest (5.14.4)
+      nokogiri (>= 1.12.0)
+    memory_profiler (1.0.1)
+    method_source (1.0.0)
+    minitest (5.20.0)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
-    net-http-persistent (4.0.1)
-      connection_pool (~> 2.2)
-    nio4r (2.5.7)
-    nokogiri (1.11.3)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.15.5-x86_64-darwin)
       racc (~> 1.4)
-    octokit (4.20.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.20.1)
-    parser (3.0.1.0)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
+      racc
     powerpack (0.1.3)
     protocol-hpack (1.4.2)
-    protocol-http (0.21.0)
-    protocol-http1 (0.13.2)
-      protocol-http (~> 0.19)
-    protocol-http2 (0.14.2)
+    protocol-http (0.25.0)
+    protocol-http1 (0.16.0)
+      protocol-http (~> 0.22)
+    protocol-http2 (0.15.1)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-nav (0.3.0)
-      pry (>= 0.9.10, < 0.13.0)
-    public_suffix (4.0.6)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-nav (1.0.0)
+      pry (>= 0.9.10, < 0.15)
+    public_suffix (5.0.4)
+    racc (1.7.3)
+    rack (2.2.8)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.1.3.1)
-      actionpack (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    retriable (3.1.2)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.1.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -195,36 +188,37 @@ GEM
       unicode-display_width (~> 1.4.0)
     rubocop-rspec (1.20.1)
       rubocop (>= 0.51.0)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    rugged (1.1.0)
-    sawyer (0.8.2)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    rugged (1.6.3)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    simplecov (0.21.2)
+      faraday (>= 0.17.3, < 3)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
-    simplecov_json_formatter (0.1.2)
-    sqlite3 (1.4.2)
-    thor (1.1.0)
+    simplecov_json_formatter (0.1.4)
+    sqlite3 (1.6.8-x86_64-darwin)
+    thor (1.3.0)
     thread_safe (0.3.6)
-    timers (4.3.3)
-    tzinfo (2.0.4)
+    timers (4.3.5)
+    traces (0.11.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    undercover (0.4.3)
+    undercover (0.4.6)
       imagen (>= 0.1.8)
       rainbow (>= 2.1, < 4.0)
-      rugged (>= 0.27, < 1.2)
+      rugged (>= 0.27, < 1.7)
     unicode-display_width (1.4.1)
-    with_model (2.1.5)
-      activerecord (>= 5.2)
-    zeitwerk (2.4.2)
+    with_model (2.1.7)
+      activerecord (>= 6.0)
+    zeitwerk (2.6.12)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-21
 
 DEPENDENCIES
   activerecord
@@ -248,4 +242,4 @@ DEPENDENCIES
   with_model
 
 BUNDLED WITH
-   2.2.15
+   2.4.10

data/gemfiles/rails_6.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6"
+
+gemspec path: "../"

data/gemfiles/rails_7.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7"
+
+gemspec path: "../"

data/lib/ams_lazy_relationships/loaders/association.rb

@@ -22,9 +22,7 @@ module AmsLazyRelationships
       attr_reader :model_class_name, :association_name
 
       def load_data(records, loader)
-        ::ActiveRecord::Associations::Preloader.new.preload(
-          records_to_preload(records), association_name
-        )
+        preload(records)
 
         data = []
         records.each do |r|
@@ -40,6 +38,19 @@ module AmsLazyRelationships
         @batch_key ||= "#{model_class_name}/#{association_name}"
       end
 
+      def preload(records)
+        if ::ActiveRecord::VERSION::MAJOR >= 7
+          ::ActiveRecord::Associations::Preloader.new(
+            records: records_to_preload(records),
+            associations: association_name
+          ).call
+        else
+          ::ActiveRecord::Associations::Preloader.new.preload(
+            records_to_preload(records), association_name
+          )
+        end
+      end
+
       def records_to_preload(records)
         # It may happen that same record comes here twice (e.g. wrapped
         # in a decorator and non-wrapped). In this case Associations::Preloader

data/lib/ams_lazy_relationships/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AmsLazyRelationships
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ams_lazy_relationships
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Jan Bajena
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-18 00:00:00.000000000 Z
+date: 2023-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -290,8 +290,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -322,6 +322,8 @@ files:
 - gemfiles/ams_0.10.8.gemfile
 - gemfiles/batch_loader_1.gemfile
 - gemfiles/batch_loader_2.gemfile
+- gemfiles/rails_6.gemfile
+- gemfiles/rails_7.gemfile
 - lib/ams_lazy_relationships.rb
 - lib/ams_lazy_relationships/core.rb
 - lib/ams_lazy_relationships/core/evaluation.rb
@@ -345,7 +347,7 @@ metadata:
   homepage_uri: https://github.com/Bajena/ams_lazy_relationships
   source_code_uri: https://github.com/Bajena/ams_lazy_relationships
   changelog_uri: https://github.com/Bajena/ams_lazy_relationships/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -360,8 +362,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: ActiveModel Serializers addon for eliminating N+1 queries problem from the
   serializers.