active_record_has 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e050075e8902614ca9297fa6db501848187c2bbdc422e2194a32a3d7953faa4
-  data.tar.gz: 31ad22d4014c8a943309e722c3c8ead9218c4faab679781306a919feee47ba58
+  metadata.gz: a8e6638722e38048167aaadfc8a1d56f0381808394023137b361a58d415d2408
+  data.tar.gz: a1fabbc4b3002c51a0504cdad5e60ee105f1d44c8e4ccbe5243ed9cd7280812b
 SHA512:
-  metadata.gz: d41e8f0e5d4c2a82cb417fe0ba0d559fc807a91d3fa653e060217313100da40742df38a1ac4e011fcd02e9ce91336dd047b74d505856f02dfcfcf37c544cfffb
-  data.tar.gz: 24330af5173b92b37e511167dafef226aeac1a4374d1b317b67ccd42d169da62e872333431a3a4f8f7f77e3a9ca115487ad737dbde21b0ae2a6f79682a58dea8
+  metadata.gz: 73ae0efb26f616ef5f69e067e30720fafca90c3c2dde0bf5b3f2c84b625d02eca4095be04dd42f17c9f55a0f8c516ae769c1693dbf18197f2b84ecb4c0ae70a5
+  data.tar.gz: cd17d4d95812570ba2c14ccc76d176c1fee784c5cce8eb1bf252864331c9e2ea55c965bd718c1e58ae982f69d2bcf40d7f7e9189eec2e656c613125cb2779b07

data/lib/active_record_has/scope.rb

@@ -2,17 +2,55 @@
 
 module ActiveRecordHas
   class Scope
-    attr_reader :foreign_scope
-    def initialize(reflection, &block)
+    attr_reader :model, :association, :relation, :reflection, :options, :block
+
+    def initialize(model, association, relation, **options, &block)
+      @model = model
+      @association = association
+      @block = block
+      @options = options
+      @reflection ||=
+        if association.is_a? Symbol
+          @relation = relation if relation.is_a? ActiveRecord::Relation
+          @reflection = reflections[association.to_s]
+        elsif association.is_a? ActiveRecord::Relation
+          @relation = association
+          model_name = association.model_name
+          @reflection = reflections[model_name.plural] || reflections[model_name.singular]
+        else
+          nil
+        end
+    end
+
+    delegate :reflections, to: :model
+
+    def reflection
+      @reflection ||=
+        if association.is_a? Symbol
+          @reflection = reflections[association.to_s]
+        elsif association.is_a? ActiveRecord::Relation
+          model_name = association.model_name
+          @reflection = reflections[model_name.plural] || reflections[model_name.singular]
+        else
+          nil
+        end
+    end
+
+    def scope
       raise Error unless reflection
 
-      foreign_scope = reflection.foreign_scope
-      foreign_scope = foreign_scope.instance_eval(&block) if block
-      @foreign_scope = foreign_scope
+      @scope ||= 
+        begin
+          result = reflection.foreign_scope
+          result = result.instance_eval(&block) if block
+          result = result.merge(relation) if relation
+          result = result.where(**options) if options.present?
+          result
+        end
     end
 
     def exists
-      foreign_scope.arel.exists
+      scope.arel.exists
     end
   end
 end

data/lib/active_record_has/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordHas
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/active_record_has.rb

@@ -13,11 +13,11 @@ ActiveRecord::Reflection::ThroughReflection.include ActiveRecordHas::ThroughMeth
 module ActiveRecordHas
   class Error < StandardError; end
 
-  def has(association, &block)
-    where(Scope.new(reflections[association.to_s], &block)&.exists)
+  def has(association, relation=nil, **options, &block)
+    where(Scope.new(self, association, relation, **options, &block).exists)
   end
 
-  def has_not(association, &block)
-    where.not(Scope.new(reflections[association.to_s], &block)&.exists)
+  def has_not(association, relation=nil, **options, &block)
+    where.not(Scope.new(self, association, relation, **options, &block).exists)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_has
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Robert Ferney
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -48,7 +48,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/capnregex/active_record_has
   source_code_uri: https://github.com/capnregex/active_record_has
-  changelog_uri: https://github.com/capnregex/active_record_has/releases/tag/v0.1.1
+  changelog_uri: https://github.com/capnregex/active_record_has/releases/tag/v0.1.2
 post_install_message:
 rdoc_options: []
 require_paths: