better_record 0.22.3 → 0.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cce50574a4e95858de7fe1de919d6cdffe29c51246203d4989de4bce44ed9aab
-  data.tar.gz: a553f2797bc8f10387caede3622f6eec6c2403d74560180588584920f5a5c027
+  metadata.gz: d426d50cc2eb9e82f0aaaddbe50f9ca65381cca3af47576860b919f55e7ab2cf
+  data.tar.gz: 26e92d8f35ff71f9c297f274f2e96df77064d5f4995fb73c54188b964f343532
 SHA512:
-  metadata.gz: 4cd7258cf3b5b193dc40b56739927db8e71ad04cb135d65e4504211416bb5a503790f749b677b9138f125100aa5d91566490d19d446038a3c9df263706b1b963
-  data.tar.gz: 9fd2da6a802410314a7ee890feb62d397c0fecb2b56b2a8c21dffae56f0ab5bda55ae4e6a87c5ccbfec63c075700198db7735139f1ca4aba0c24fa82c9d8f980
+  metadata.gz: 260ce5d391640da67b9046744fdae9441b2c7be2972e8c249a3957b625af1a4f508ca31053bf063035fd1ef8c1eef58da89e79de50ae225d41027a4eee12906c
+  data.tar.gz: 68e6e7120f64441c6281747a051cbf908337595085ca8a8cdd24769585856d94e96def576a8845b7f93fa0e197d6fb0a0427421731f05de1cda8eac80ed55846

data/lib/better_record/concerns/active_record_extensions/reflection_extensions.rb

@@ -5,11 +5,21 @@ require 'active_record/reflection'
 module ActiveRecord
   module Reflection
     class AbstractReflection
-      def join_scope(table, foreign_klass)
+      def join_scope(table, foreign_table, foreign_klass = nil)
+        unless foreign_klass
+          foreign_klass = foreign_table
+          foreign_table = nil
+        end
+
         predicate_builder = predicate_builder(table)
         scope_chain_items = join_scopes(table, predicate_builder)
         klass_scope       = klass_join_scope(table, predicate_builder)
 
+        key         = join_keys.key
+        foreign_key = join_keys.foreign_key
+
+        klass_scope.where!(table[key].eq(foreign_table[foreign_key])) if foreign_table
+
         if type
           if options[:strict_primary_type]
             klass_scope.where!(type => BetterRecord::PolymorphicOverride.polymorphic_value(foreign_klass, options))
@@ -18,10 +28,33 @@ module ActiveRecord
           end
         end
 
+        ntc =
+          begin
+            klass.finder_needs_type_condition?
+          rescue
+            false
+          end
+
+        if ntc
+          klass_scope.where!(klass.send(:type_condition, table))
+        end
+
         scope_chain_items.inject(klass_scope, &:merge!)
       end
     end
 
+    class MacroReflection < AbstractReflection
+    end
+
+    class ThroughReflection < AbstractReflection #:nodoc:
+      delegate :foreign_key, :foreign_type, :association_foreign_key, :join_id_for,
+               :active_record_primary_key, :type, :get_join_keys, to: :source_reflection
+    end
+
+    class PolymorphicReflection < AbstractReflection # :nodoc:
+      delegate :klass, :scope, :plural_name, :type, :get_join_keys, :scope_for, to: :@reflection
+    end
+
     class RuntimeReflection < AbstractReflection # :nodoc:
       delegate :scope, :type, :constraints, :get_join_keys, :options, to: :@reflection
     end

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.22.3'
+  VERSION = '0.22.4'
 end

data/lib/generators/better_record/setup/templates/ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.22.3
+  version: 0.22.4
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2.1
+        version: 5.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2.1
+        version: 5.2.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement