edge_rider 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac872c959e9c692146c7091a63248e501f780a8d065b15e65548a1d9a7ac4e46
-  data.tar.gz: '018be393dda77b87b8cf91c6466699af80baced864640e56735ddd86e6a8601b'
+  metadata.gz: 92243002f87dbe03f00014b107beb57f9e024b9f77b3d16f134e20532e8c3c7e
+  data.tar.gz: f18dd9916e2226870cc2ff97fa64437097df10ef18c2b548a2c7f98d32a9633d
 SHA512:
-  metadata.gz: bbf53aff09715db33e03146bdca2f4277f5b89560952a853089e046fd7a1480796c2e31e046f3f4d783be38d92ed9850529c10e822ad04e4faf1b5acac9db782
-  data.tar.gz: b3ea5bfe76ceb8d177107bf306920bf957bda6268f34cfdedbf6e053d18133d67c4d5d51e9a641b537d74333fd576cf557c412b2e5981029dbdb6c8dddc8e664
+  metadata.gz: f5056092d3c444feab3997beeb2f6278ce260f1690c1a78517cecbb278ccb3c0811d4578f2eba66a80553391df86c29964ba2ab66fc09c2bfff34fe06cc8e1b0
+  data.tar.gz: a39f21a754769f355cf1ee76d3261e0556096d0d600468e604e4dc66a7203922c0387bc506cd586626bc40b0bad079ddf5b2c921f43c17e18bd2f23d380f02d3

data/.github/workflows/test.yml

@@ -41,7 +41,8 @@ jobs:
         ruby-version: "${{ matrix.ruby }}"
     - name: Setup database
       run: |
-        sudo apt-get install -y mysql-client libmariadbclient-dev
+        sudo apt-get update
+        sudo apt-get install -y mariadb-client libmariadbclient-dev
         mysql -e 'create database IF NOT EXISTS test;' -u root --password=password -P 3306 -h 127.0.0.1
     - name: Bundle
       run: |
@@ -79,6 +80,10 @@ jobs:
           gemfile: Gemfile.6.1.pg
         - ruby: 3.0.2
           gemfile: Gemfile.6.1.pg
+        - ruby: 2.7.4
+          gemfile: Gemfile.7.0.pg
+        - ruby: 3.0.2
+          gemfile: Gemfile.7.0.pg
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:

data/CHANGELOG.md

@@ -10,10 +10,18 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Compatible changes
 
 
-## 1.1.0 - 2021-08-24
+## 2.1.0 - 2022-02-24
+
+### Compatible changes
+- Add support for Rails 7.0
+- Activate Rubygems MFA
+
+
+## 2.0.0 - 2021-08-24
 
 ### Breaking changes
 - Drop support for Ruby < 2.5.0
+- Drop support for Rails < 3.2
 
 ### Compatible changes
 - Add support for Rails 6.1

data/Gemfile.4.2.mysql2

@@ -11,6 +11,7 @@ gem 'has_defaults' # used by test models
 gem 'rspec'
 gem 'gemika', '>=0.5.0'
 gem 'pry-byebug'
+gem 'db-query-matchers'
 
 # Gem under test
 gem 'edge_rider', path: '.'

data/Gemfile.4.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.0.0)
+    edge_rider (2.1.0)
       activerecord (>= 3.2)
 
 GEM
@@ -25,6 +25,9 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.9)
     database_cleaner (1.0.1)
+    db-query-matchers (0.10.0)
+      activesupport (>= 4.0, < 7)
+      rspec (~> 3.0)
     diff-lcs (1.2.5)
     gemika (0.6.1)
     has_defaults (0.4.4)
@@ -64,6 +67,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 4.2.0)
   database_cleaner
+  db-query-matchers
   edge_rider!
   gemika (>= 0.5.0)
   has_defaults
@@ -73,4 +77,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.2.26
+   2.2.32

data/Gemfile.4.2.pg

@@ -11,6 +11,7 @@ gem 'rspec'
 gem 'has_defaults' # used by test models
 gem 'gemika', '>=0.5.0'
 gem 'pry-byebug'
+gem 'db-query-matchers'
 
 # Gem under test
 gem 'edge_rider', path: '.'

data/Gemfile.4.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.0.0)
+    edge_rider (2.1.0)
       activerecord (>= 3.2)
 
 GEM
@@ -25,6 +25,9 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.9)
     database_cleaner (1.5.3)
+    db-query-matchers (0.10.0)
+      activesupport (>= 4.0, < 7)
+      rspec (~> 3.0)
     diff-lcs (1.2.5)
     gemika (0.6.1)
     has_defaults (0.4.4)
@@ -64,6 +67,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 4.2.0)
   database_cleaner
+  db-query-matchers
   edge_rider!
   gemika (>= 0.5.0)
   has_defaults
@@ -73,4 +77,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.2.26
+   2.2.32

data/Gemfile.5.2.mysql2

@@ -12,6 +12,7 @@ gem 'rspec'
 gem 'has_defaults' # used by test models
 gem 'gemika', '>=0.5.0'
 gem 'pry-byebug'
+gem 'db-query-matchers'
 
 # Gem under test
 gem 'edge_rider', path: '.'

data/Gemfile.5.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.0.0)
+    edge_rider (2.1.0)
       activerecord (>= 3.2)
 
 GEM
@@ -23,6 +23,9 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     database_cleaner (1.6.1)
+    db-query-matchers (0.10.0)
+      activesupport (>= 4.0, < 7)
+      rspec (~> 3.0)
     diff-lcs (1.3)
     gemika (0.5.0)
     has_defaults (0.4.4)
@@ -62,6 +65,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 5.2.3)
   database_cleaner
+  db-query-matchers
   edge_rider!
   gemika (>= 0.5.0)
   has_defaults
@@ -72,4 +76,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.2.26
+   2.2.32

data/Gemfile.5.2.pg

@@ -12,6 +12,7 @@ gem 'has_defaults' # used by test models
 gem 'rspec'
 gem 'gemika', '>=0.5.0'
 gem 'pry-byebug'
+gem 'db-query-matchers'
 
 # Gem under test
 gem 'edge_rider', path: '.'

data/Gemfile.5.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.0.0)
+    edge_rider (2.1.0)
       activerecord (>= 3.2)
 
 GEM
@@ -23,6 +23,9 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     database_cleaner (1.6.1)
+    db-query-matchers (0.10.0)
+      activesupport (>= 4.0, < 7)
+      rspec (~> 3.0)
     diff-lcs (1.3)
     gemika (0.5.0)
     has_defaults (0.4.4)
@@ -62,6 +65,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 5.2.3)
   database_cleaner
+  db-query-matchers
   edge_rider!
   gemika (>= 0.5.0)
   has_defaults
@@ -72,4 +76,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.2.26
+   2.2.32

data/Gemfile.6.1.pg

@@ -11,6 +11,7 @@ gem 'has_defaults' # used by test models
 gem 'rspec'
 gem 'gemika', '>=0.5.0'
 gem 'pry-byebug'
+gem 'db-query-matchers'
 
 # Gem under test
 gem 'edge_rider', path: '.'

data/Gemfile.6.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.0.0)
+    edge_rider (2.1.0)
       activerecord (>= 3.2)
 
 GEM
@@ -27,6 +27,9 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
+    db-query-matchers (0.10.0)
+      activesupport (>= 4.0, < 7)
+      rspec (~> 3.0)
     diff-lcs (1.4.4)
     gemika (0.5.0)
     has_defaults (0.4.4)
@@ -66,6 +69,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 6.1.3)
   database_cleaner
+  db-query-matchers
   edge_rider!
   gemika (>= 0.5.0)
   has_defaults
@@ -75,4 +79,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.2.26
+   2.3.4

data/Gemfile.7.0.pg

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'activerecord', '~>7.0.1'
+gem 'pg'
+
+# Development dependencies
+gem 'rake'
+gem 'database_cleaner'
+gem 'has_defaults' # used by test models
+gem 'rspec'
+gem 'gemika', '>=0.5.0'
+gem 'pry-byebug'
+gem 'db-query-matchers'
+
+# Gem under test
+gem 'edge_rider', path: '.'

data/Gemfile.7.0.pg.lock

@@ -0,0 +1,78 @@
+PATH
+  remote: .
+  specs:
+    edge_rider (2.1.0)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.1)
+      activesupport (= 7.0.1)
+    activerecord (7.0.1)
+      activemodel (= 7.0.1)
+      activesupport (= 7.0.1)
+    activesupport (7.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    db-query-matchers (0.8.0)
+    diff-lcs (1.5.0)
+    gemika (0.6.1)
+    has_defaults (1.0.0)
+      activerecord
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.15.0)
+    pg (1.2.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 7.0.1)
+  database_cleaner
+  db-query-matchers
+  edge_rider!
+  gemika (>= 0.5.0)
+  has_defaults
+  pg
+  pry-byebug
+  rake
+  rspec
+
+BUNDLED WITH
+   2.3.4

data/README.md

@@ -235,7 +235,7 @@ Now run `bundle install` and restart your server.
 ## Development
 
 - There are tests in `spec`. We only accept PRs with tests.
-- We currently develop using the Ruby version in `.ruby-version`. It is required to change the Ruby Version to cover all Rails version or just use Travis CI.
+- We currently develop using the Ruby version in `.ruby-version`. It is required to change the Ruby Version to cover all Rails version or just use Github Actions.
 - Put your database credentials into `spec/support/database.yml`. There's a `database.sample.yml` you can use as a template.
 - Create a database `edge_rider_test` in both MySQL and PostgreSQL.
 - There are gem bundles in the project root for each combination of ActiveRecord version and database type that we support.

data/edge_rider.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.description = spec.summary
   spec.homepage = 'https://github.com/makandra/edge_rider'
   spec.license = 'MIT'
+  spec.metadata = { 'rubygems_mfa_required' => 'true' }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/edge_rider/preload_associations.rb

@@ -9,24 +9,19 @@ module EdgeRider
     def preload_associations(*args)
       preloader = ActiveRecord::Associations::Preloader
 
-      if preloader.method_defined?(:preload) # Rails 4
-        preloader.new.preload(*args)
-      else
+      if preloader.method_defined?(:run) # Rails 3.2 / Rails 4
         preloader.new(*args).run
+      elsif preloader.method_defined?(:preload) # Rails 5 to Rails 6.1
+        preloader.new.preload(*args)
+      else # Rails 7+
+        records = args.first
+        associations = args.second
+        options = args[2] || {}
+        preloader.new(records: records, associations: associations, **options).call
       end
     end
 
-    if ActiveRecord::Base.respond_to?(:preload_associations, true) # Rails 2/3.0
-      ActiveRecord::Base.class_eval do
-        class << self
-          public :preload_associations
-        end
-      end
-    else # Rails 3.2+
-      ActiveRecord::Base.send(:extend, self)
-    end
-
+    ActiveRecord::Base.send(:extend, self)
     ActiveRecord::Base.send(:include, PreloadAssociationsInstanceMethod)
-
   end
 end

data/lib/edge_rider/version.rb

@@ -1,3 +1,3 @@
 module EdgeRider
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge_rider
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -47,6 +47,8 @@ files:
 - Gemfile.5.2.pg.lock
 - Gemfile.6.1.pg
 - Gemfile.6.1.pg.lock
+- Gemfile.7.0.pg
+- Gemfile.7.0.pg.lock
 - Gemfile.lock
 - LICENSE
 - README.md
@@ -66,7 +68,8 @@ files:
 homepage: https://github.com/makandra/edge_rider
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -82,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Power tools for ActiveRecord relations (scopes)