activerecord_follow_assoc 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b8caccb83e94c7443d397e3821ff1e82bd7b97e70eaf4069a35199cec86e4d5
-  data.tar.gz: 974c2775d84c5d1863288bab1d25844c46e3a068502d56885ff0e8b061f61bd4
+  metadata.gz: 1c3e62bdc3a618ec8df6a5b54701734f8dd2895389018eb9fd68f750f71d1fe0
+  data.tar.gz: c3e258f8c744305d0d272f208456b7372979fed0c36543385612c585d0657fc0
 SHA512:
-  metadata.gz: 6a24b54072e35365c17cc80a6b112fabab2e535b42f2d6063065fafd1defbd02cb619638d06bfbddb7ac080a74b6476d033d075075fcbeee96fbe7c85f755608
-  data.tar.gz: 27a15ff6481ec90f3dba7d71b1f8b13e82bec4a56918735edf2676f1b6f7fef971372336f881e83a1422cfb79e88a358f36501080ad26395e0635d9ea0685b1b
+  metadata.gz: 4ae73f99a8d3f6e96487822b02a8d2757d427245c7e1041723d713ddd626f7d053a0318bdf5c4c6790ca29e2122b0028a59911275a73d157a6f3df16416fe50d
+  data.tar.gz: e9059d3925da935e71160d46ff75cfa0e34c27d33a0b02c28f1d02f67eed66b896aca87422563e0690084281d70302dc10ab1daf92f6ee4212bf64a1c0398d1a

data/README.md

@@ -1,5 +1,3 @@
-This gem is still a work in progress. It hasn't been released yet.
-
 # ActiveRecord Follow Assoc
 
 ![Test supported versions](https://github.com/MaxLap/activerecord_follow_assoc/workflows/Test%20supported%20versions/badge.svg)
@@ -15,7 +13,7 @@ Here's how this gem allows you to do it:
 current_user.posts.recent.follow_assoc(:comments)
 ```
 
-The `follow_assoc` method, added by this gem allows you to query the specified association 
+The `follow_assoc` method, added by this gem, allows you to query the specified association
 of the records that the current query would return.
 
 Here is a more complete [introduction to this gem](INTRODUCTION.md).
@@ -46,7 +44,6 @@ Doing this without follow_assoc can be verbose, error-prone and less efficient d
 
 ## Installation
 
-**This is not released yet. This won't work.**
 Rails 4.1 to 6.1 are supported with Ruby 2.1 to 3.0. Tested against SQLite3, PostgreSQL and MySQL. The gem
 only depends on the `activerecord` gem.
 
@@ -125,9 +122,7 @@ It allows you to make conditions based on your associations (without changing th
 Post.where_assoc_exists([:comments, :author], &:admins)
 ```
 
-This could be done with `follow_assoc`: `User.admins.follow_assoc(:comments, :post)`. But if you wanted conditions on
-a second association, then `follow_assoc` wouldn't work. It all depends on the context where you need to do the query
-and what starting point you have.
+This could be done with `follow_assoc`: `User.admins.follow_assoc(:comments, :post)`. But if you wanted conditions on a second association, then `follow_assoc` wouldn't work. On the other hand, if you received a scope on users and wanted their posts, then `follow_assoc` would be a nicer tool for the job. It all depends on the context where you need to do the query and what starting point you have.
 
 ## Development
 

data/lib/active_record_follow_assoc/active_record_compat.rb

@@ -61,6 +61,16 @@ module ActiveRecordFollowAssoc
       end
     end
 
+    if ActiveRecord.gem_version >= Gem::Version.new("7.1.0.alpha")
+      def self.null_relation?(reflection)
+        reflection.null_relation?
+      end
+    else
+      def self.null_relation?(reflection)
+        reflection.is_a?(ActiveRecord::NullRelation)
+      end
+    end
+
     if ActiveRecord.gem_version >= Gem::Version.new("5.0")
       def self.parent_reflection(reflection)
         reflection.parent_reflection

data/lib/active_record_follow_assoc/core_logic.rb

@@ -10,7 +10,7 @@ module ActiveRecordFollowAssoc
     # => "EXISTS (SELECT... *relation1*) OR EXISTS (SELECT... *relation2*)"
     def self.sql_for_any_exists(relations)
       relations = [relations] unless relations.is_a?(Array)
-      relations = relations.reject { |rel| rel.is_a?(ActiveRecord::NullRelation) }
+      relations = relations.reject { |rel| ActiveRecordCompat.null_relation?(rel) }
       sqls = relations.map { |rel| "EXISTS (#{rel.select('1').to_sql})" }
       if sqls.size > 1
         "(#{sqls.join(" OR ")})" # Parens needed when embedding the sql in a `where`, because the OR could make things wrong
@@ -165,7 +165,7 @@ module ActiveRecordFollowAssoc
 
       if poly_belongs_to?(actual_source_reflection)
         if reflection.options[:source_type]
-          [reflection.options[:source_type].safe_constantize].compact
+          reflection.options[:source_type].safe_constantize
         else
           if on_poly_belongs_to.nil?
             msg = String.new

data/lib/active_record_follow_assoc/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordFollowAssoc
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_follow_assoc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Maxime Lapointe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Follow associations within your ActiveRecord queries