store_base_sti_class 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82287e5bc596474535ed2f815cb34cbfe2abb089
-  data.tar.gz: 3f1999f09ccaa5f380cb4230f4cba6eb81c2dc2e
+  metadata.gz: aabffbc0536524e6c2a17e341a8959ce740b8c46
+  data.tar.gz: f9d1c2edbd97b6e0971abcb5eb0b567ec0c0350b
 SHA512:
-  metadata.gz: fccef96be8809df757d5936781d2fe4811b5d4fd56d5b53fd026448c35d86288f4c10327b1562b4478e360f7e38f2c8406a7b3995b2364ffff05cfaf231b8d00
-  data.tar.gz: 94e2b0a7c09cfcd051f791077636c9d0301687cd713ce0d899efc39994fbf07e5604e9f38a3ecd02ec008774f43694f5ed354103983e193fc1d7e0f25bade606
+  metadata.gz: 25f4895ee9da5799f5ba11d65dc831c7c8fdfe07ce169eb74c471a50345674028bb57d8e15e8a56a37e71d18d365a4b457ea3f03d57111a2b3561915ce935607
+  data.tar.gz: 9cab2026fa30b27d2901ad0574d0cf478405dce07068298a7f77f595959dd17dcba8c66936c3125a7822ee1b58e2af168ba5e2aad359cf71704456b1a9bd5717

data/Appraisals

@@ -45,13 +45,23 @@ RAILS_VERSIONS = %w(
   4.2.7
   4.2.7.1
   4.2.8
+  4.2.9
+  4.2.10
   5.0.0
   5.0.0.1
   5.0.1
   5.0.2
   5.0.3
+  5.0.4
+  5.0.5
+  5.0.6
   5.1.0
   5.1.1
+  5.1.2
+  5.1.3
+  5.1.4
+  5.1.5
+  5.2.0
 )
 
 RAILS_VERSIONS.each do |version|

data/Gemfile.lock

@@ -7,30 +7,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
       arel (~> 8.0)
-    activesupport (5.1.1)
+    activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.1.0)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (8.0.0)
     concurrent-ruby (1.0.5)
-    i18n (0.8.1)
-    minitest (5.8.4)
-    rake (11.1.2)
-    sqlite3 (1.3.11)
-    thor (0.19.1)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.1)
+    rake (12.3.1)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -44,4 +45,4 @@ DEPENDENCIES
   store_base_sti_class!
 
 BUNDLED WITH
-   1.14.6
+   1.16.1

data/gemfiles/rails_4.2.10.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "4.2.10"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.9.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "4.2.9"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.0.4"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.0.5"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.6.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.0.6"
+
+gemspec :path => "../"

data/gemfiles/rails_5.1.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.1.2"
+
+gemspec :path => "../"

data/gemfiles/rails_5.1.3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.1.3"
+
+gemspec :path => "../"

data/gemfiles/rails_5.1.4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.1.4"
+
+gemspec :path => "../"

data/gemfiles/rails_5.1.5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.1.5"
+
+gemspec :path => "../"

data/gemfiles/rails_5.2.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.2.0"
+
+gemspec :path => "../"

data/lib/store_base_sti_class.rb

@@ -10,6 +10,8 @@ elsif ActiveRecord::VERSION::STRING =~ /^5\.0/
   require 'store_base_sti_class_for_5_0'
 elsif ActiveRecord::VERSION::STRING =~ /^5\.1/
   require 'store_base_sti_class_for_5_1'
+elsif ActiveRecord::VERSION::STRING =~ /^5\.2/
+  require 'store_base_sti_class_for_5_2'
 end
 
 module StoreBaseSTIClass

data/lib/store_base_sti_class/version.rb

@@ -1,3 +1,3 @@
 module StoreBaseSTIClass
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/lib/store_base_sti_class_for_5_2.rb

@@ -0,0 +1,155 @@
+require 'active_record/associations/join_dependency/join_part'
+
+if ActiveRecord::VERSION::STRING =~ /^5\.2/
+  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
+
+            through_record = through_association.build(*options_for_through_record)
+            through_record.send("#{source_reflection.name}=", record)
+
+            # START PATCH
+            if ActiveRecord::Base.store_base_sti_class
+              if options[:source_type]
+                through_record.send("#{source_reflection.foreign_type}=", options[:source_type])
+              end
+            end
+            # END PATCH
+
+            through_record
+          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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_base_sti_class
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - AppFolio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -98,155 +98,69 @@ files:
 - 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.10.gemfile
 - 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_4.2.9.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.0.4.gemfile
+- gemfiles/rails_5.0.5.gemfile
+- gemfiles/rails_5.0.6.gemfile
 - gemfiles/rails_5.1.0.gemfile
 - gemfiles/rails_5.1.1.gemfile
+- gemfiles/rails_5.1.2.gemfile
+- gemfiles/rails_5.1.3.gemfile
+- gemfiles/rails_5.1.4.gemfile
+- gemfiles/rails_5.1.5.gemfile
+- gemfiles/rails_5.2.0.gemfile
 - lib/store_base_sti_class.rb
 - lib/store_base_sti_class/version.rb
 - lib/store_base_sti_class_for_4_0.rb
@@ -254,8 +168,9 @@ files:
 - 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
+- store_base_sti_class-1.1.0.gem
 - store_base_sti_class.gemspec
-- storebasestiname_unittest.sql
 homepage: http://github.com/appfolio/store_base_sti_class
 licenses:
 - MIT
@@ -276,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Modifies ActiveRecord 4.0.x - 5.0.x with the ability to store the actual