store_base_sti_class 1.1.0 → 2.0.3

data/lib/store_base_sti_class_for_6_0.rb

@@ -0,0 +1,153 @@
+require 'active_record/associations/join_dependency/join_part'
+
+if ActiveRecord::VERSION::STRING =~ /^6\.0/
+  module ActiveRecord
+
+    class Base
+      class_attribute :store_base_sti_class
+      self.store_base_sti_class = true
+    end
+
+    module Inheritance
+      module ClassMethods
+        def polymorphic_name
+          ActiveRecord::Base.store_base_sti_class ? base_class.name : name
+        end
+      end
+    end
+
+    module Associations
+      class Preloader
+        class ThroughAssociation < Association
+          private
+
+          def through_scope
+            scope = through_reflection.klass.unscoped
+            options = reflection.options
+
+            if options[:source_type]
+
+              # BEGIN PATCH
+              # original:
+              # scope.where! reflection.foreign_type => options[:source_type]
+
+              adjusted_foreign_type =
+                if ActiveRecord::Base.store_base_sti_class
+                  options[:source_type]
+                else
+                  ([options[:source_type].constantize] + options[:source_type].constantize.descendants).map(&:to_s)
+                end
+
+              scope.where! reflection.foreign_type => adjusted_foreign_type
+              # END PATCH
+
+            elsif !reflection_scope.where_clause.empty?
+              scope.where_clause = reflection_scope.where_clause
+              values = reflection_scope.values
+
+              if includes = values[:includes]
+                scope.includes!(source_reflection.name => includes)
+              else
+                scope.includes!(source_reflection.name)
+              end
+
+              if values[:references] && !values[:references].empty?
+                scope.references!(values[:references])
+              else
+                scope.references!(source_reflection.table_name)
+              end
+
+              if joins = values[:joins]
+                scope.joins!(source_reflection.name => joins)
+              end
+
+              if left_outer_joins = values[:left_outer_joins]
+                scope.left_outer_joins!(source_reflection.name => left_outer_joins)
+              end
+
+              if scope.eager_loading? && order_values = values[:order]
+                scope = scope.order(order_values)
+              end
+            end
+
+            scope unless scope.empty_scope?
+          end
+        end
+      end
+
+      class AssociationScope
+        private
+
+        def next_chain_scope(scope, reflection, next_reflection)
+          join_keys = reflection.join_keys
+          key = join_keys.key
+          foreign_key = join_keys.foreign_key
+
+          table = reflection.aliased_table
+          foreign_table = next_reflection.aliased_table
+          constraint = table[key].eq(foreign_table[foreign_key])
+
+          if reflection.type
+            # BEGIN PATCH
+            # original:
+            # value = transform_value(next_reflection.klass.polymorphic_name)
+            # scope = apply_scope(scope, table, reflection.type, value)
+            if ActiveRecord::Base.store_base_sti_class
+              value = transform_value(next_reflection.klass.polymorphic_name)
+            else
+              klass = next_reflection.klass
+              value = ([klass] + klass.descendants).map(&:name)
+            end
+            scope = apply_scope(scope, table, reflection.type, value)
+            # END PATCH
+          end
+
+          scope.joins!(join(foreign_table, constraint))
+        end
+
+      end
+
+      class HasManyThroughAssociation
+        private
+
+        def build_through_record(record)
+          @through_records[record.object_id] ||= begin
+            ensure_mutable
+
+            attributes = through_scope_attributes
+            attributes[source_reflection.name] = record
+
+            # START PATCH
+            if ActiveRecord::Base.store_base_sti_class
+              attributes[source_reflection.foreign_type] = options[:source_type] if options[:source_type]
+            end
+            # END PATCH
+
+            through_association.build(attributes)
+          end
+        end
+      end
+    end
+
+    module Reflection
+      class PolymorphicReflection
+        def source_type_scope
+          type = @previous_reflection.foreign_type
+          source_type = @previous_reflection.options[:source_type]
+
+          # START PATCH
+          adjusted_source_type =
+            if ActiveRecord::Base.store_base_sti_class
+              source_type
+            else
+              ([source_type.constantize] + source_type.constantize.descendants).map(&:to_s)
+            end
+          # END PATCH
+
+          lambda { |object| where(type => adjusted_source_type) }
+        end
+      end
+    end
+  end
+
+end

data/lib/store_base_sti_class_for_6_1.rb

@@ -0,0 +1,156 @@
+require 'active_record/associations/join_dependency/join_part'
+
+if ActiveRecord::VERSION::STRING =~ /^6\.1/
+  module ActiveRecord
+
+    class Base
+      class_attribute :store_base_sti_class
+      self.store_base_sti_class = true
+    end
+
+    module Inheritance
+      module ClassMethods
+        def polymorphic_name
+          ActiveRecord::Base.store_base_sti_class ? base_class.name : name
+        end
+      end
+    end
+
+    module Associations
+      class Preloader
+        class ThroughAssociation < Association
+          private
+
+          def through_scope
+            scope = through_reflection.klass.unscoped
+            options = reflection.options
+
+            values = reflection_scope.values
+            if annotations = values[:annotate]
+              scope.annotate!(*annotations)
+            end
+
+            if options[:source_type]
+              # BEGIN PATCH
+              # original:
+              # scope.where! reflection.foreign_type => options[:source_type]
+
+              adjusted_foreign_type =
+                if ActiveRecord::Base.store_base_sti_class
+                  options[:source_type]
+                else
+                  ([options[:source_type].constantize] + options[:source_type].constantize.descendants).map(&:to_s)
+                end
+
+              scope.where! reflection.foreign_type => adjusted_foreign_type
+              # END PATCH
+
+            elsif !reflection_scope.where_clause.empty?
+              scope.where_clause = reflection_scope.where_clause
+
+              if includes = values[:includes]
+                scope.includes!(source_reflection.name => includes)
+              else
+                scope.includes!(source_reflection.name)
+              end
+
+              if values[:references] && !values[:references].empty?
+                scope.references_values |= values[:references]
+              else
+                scope.references!(source_reflection.table_name)
+              end
+
+              if joins = values[:joins]
+                scope.joins!(source_reflection.name => joins)
+              end
+
+              if left_outer_joins = values[:left_outer_joins]
+                scope.left_outer_joins!(source_reflection.name => left_outer_joins)
+              end
+
+              if scope.eager_loading? && order_values = values[:order]
+                scope = scope.order(order_values)
+              end
+            end
+
+            scope
+          end
+        end
+      end
+
+      class AssociationScope
+        private
+
+        def next_chain_scope(scope, reflection, next_reflection)
+          primary_key = reflection.join_primary_key
+          foreign_key = reflection.join_foreign_key
+
+          table = reflection.aliased_table
+          foreign_table = next_reflection.aliased_table
+          constraint = table[primary_key].eq(foreign_table[foreign_key])
+
+          if reflection.type
+            # BEGIN PATCH
+            # original:
+            # value = transform_value(next_reflection.klass.polymorphic_name)
+            # scope = apply_scope(scope, table, reflection.type, value)
+
+            if ActiveRecord::Base.store_base_sti_class
+              value = transform_value(next_reflection.klass.polymorphic_name)
+            else
+              klass = next_reflection.klass
+              value = ([klass] + klass.descendants).map(&:name)
+            end
+            scope = apply_scope(scope, table, reflection.type, value)
+            # END PATCH
+          end
+
+          scope.joins!(join(foreign_table, constraint))
+        end
+
+      end
+
+      class HasManyThroughAssociation
+        private
+
+        def build_through_record(record)
+          @through_records[record.object_id] ||= begin
+            ensure_mutable
+
+            attributes = through_scope_attributes
+            attributes[source_reflection.name] = record
+
+            # START PATCH
+            if ActiveRecord::Base.store_base_sti_class
+              attributes[source_reflection.foreign_type] = options[:source_type] if options[:source_type]
+            end
+            # END PATCH
+
+            through_association.build(attributes)
+          end
+        end
+      end
+    end
+
+    module Reflection
+      class PolymorphicReflection
+        def source_type_scope
+          type = @previous_reflection.foreign_type
+          source_type = @previous_reflection.options[:source_type]
+
+          # START PATCH
+          adjusted_source_type =
+            if ActiveRecord::Base.store_base_sti_class
+              source_type
+            else
+              ([source_type.constantize] + source_type.constantize.descendants).map(&:to_s)
+            end
+          # END PATCH
+
+          lambda { |object| where(type => adjusted_source_type) }
+        end
+      end
+    end
+  end
+
+end

data/store_base_sti_class.gemspec

@@ -20,11 +20,10 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/appfolio/store_base_sti_class'
   s.licenses = ['MIT']
   s.rubygems_version = '2.2.2'
-  s.summary = 'Modifies ActiveRecord 4.0.x - 5.0.x with the ability to store the actual class (instead of the base class) in polymorhic _type columns when using STI'
+  s.summary = 'Modifies ActiveRecord 4.2.x - 6.0.x with the ability to store the actual class (instead of the base class) in polymorhic _type columns when using STI'
 
   s.add_runtime_dependency(%q<activerecord>, ['>= 4.0'])
   s.add_development_dependency(%q<minitest>, ['>= 4.0'])
-  s.add_development_dependency(%q<sqlite3>, ['>= 0'])
   s.add_development_dependency(%q<appraisal>, ['>= 0'])
   s.add_development_dependency(%q<bundler>, ['>= 0'])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_base_sti_class
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.3
 platform: ruby
 authors:
 - AppFolio
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -94,173 +80,29 @@ extra_rdoc_files:
 files:
 - Appraisals
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- debug.log
-- gemfiles/rails_3.0.10.gemfile.lock
-- gemfiles/rails_3.0.11.gemfile.lock
-- gemfiles/rails_3.0.12.gemfile.lock
-- gemfiles/rails_3.0.13.gemfile.lock
-- gemfiles/rails_3.0.14.gemfile.lock
-- gemfiles/rails_3.0.15.gemfile.lock
-- gemfiles/rails_3.0.16.gemfile.lock
-- gemfiles/rails_3.0.17.gemfile.lock
-- gemfiles/rails_3.0.18.gemfile.lock
-- gemfiles/rails_3.0.19.gemfile.lock
-- gemfiles/rails_3.0.20.gemfile.lock
-- gemfiles/rails_3.0.5.gemfile.lock
-- gemfiles/rails_3.0.6.gemfile.lock
-- gemfiles/rails_3.0.7.gemfile.lock
-- gemfiles/rails_3.0.8.gemfile.lock
-- gemfiles/rails_3.0.9.gemfile.lock
-- gemfiles/rails_3.1.0.gemfile.lock
-- gemfiles/rails_3.1.10.gemfile.lock
-- gemfiles/rails_3.1.11.gemfile.lock
-- gemfiles/rails_3.1.12.gemfile.lock
-- gemfiles/rails_3.1.2.gemfile.lock
-- gemfiles/rails_3.1.3.gemfile.lock
-- gemfiles/rails_3.1.4.gemfile.lock
-- gemfiles/rails_3.1.5.gemfile.lock
-- gemfiles/rails_3.1.6.gemfile.lock
-- gemfiles/rails_3.1.7.gemfile.lock
-- gemfiles/rails_3.1.8.gemfile.lock
-- gemfiles/rails_3.1.9.gemfile.lock
-- gemfiles/rails_3.2.0.gemfile.lock
-- gemfiles/rails_3.2.1.gemfile.lock
-- gemfiles/rails_3.2.10.gemfile.lock
-- gemfiles/rails_3.2.11.gemfile.lock
-- gemfiles/rails_3.2.12.gemfile.lock
-- gemfiles/rails_3.2.13.gemfile.lock
-- gemfiles/rails_3.2.14.gemfile.lock
-- gemfiles/rails_3.2.15.gemfile.lock
-- gemfiles/rails_3.2.16.gemfile.lock
-- gemfiles/rails_3.2.17.gemfile.lock
-- gemfiles/rails_3.2.18.gemfile.lock
-- gemfiles/rails_3.2.19.gemfile.lock
-- gemfiles/rails_3.2.2.gemfile.lock
-- gemfiles/rails_3.2.20.gemfile.lock
-- gemfiles/rails_3.2.21.gemfile.lock
-- gemfiles/rails_3.2.22.gemfile.lock
-- gemfiles/rails_3.2.3.gemfile.lock
-- gemfiles/rails_3.2.4.gemfile.lock
-- gemfiles/rails_3.2.5.gemfile.lock
-- gemfiles/rails_3.2.6.gemfile.lock
-- gemfiles/rails_3.2.7.gemfile.lock
-- gemfiles/rails_3.2.8.gemfile.lock
-- gemfiles/rails_3.2.9.gemfile.lock
-- gemfiles/rails_4.0.0.gemfile
-- gemfiles/rails_4.0.0.gemfile.lock
-- gemfiles/rails_4.0.1.gemfile
-- gemfiles/rails_4.0.1.gemfile.lock
-- gemfiles/rails_4.0.10.gemfile
-- gemfiles/rails_4.0.10.gemfile.lock
-- gemfiles/rails_4.0.11.1.gemfile
-- gemfiles/rails_4.0.11.1.gemfile.lock
-- gemfiles/rails_4.0.11.gemfile
-- gemfiles/rails_4.0.11.gemfile.lock
-- gemfiles/rails_4.0.12.gemfile
-- gemfiles/rails_4.0.12.gemfile.lock
-- gemfiles/rails_4.0.13.gemfile
-- gemfiles/rails_4.0.13.gemfile.lock
-- gemfiles/rails_4.0.2.gemfile
-- gemfiles/rails_4.0.2.gemfile.lock
-- gemfiles/rails_4.0.3.gemfile
-- gemfiles/rails_4.0.3.gemfile.lock
-- gemfiles/rails_4.0.4.gemfile
-- gemfiles/rails_4.0.4.gemfile.lock
-- gemfiles/rails_4.0.5.gemfile
-- gemfiles/rails_4.0.5.gemfile.lock
-- gemfiles/rails_4.0.6.gemfile
-- gemfiles/rails_4.0.6.gemfile.lock
-- gemfiles/rails_4.0.7.gemfile
-- gemfiles/rails_4.0.7.gemfile.lock
-- gemfiles/rails_4.0.8.gemfile
-- gemfiles/rails_4.0.8.gemfile.lock
-- gemfiles/rails_4.0.9.gemfile
-- gemfiles/rails_4.0.9.gemfile.lock
-- gemfiles/rails_4.1.0.gemfile
-- gemfiles/rails_4.1.0.gemfile.lock
-- gemfiles/rails_4.1.1.gemfile
-- gemfiles/rails_4.1.1.gemfile.lock
-- gemfiles/rails_4.1.10.gemfile
-- gemfiles/rails_4.1.10.gemfile.lock
-- gemfiles/rails_4.1.11.gemfile
-- gemfiles/rails_4.1.11.gemfile.lock
-- gemfiles/rails_4.1.12.gemfile
-- gemfiles/rails_4.1.12.gemfile.lock
-- gemfiles/rails_4.1.13.gemfile
-- gemfiles/rails_4.1.13.gemfile.lock
-- gemfiles/rails_4.1.14.1.gemfile
-- gemfiles/rails_4.1.14.1.gemfile.lock
-- gemfiles/rails_4.1.14.2.gemfile
-- gemfiles/rails_4.1.14.2.gemfile.lock
-- gemfiles/rails_4.1.14.gemfile
-- gemfiles/rails_4.1.14.gemfile.lock
-- gemfiles/rails_4.1.15.gemfile
-- gemfiles/rails_4.1.15.gemfile.lock
-- gemfiles/rails_4.1.2.gemfile
-- gemfiles/rails_4.1.2.gemfile.lock
-- gemfiles/rails_4.1.3.gemfile
-- gemfiles/rails_4.1.3.gemfile.lock
-- gemfiles/rails_4.1.4.gemfile
-- gemfiles/rails_4.1.4.gemfile.lock
-- gemfiles/rails_4.1.5.gemfile
-- gemfiles/rails_4.1.5.gemfile.lock
-- gemfiles/rails_4.1.6.gemfile
-- gemfiles/rails_4.1.6.gemfile.lock
-- gemfiles/rails_4.1.7.1.gemfile
-- gemfiles/rails_4.1.7.1.gemfile.lock
-- gemfiles/rails_4.1.7.gemfile
-- gemfiles/rails_4.1.7.gemfile.lock
-- gemfiles/rails_4.1.8.gemfile
-- gemfiles/rails_4.1.8.gemfile.lock
-- gemfiles/rails_4.1.9.gemfile
-- gemfiles/rails_4.1.9.gemfile.lock
-- gemfiles/rails_4.2.0.gemfile
-- gemfiles/rails_4.2.0.gemfile.lock
-- gemfiles/rails_4.2.1.gemfile
-- gemfiles/rails_4.2.1.gemfile.lock
-- gemfiles/rails_4.2.2.gemfile
-- gemfiles/rails_4.2.2.gemfile.lock
-- gemfiles/rails_4.2.3.gemfile
-- gemfiles/rails_4.2.3.gemfile.lock
-- gemfiles/rails_4.2.4.gemfile
-- gemfiles/rails_4.2.4.gemfile.lock
-- gemfiles/rails_4.2.5.1.gemfile
-- gemfiles/rails_4.2.5.1.gemfile.lock
-- gemfiles/rails_4.2.5.2.gemfile
-- gemfiles/rails_4.2.5.2.gemfile.lock
-- gemfiles/rails_4.2.5.gemfile
-- gemfiles/rails_4.2.5.gemfile.lock
-- gemfiles/rails_4.2.6.gemfile
-- gemfiles/rails_4.2.6.gemfile.lock
-- gemfiles/rails_4.2.7.1.gemfile
-- gemfiles/rails_4.2.7.gemfile
-- gemfiles/rails_4.2.8.gemfile
-- gemfiles/rails_5.0.0.1.gemfile
-- gemfiles/rails_5.0.0.gemfile
-- gemfiles/rails_5.0.1.gemfile
-- gemfiles/rails_5.0.1.gemfile.lock
-- gemfiles/rails_5.0.2.gemfile
-- gemfiles/rails_5.0.3.gemfile
-- gemfiles/rails_5.1.0.gemfile
-- gemfiles/rails_5.1.1.gemfile
+- gemfiles/rails_5.0.7.gemfile
+- gemfiles/rails_5.1.7.gemfile
+- gemfiles/rails_5.2.3.gemfile
+- gemfiles/rails_5.2.4.gemfile
+- gemfiles/rails_5.2.5.gemfile
+- gemfiles/rails_6.0.3.gemfile
+- gemfiles/rails_6.1.0.gemfile
 - lib/store_base_sti_class.rb
 - lib/store_base_sti_class/version.rb
-- lib/store_base_sti_class_for_4_0.rb
-- lib/store_base_sti_class_for_4_1.rb
-- lib/store_base_sti_class_for_4_2.rb
 - lib/store_base_sti_class_for_5_0.rb
 - lib/store_base_sti_class_for_5_1.rb
+- lib/store_base_sti_class_for_5_2.rb
+- lib/store_base_sti_class_for_6_0.rb
+- lib/store_base_sti_class_for_6_1.rb
 - store_base_sti_class.gemspec
-- storebasestiname_unittest.sql
 homepage: http://github.com/appfolio/store_base_sti_class
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -275,10 +117,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
-summary: Modifies ActiveRecord 4.0.x - 5.0.x with the ability to store the actual
+summary: Modifies ActiveRecord 4.2.x - 6.0.x with the ability to store the actual
   class (instead of the base class) in polymorhic _type columns when using STI
 test_files: []