edge_rider 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e76fe31acbaa313ea4b8d6eec7a26809dd3a340cd6b9d8cda55305f9c8f71157
-  data.tar.gz: ca5884575995ddb539a74262d682648e44325e454e8fce1e0f0da33d487969e0
+  metadata.gz: 32bfec9bfa5c200e32346b737cab2a2ca8022a7970592b545ea441d18fc7cb1e
+  data.tar.gz: 27a7901e4a45da9e8c82672b4c94157a811308a85fbef9bda063c2c8854bbf3a
 SHA512:
-  metadata.gz: 3fca12b801fd31fb76480118fb57e42ec7db53de75888e0f6714fc523f897f64cc0f44cdfbc44ebb024b12cd9ea783c68a45c72756bdfa3416838973bce9f7e5
-  data.tar.gz: b468254fface8669ae9bb26b1a71ebd80ba70c4c10f4a857ddd568d791582e002e5aa3ef8542e89f72689932c95ce111c31ac39608843f02dd29c23782666558
+  metadata.gz: 56a14c1c14b1385eeacbea770151e82237fda1b0c80e3b774127f47dfc97ebda0886e455a60958784e6d65c07b7da52902b4f88311b376c2b7ea8b6b490e1428
+  data.tar.gz: bbda66b48e74e0515b38b1959d1836a77aced98bdb90778d215698a3886c88828edcc7ab0463ce40ffbcfd757addf534fb3690508dfad155aac51557003a9208

data/.github/workflows/test.yml

@@ -49,7 +49,7 @@ jobs:
     - name: Run tests
       run: bundle exec rspec
   test_pg:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres

data/CHANGELOG.md

@@ -10,6 +10,18 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Compatible changes
 
 
+## 2.3.1 - 2024-10-18
+
+### Compatible changes
+
+- Follow recommended way to extend Railties
+
+## 2.3.0 - 2023-05-26
+
+### Compatible changes
+
+- `collect_ids` is now capable of parsing "string arrays" like `['1', '2', '3']`. This can be handy when handling params with ID arrays.
+
 ## 2.2.0 - 2023-03-01
 
 ### Compatible changes

data/Gemfile.4.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.2.0)
+    edge_rider (2.3.1)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.4.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.2.0)
+    edge_rider (2.3.1)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.5.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.2.0)
+    edge_rider (2.3.1)
       activerecord (>= 3.2)
 
 GEM
@@ -76,4 +76,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.3.4
+   2.3.26

data/Gemfile.5.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.2.0)
+    edge_rider (2.3.1)
       activerecord (>= 3.2)
 
 GEM
@@ -76,4 +76,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.3.4
+   2.3.26

data/Gemfile.6.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.2.0)
+    edge_rider (2.3.1)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.7.0.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edge_rider (2.2.0)
+    edge_rider (2.3.1)
       activerecord (>= 3.2)
 
 GEM
@@ -75,4 +75,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.3.4
+   2.3.13

data/lib/edge_rider/collect_column.rb

@@ -16,7 +16,9 @@ module EdgeRider
       scope.pluck(qualified_column_name)
     end
 
-    ActiveRecord::Base.extend(self)
-
   end
 end
+
+ActiveSupport.on_load :active_record do
+  extend(EdgeRider::CollectColumn)
+end

data/lib/edge_rider/collect_ids.rb

@@ -8,9 +8,18 @@ module EdgeRider
       def collect_ids
         collect do |obj|
           case obj
-            when Integer then obj
-            when ActiveRecord::Base then obj.id
-            else raise Uncollectable, "Cannot collect an id from #{obj.inspect}"
+          when Integer
+            obj
+          when ActiveRecord::Base
+            obj.id
+          when String
+            if obj.match(/\A\d+\z/)
+              obj.to_i
+            else
+              raise Uncollectable, "Cannot collect an id from #{obj.inspect}"
+            end
+          else
+            raise Uncollectable, "Cannot collect an id from #{obj.inspect}"
           end
         end
       end
@@ -27,8 +36,6 @@ module EdgeRider
 
     end
 
-    ::ActiveRecord::Base.send(:include, ActiveRecordValue)
-
     module ActiveRecordScope
 
       def collect_ids
@@ -37,10 +44,6 @@ module EdgeRider
 
     end
 
-    ::ActiveRecord::Base.send(:extend, ActiveRecordScope)
-    ::ActiveRecord::Associations::HasManyAssociation.send(:include, ActiveRecordScope)
-    ::ActiveRecord::Associations::HasManyThroughAssociation.send(:include, ActiveRecordScope)
-
     module Integer
 
       def collect_ids
@@ -53,3 +56,10 @@ module EdgeRider
 
   end
 end
+
+ActiveSupport.on_load :active_record do
+  extend(EdgeRider::CollectIds::ActiveRecordScope)
+  include(EdgeRider::CollectIds::ActiveRecordValue)
+  ActiveRecord::Associations::HasManyAssociation.send(:include, EdgeRider::CollectIds::ActiveRecordScope)
+  ActiveRecord::Associations::HasManyThroughAssociation.send(:include, EdgeRider::CollectIds::ActiveRecordScope)
+end

data/lib/edge_rider/origin_class.rb

@@ -9,7 +9,9 @@ module EdgeRider
       scope
     end
 
-    ActiveRecord::Base.extend(self)
-
   end
 end
+
+ActiveSupport.on_load :active_record do
+  extend(EdgeRider::OriginClass)
+end

data/lib/edge_rider/preload_associations.rb

@@ -20,8 +20,10 @@ module EdgeRider
         preloader.new(records: records, associations: associations, **options).call
       end
     end
-
-    ActiveRecord::Base.send(:extend, self)
-    ActiveRecord::Base.send(:include, PreloadAssociationsInstanceMethod)
   end
 end
+
+ActiveSupport.on_load :active_record do
+  extend(EdgeRider::PreloadAssociations)
+  include(EdgeRider::PreloadAssociations::PreloadAssociationsInstanceMethod)
+end

data/lib/edge_rider/scoped.rb

@@ -1,30 +1,32 @@
 module EdgeRider
   module Scoped
-    
+
     VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset,
                            :order, :select, :readonly, :group, :having, :from, :lock ]
 
     def scoped(options = nil)
       options ||= {}
       relation = all
-  
+
       options.assert_valid_keys(VALID_FIND_OPTIONS)
       finders = options.dup
       finders.delete_if { |key, value| value.nil? && key != :limit }
-  
+
       ((VALID_FIND_OPTIONS - [:conditions, :include]) & finders.keys).each do |finder|
         relation = relation.send(finder, finders[finder])
       end
-  
+
       relation = relation.where(finders[:conditions]) if options.has_key?(:conditions)
       relation = relation.includes(finders[:include]) if options.has_key?(:include)
-  
+
       relation
     end
 
-    if ActiveRecord::VERSION::MAJOR >= 4
-      ActiveRecord::Base.extend(self)
-    end
+  end
+end
 
+ActiveSupport.on_load :active_record do
+  if ActiveRecord::VERSION::MAJOR >= 4
+    extend(EdgeRider::Scoped)
   end
 end

data/lib/edge_rider/to_id_query.rb

@@ -5,8 +5,9 @@ module EdgeRider
       ids = collect_ids
       EdgeRider::Util.exclusive_query(self, id: ids)
     end
-
-    ActiveRecord::Base.send(:extend, self)
-
   end
 end
+
+ActiveSupport.on_load :active_record do
+  extend(EdgeRider::ToIdQuery)
+end

data/lib/edge_rider/traverse_association.rb

@@ -16,7 +16,7 @@ module EdgeRider
         # In Rails 4, conditions on a scope are expressed as a lambda parameter
         # that is called `scope`.
         raise NotImplementedError if reflection.options[:conditions] or (reflection.respond_to?(:scope) && reflection.scope)
-           
+
         if reflection.macro == :belongs_to # belongs_to
           ids = scope.collect_column(foreign_key, distinct: true)
           scope = EdgeRider::Util.exclusive_query(reflection.klass, id: ids)
@@ -40,7 +40,9 @@ module EdgeRider
 
     end
 
-    ActiveRecord::Base.extend(self)
-
   end
 end
+
+ActiveSupport.on_load :active_record do
+  extend(EdgeRider::TraverseAssociation)
+end

data/lib/edge_rider/version.rb

@@ -1,3 +1,3 @@
 module EdgeRider
-  VERSION = '2.2.0'
+  VERSION = '2.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge_rider
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2024-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord