store_base_sti_class 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a8f045c90c480e658eb8ac2a877d4bfb31fd01c
-  data.tar.gz: 9f1e796ef7836c594fea2e9a107939771e2669dd
+  metadata.gz: 82287e5bc596474535ed2f815cb34cbfe2abb089
+  data.tar.gz: 3f1999f09ccaa5f380cb4230f4cba6eb81c2dc2e
 SHA512:
-  metadata.gz: 39a2df8993be2a04d27b318dadd3d3bc23005c418828e587592f67946b2c144caebe0101606f722b196537a654d648d332e16ddc58a30504c132aec176fd7cf7
-  data.tar.gz: a901606a746a6c093e0086a5886d101099ae4d8a5aefca9f27cc6c5eeb99cfbd093b60192fc309f0094dafff3ff53ac405c0ccdf2f2d29522b84ee41b4124d6b
+  metadata.gz: fccef96be8809df757d5936781d2fe4811b5d4fd56d5b53fd026448c35d86288f4c10327b1562b4478e360f7e38f2c8406a7b3995b2364ffff05cfaf231b8d00
+  data.tar.gz: 94e2b0a7c09cfcd051f791077636c9d0301687cd713ce0d899efc39994fbf07e5604e9f38a3ecd02ec008774f43694f5ed354103983e193fc1d7e0f25bade606

data/Appraisals

@@ -44,9 +44,14 @@ RAILS_VERSIONS = %w(
   4.2.6
   4.2.7
   4.2.7.1
+  4.2.8
   5.0.0
   5.0.0.1
   5.0.1
+  5.0.2
+  5.0.3
+  5.1.0
+  5.1.1
 )
 
 RAILS_VERSIONS.each do |version|

data/Gemfile.lock

@@ -1,39 +1,36 @@
 PATH
   remote: .
   specs:
-    store_base_sti_class (1.0.0)
+    store_base_sti_class (1.1.0)
       activerecord (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
-      builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
-      arel (~> 6.0)
-    activesupport (4.2.6)
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (6.0.4)
-    builder (3.2.3)
-    i18n (0.8.0)
-    json (1.8.6)
+    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)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -45,3 +42,6 @@ DEPENDENCIES
   minitest (>= 4.0)
   sqlite3
   store_base_sti_class!
+
+BUNDLED WITH
+   1.14.6

data/gemfiles/rails_4.2.8.gemfile

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

data/gemfiles/rails_5.0.2.gemfile

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

data/gemfiles/rails_5.0.3.gemfile

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

data/gemfiles/rails_5.1.0.gemfile

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

data/gemfiles/rails_5.1.1.gemfile

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

data/lib/store_base_sti_class/version.rb

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

data/lib/store_base_sti_class.rb

@@ -8,6 +8,8 @@ elsif ActiveRecord::VERSION::STRING =~ /^4\.2/
   require 'store_base_sti_class_for_4_2'
 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'
 end
 
 module StoreBaseSTIClass

data/lib/store_base_sti_class_for_5_1.rb

@@ -0,0 +1,351 @@
+require 'active_record/associations/join_dependency/join_part'
+
+if ActiveRecord::VERSION::STRING =~ /^5\.1/
+  module ActiveRecord
+
+    class Base
+      class_attribute :store_base_sti_class
+      self.store_base_sti_class = true
+    end
+
+    module Associations
+      class Association
+        private
+
+        def creation_attributes
+          attributes = {}
+
+          if (reflection.has_one? || reflection.collection?) && !options[:through]
+            attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key]
+
+            if reflection.options[:as]
+              # START PATCH
+              # original:
+              # attributes[reflection.type] = owner.class.base_class.name
+
+              attributes[reflection.type] = ActiveRecord::Base.store_base_sti_class ? owner.class.base_class.name : owner.class.name
+              # END PATCH
+            end
+          end
+
+          attributes
+        end
+      end
+
+      class JoinDependency # :nodoc:
+        class JoinAssociation < JoinPart # :nodoc:
+          def join_constraints(foreign_table, foreign_klass, join_type, tables, chain)
+            joins         = []
+            binds         = []
+            tables        = tables.reverse
+
+            # The chain starts with the target table, but we want to end with it here (makes
+            # more sense in this context), so we reverse
+            chain.reverse_each do |reflection|
+              table = tables.shift
+              klass = reflection.klass
+
+              join_keys   = reflection.join_keys
+              key         = join_keys.key
+              foreign_key = join_keys.foreign_key
+
+              constraint = build_constraint(klass, table, key, foreign_table, foreign_key)
+
+              predicate_builder = PredicateBuilder.new(TableMetadata.new(klass, table))
+              scope_chain_items = reflection.join_scopes(table, predicate_builder)
+              klass_scope       = reflection.klass_join_scope(table, predicate_builder)
+
+              scope_chain_items.concat [klass_scope].compact
+
+              rel = scope_chain_items.inject(scope_chain_items.shift) do |left, right|
+                left.merge right
+              end
+
+              if rel && !rel.arel.constraints.empty?
+                binds += rel.bound_attributes
+                constraint = constraint.and rel.arel.constraints
+              end
+
+              if reflection.type
+                # START PATCH
+                # original:
+                # value = foreign_klass.base_class.name
+                value = ActiveRecord::Base.store_base_sti_class ? foreign_klass.base_class.name : foreign_klass.name
+                # END PATCH
+                column = klass.columns_hash[reflection.type.to_s]
+
+                binds << Relation::QueryAttribute.new(column.name, value, klass.type_for_attribute(column.name))
+                constraint = constraint.and klass.arel_attribute(reflection.type, table).eq(Arel::Nodes::BindParam.new)
+              end
+
+              joins << table.create_join(table, table.create_on(constraint), join_type)
+
+              # The current table in this iteration becomes the foreign table in the next
+              foreign_table, foreign_klass = table, klass
+            end
+
+            JoinInformation.new joins, binds
+          end
+        end
+      end
+
+      class BelongsToPolymorphicAssociation
+        private
+
+        def replace_keys(record)
+          super
+
+          # START PATCH
+          # original:
+          # owner[reflection.foreign_type] = record.class.base_class.name
+
+          owner[reflection.foreign_type] = ActiveRecord::Base.store_base_sti_class ? record.class.base_class.name : record.class.name
+
+          # END PATCH
+        end
+      end
+
+      class Preloader
+        class Association
+          private
+
+          def build_scope
+            scope = klass.unscoped
+
+            values = reflection_scope.values
+            preload_values = preload_scope.values
+
+            scope.where_clause = reflection_scope.where_clause + preload_scope.where_clause
+            scope.references_values = Array(values[:references]) + Array(preload_values[:references])
+
+            if preload_values[:select] || values[:select]
+              scope._select!(preload_values[:select] || values[:select])
+            end
+            scope.includes! preload_values[:includes] || values[:includes]
+            if preload_scope.joins_values.any?
+              scope.joins!(preload_scope.joins_values)
+            else
+              scope.joins!(reflection_scope.joins_values)
+            end
+
+            if order_values = preload_values[:order] || values[:order]
+              scope.order!(order_values)
+            end
+
+            if preload_values[:reordering] || values[:reordering]
+              scope.reordering_value = true
+            end
+
+            if preload_values[:readonly] || values[:readonly]
+              scope.readonly!
+            end
+
+            if options[:as]
+              # START PATCH
+              # original:
+              # scope.where!(klass.table_name => { reflection.type => model.base_class.sti_name })
+
+              scope.where!(klass.table_name => { reflection.type => ActiveRecord::Base.store_base_sti_class ? model.base_class.sti_name : model.sti_name })
+
+              # END PATCH
+            end
+
+            scope.unscope_values = Array(values[:unscope]) + Array(preload_values[:unscope])
+            klass.default_scoped.merge(scope)
+          end
+        end
+
+        module ThroughAssociation
+          private
+
+          def through_scope
+            scope = through_reflection.klass.unscoped
+
+            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
+            else
+              unless reflection_scope.where_clause.empty?
+                scope.includes_values = Array(reflection_scope.values[:includes] || options[:source])
+                scope.where_clause = reflection_scope.where_clause
+              end
+
+              scope.references! reflection_scope.values[:references]
+              if scope.eager_loading? && order_values = reflection_scope.values[:order]
+                scope = scope.order(order_values)
+              end
+            end
+
+            scope
+          end
+        end
+      end
+
+      class AssociationScope
+
+        def self.get_bind_values(owner, chain)
+          binds = []
+          last_reflection = chain.last
+
+          binds << last_reflection.join_id_for(owner)
+          if last_reflection.type
+            # START PATCH
+            # original: binds << owner.class.base_class.name
+            binds << (ActiveRecord::Base.store_base_sti_class ? owner.class.base_class.name : owner.class.name)
+            # END PATCH
+          end
+
+          chain.each_cons(2).each do |reflection, next_reflection|
+            if reflection.type
+              # START PATCH
+              # original: binds << next_reflection.klass.base_class.name
+              binds << (ActiveRecord::Base.store_base_sti_class ? next_reflection.klass.base_class.name : next_reflection.klass.name)
+              # END PATCH
+            end
+          end
+          binds
+        end
+
+        private
+
+        def next_chain_scope(scope, table, reflection, foreign_table, next_reflection)
+          join_keys = reflection.join_keys
+          key = join_keys.key
+          foreign_key = join_keys.foreign_key
+
+          constraint = table[key].eq(foreign_table[foreign_key])
+
+          if reflection.type
+            # BEGIN PATCH
+            # original:
+            # value = transform_value(next_reflection.klass.base_class.name)
+            # scope = scope.where(table.name => { reflection.type => value })
+            if ActiveRecord::Base.store_base_sti_class
+              value = transform_value(next_reflection.klass.base_class.name)
+            else
+              klass = next_reflection.klass
+              value = ([klass] + klass.descendants).map(&:name)
+            end
+            scope = scope.where(table.name => { reflection.type => value })
+            # END PATCH
+          end
+
+          scope = scope.joins(join(foreign_table, constraint))
+        end
+
+        def last_chain_scope(scope, table, reflection, owner)
+          join_keys = reflection.join_keys
+          key = join_keys.key
+          foreign_key = join_keys.foreign_key
+
+          value = transform_value(owner[foreign_key])
+          scope = scope.where(table.name => { key => value })
+
+          if reflection.type
+            # BEGIN PATCH
+            # polymorphic_type = transform_value(owner.class.base_class.name)
+            polymorphic_type = transform_value(ActiveRecord::Base.store_base_sti_class ? owner.class.base_class.name : owner.class.name)
+            # END PATCH
+            scope = scope.where(table.name => { reflection.type => polymorphic_type })
+          end
+
+          scope
+        end
+
+      end
+
+      module ThroughAssociation
+        private
+
+        def construct_join_attributes(*records)
+          ensure_mutable
+
+          if source_reflection.association_primary_key(reflection.klass) == reflection.klass.primary_key
+            join_attributes = { source_reflection.name => records }
+          else
+            join_attributes = {
+              source_reflection.foreign_key =>
+                records.map { |record|
+                  record.send(source_reflection.association_primary_key(reflection.klass))
+                }
+            }
+          end
+
+          if options[:source_type]
+
+            # START PATCH
+            # original:
+            # join_attributes[source_reflection.foreign_type] =
+            #  records.map { |record| record.class.base_class.name }
+
+            join_attributes[source_reflection.foreign_type] =
+              records.map { |record| ActiveRecord::Base.store_base_sti_class ? record.class.base_class.name : record.class.name }
+
+            # END PATCH
+          end
+
+          if records.count == 1
+            Hash[join_attributes.map { |k, v| [k, v.first] }]
+          else
+            join_attributes
+          end
+        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_info
+          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.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - AppFolio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -238,16 +238,22 @@ files:
 - 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
 - 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
 - store_base_sti_class.gemspec
 - storebasestiname_unittest.sql
 homepage: http://github.com/appfolio/store_base_sti_class
@@ -270,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Modifies ActiveRecord 4.0.x - 5.0.x with the ability to store the actual