store_base_sti_class 0.3.0 → 0.4.0

data/gemfiles/rails_4.2.3.gemfile.lock

@@ -0,0 +1,51 @@
+PATH
+  remote: ../
+  specs:
+    store_base_sti_class (0.3.0)
+      activerecord (>= 3.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
+      builder (~> 3.1)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
+      arel (~> 6.0)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.2)
+    builder (3.2.2)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.7.0)
+    rake (10.4.2)
+    sqlite3 (1.3.10)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 4.2.3)
+  appraisal
+  bundler
+  minitest (>= 4.0)
+  sqlite3
+  store_base_sti_class!
+
+BUNDLED WITH
+   1.10.5

data/lib/store_base_sti_class/version.rb

@@ -1,3 +1,3 @@
 module StoreBaseSTIClass
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/store_base_sti_class.rb

@@ -8,6 +8,8 @@ elsif ActiveRecord::VERSION::STRING =~ /^4\.0/
   require 'store_base_sti_class_for_4_0'
 elsif ActiveRecord::VERSION::STRING =~ /^4\.1/
   require 'store_base_sti_class_for_4_1'
+elsif ActiveRecord::VERSION::STRING =~ /^4\.2/
+  require 'store_base_sti_class_for_4_2'
 end
 
 module StoreBaseSTIClass

data/lib/store_base_sti_class_for_3_0.rb

@@ -467,4 +467,4 @@ module ActiveRecord
   end
 end
 
-end
+end

data/lib/store_base_sti_class_for_4_2.rb

@@ -0,0 +1,271 @@
+if ActiveRecord::VERSION::STRING =~ /^4\.2/
+  module ActiveRecord
+
+    class Base
+      class_attribute :store_base_sti_class
+      self.store_base_sti_class = true
+    end
+
+    module Associations
+      class Association
+
+        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 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
+
+          def build_scope
+            scope = klass.unscoped
+
+            values         = reflection_scope.values
+            reflection_binds = reflection_scope.bind_values
+            preload_values = preload_scope.values
+            preload_binds  = preload_scope.bind_values
+
+            scope.where_values      = Array(values[:where])      + Array(preload_values[:where])
+            scope.references_values = Array(values[:references]) + Array(preload_values[:references])
+            scope.bind_values       = (reflection_binds + preload_binds)
+
+            scope._select!   preload_values[:select] || values[:select] || table[Arel.star]
+            scope.includes! preload_values[:includes] || values[:includes]
+            scope.joins! preload_values[:joins] || values[:joins]
+            scope.order! preload_values[:order] || values[:order]
+
+            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])
+            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_values.empty?
+                scope.includes_values = Array(reflection_scope.values[:includes] || options[:source])
+                scope.where_values    = reflection_scope.values[:where]
+                scope.bind_values     = reflection_scope.bind_values
+              end
+
+              scope.references! reflection_scope.values[:references]
+              scope = scope.order reflection_scope.values[:order] if scope.eager_loading?
+            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
+
+        def next_chain_scope(scope, table, reflection, tracker, assoc_klass, foreign_table, next_reflection)
+          join_keys = reflection.join_keys(assoc_klass)
+          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    = next_reflection.klass.base_class.name
+            # bind_val = bind scope, table.table_name, reflection.type, value, tracker
+            # scope    = scope.where(table[reflection.type].eq(bind_val))
+            if ActiveRecord::Base.store_base_sti_class
+              value    = next_reflection.klass.base_class.name
+              bind_val = bind scope, table.table_name, reflection.type, value, tracker
+              scope    = scope.where(table[reflection.type].eq(bind_val))
+            else
+              value    = next_reflection.klass.name
+              klass    = next_reflection.klass
+              scope    = scope.where(table[reflection.type].in(([klass] + klass.descendants).map(&:name)))
+            end
+            # END PATCH
+            
+          end
+
+          scope = scope.joins(join(foreign_table, constraint))
+        end
+
+        def last_chain_scope(scope, table, reflection, owner, tracker, assoc_klass)
+          join_keys = reflection.join_keys(assoc_klass)
+          key = join_keys.key
+          foreign_key = join_keys.foreign_key
+
+          bind_val = bind scope, table.table_name, key.to_s, owner[foreign_key], tracker
+          scope    = scope.where(table[key].eq(bind_val))
+
+          if reflection.type
+            # BEGIN PATCH
+            # original: owner.class.base_class.name
+            value    = ActiveRecord::Base.store_base_sti_class ? owner.class.base_class.name : owner.class.name
+            # END PATCH
+            bind_val = bind scope, table.table_name, reflection.type, value, tracker
+            scope    = scope.where(table[reflection.type].eq(bind_val))
+          else
+            scope
+          end
+        end
+        
+      end
+
+      module ThroughAssociation
+        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
+
+    end
+
+    module Reflection
+      class ThroughReflection
+        def scope_chain
+          @scope_chain ||= begin
+            scope_chain = source_reflection.scope_chain.map(&:dup)
+
+            # Add to it the scope from this reflection (if any)
+            scope_chain.first << scope if scope
+
+            through_scope_chain = through_reflection.scope_chain.map(&:dup)
+
+            if options[:source_type]
+              type = foreign_type
+              # START PATCH
+              # original: source_type = options[:source_type]
+              source_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
+              # END PATCH
+              through_scope_chain.first << lambda { |object|
+                where(type => source_type)
+              }
+            end
+
+            # Recursively fill out the rest of the array from the through reflection
+            scope_chain + through_scope_chain
+          end
+        end
+      end
+
+    end
+  end
+
+end

data/store_base_sti_class.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |s|
   s.email = "andrew.mutz@appfolio.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = Dir['**/*'].reject{ |f| f[%r{^pkg/}] || f[%r{^test/}] }
 
   s.homepage = "http://github.com/appfolio/store_base_sti_class"
   s.licenses = ["MIT"]
   s.rubygems_version = "2.2.2"
-  s.summary = "Modifies ActiveRecord 3.0.5 - 4.0.1 with the ability to store the actual class (instead of the base class) in polymorhic _type columns when using STI"
+  s.summary = "Modifies ActiveRecord 3.0.5 - 4.2.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>, [">= 3.0.5"])
   s.add_development_dependency(%q<minitest>, [">= 4.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_base_sti_class
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Andrew Mutz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -90,99 +90,190 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - Appraisals
-- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - debug.log
 - gemfiles/rails_3.0.10.gemfile
+- gemfiles/rails_3.0.10.gemfile.lock
 - gemfiles/rails_3.0.11.gemfile
+- gemfiles/rails_3.0.11.gemfile.lock
 - gemfiles/rails_3.0.12.gemfile
+- gemfiles/rails_3.0.12.gemfile.lock
 - gemfiles/rails_3.0.13.gemfile
+- gemfiles/rails_3.0.13.gemfile.lock
 - gemfiles/rails_3.0.14.gemfile
+- gemfiles/rails_3.0.14.gemfile.lock
 - gemfiles/rails_3.0.15.gemfile
+- gemfiles/rails_3.0.15.gemfile.lock
 - gemfiles/rails_3.0.16.gemfile
+- gemfiles/rails_3.0.16.gemfile.lock
 - gemfiles/rails_3.0.17.gemfile
+- gemfiles/rails_3.0.17.gemfile.lock
 - gemfiles/rails_3.0.18.gemfile
+- gemfiles/rails_3.0.18.gemfile.lock
 - gemfiles/rails_3.0.19.gemfile
+- gemfiles/rails_3.0.19.gemfile.lock
 - gemfiles/rails_3.0.20.gemfile
+- gemfiles/rails_3.0.20.gemfile.lock
 - gemfiles/rails_3.0.5.gemfile
 - gemfiles/rails_3.0.5.gemfile.lock
 - gemfiles/rails_3.0.6.gemfile
+- gemfiles/rails_3.0.6.gemfile.lock
 - gemfiles/rails_3.0.7.gemfile
+- gemfiles/rails_3.0.7.gemfile.lock
 - gemfiles/rails_3.0.8.gemfile
+- gemfiles/rails_3.0.8.gemfile.lock
 - gemfiles/rails_3.0.9.gemfile
+- gemfiles/rails_3.0.9.gemfile.lock
 - gemfiles/rails_3.1.0.gemfile
+- gemfiles/rails_3.1.0.gemfile.lock
 - gemfiles/rails_3.1.10.gemfile
+- gemfiles/rails_3.1.10.gemfile.lock
 - gemfiles/rails_3.1.11.gemfile
+- gemfiles/rails_3.1.11.gemfile.lock
 - gemfiles/rails_3.1.12.gemfile
+- gemfiles/rails_3.1.12.gemfile.lock
 - gemfiles/rails_3.1.2.gemfile
+- gemfiles/rails_3.1.2.gemfile.lock
 - gemfiles/rails_3.1.3.gemfile
+- gemfiles/rails_3.1.3.gemfile.lock
 - gemfiles/rails_3.1.4.gemfile
+- gemfiles/rails_3.1.4.gemfile.lock
 - gemfiles/rails_3.1.5.gemfile
+- gemfiles/rails_3.1.5.gemfile.lock
 - gemfiles/rails_3.1.6.gemfile
+- gemfiles/rails_3.1.6.gemfile.lock
 - gemfiles/rails_3.1.7.gemfile
+- gemfiles/rails_3.1.7.gemfile.lock
 - gemfiles/rails_3.1.8.gemfile
+- gemfiles/rails_3.1.8.gemfile.lock
 - gemfiles/rails_3.1.9.gemfile
+- gemfiles/rails_3.1.9.gemfile.lock
 - gemfiles/rails_3.2.0.gemfile
+- gemfiles/rails_3.2.0.gemfile.lock
 - gemfiles/rails_3.2.1.gemfile
+- gemfiles/rails_3.2.1.gemfile.lock
 - gemfiles/rails_3.2.10.gemfile
+- gemfiles/rails_3.2.10.gemfile.lock
 - gemfiles/rails_3.2.11.gemfile
+- gemfiles/rails_3.2.11.gemfile.lock
 - gemfiles/rails_3.2.12.gemfile
+- gemfiles/rails_3.2.12.gemfile.lock
 - gemfiles/rails_3.2.13.gemfile
+- gemfiles/rails_3.2.13.gemfile.lock
 - gemfiles/rails_3.2.14.gemfile
+- gemfiles/rails_3.2.14.gemfile.lock
 - gemfiles/rails_3.2.15.gemfile
+- gemfiles/rails_3.2.15.gemfile.lock
 - gemfiles/rails_3.2.16.gemfile
+- gemfiles/rails_3.2.16.gemfile.lock
 - gemfiles/rails_3.2.17.gemfile
+- gemfiles/rails_3.2.17.gemfile.lock
 - gemfiles/rails_3.2.18.gemfile
+- gemfiles/rails_3.2.18.gemfile.lock
 - gemfiles/rails_3.2.19.gemfile
+- gemfiles/rails_3.2.19.gemfile.lock
 - gemfiles/rails_3.2.2.gemfile
+- gemfiles/rails_3.2.2.gemfile.lock
 - gemfiles/rails_3.2.20.gemfile
+- gemfiles/rails_3.2.20.gemfile.lock
 - gemfiles/rails_3.2.21.gemfile
+- gemfiles/rails_3.2.21.gemfile.lock
+- gemfiles/rails_3.2.22.gemfile
+- gemfiles/rails_3.2.22.gemfile.lock
 - gemfiles/rails_3.2.3.gemfile
+- gemfiles/rails_3.2.3.gemfile.lock
 - gemfiles/rails_3.2.4.gemfile
+- gemfiles/rails_3.2.4.gemfile.lock
 - gemfiles/rails_3.2.5.gemfile
+- gemfiles/rails_3.2.5.gemfile.lock
 - gemfiles/rails_3.2.6.gemfile
+- gemfiles/rails_3.2.6.gemfile.lock
 - gemfiles/rails_3.2.7.gemfile
+- gemfiles/rails_3.2.7.gemfile.lock
 - gemfiles/rails_3.2.8.gemfile
+- gemfiles/rails_3.2.8.gemfile.lock
 - gemfiles/rails_3.2.9.gemfile
+- 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.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
 - lib/store_base_sti_class.rb
 - lib/store_base_sti_class/version.rb
 - lib/store_base_sti_class_for_3_0.rb
 - lib/store_base_sti_class_for_3_1_and_above.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
 - store_base_sti_class.gemspec
 - storebasestiname_unittest.sql
 homepage: http://github.com/appfolio/store_base_sti_class
@@ -205,9 +296,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: Modifies ActiveRecord 3.0.5 - 4.0.1 with the ability to store the actual
+summary: Modifies ActiveRecord 3.0.5 - 4.2.x with the ability to store the actual
   class (instead of the base class) in polymorhic _type columns when using STI
 test_files: []

data/CHANGELOG

@@ -1,2 +0,0 @@
-0.0.1
-  - Initial release