store_base_sti_class_for_3_0 0.1.2 → 0.1.3

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem "activerecord", "~> 3.0.5"
+gem "activerecord", ">= 3.0.5"
 
 group :development do
   gem "mysql2"

data/Gemfile.lock

@@ -1,17 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.6)
-    arel (2.0.9)
+    activesupport (3.0.7)
+    arel (2.0.10)
     builder (2.1.2)
     git (1.2.5)
     i18n (0.5.0)
@@ -20,15 +20,15 @@ GEM
       git (>= 1.2.5)
       rake
     mysql2 (0.2.6)
-    rake (0.8.7)
+    rake (0.9.1)
     rcov (0.9.9)
-    tzinfo (0.3.26)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.5)
+  activerecord (>= 3.0.5)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
   mysql2

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/store_base_sti_class_for_3_0.rb

@@ -1,4 +1,6 @@
 require 'active_record'
+
+if ActiveRecord::VERSION::STRING =~ /^3\.0/  
 require 'active_record/associations'
 require 'active_record/reflection'
 require 'active_record/association_preload'
@@ -463,4 +465,6 @@ module ActiveRecord
       end
     end
   end
+end
+
 end

data/lib/store_base_sti_class_for_3_1.rb

@@ -0,0 +1,31 @@
+require 'active_record'
+
+if ActiveRecord::VERSION::STRING =~ /^3\.1/
+  require 'active_record/reflection'
+  require 'active_record/associations'
+  require 'active_record/associations/belongs_to_polymorphic_association'
+
+  module ActiveRecord
+    module Reflection # :nodoc:
+      class AssociationReflection
+        def foreign_subtype
+          @foreign_subtype ||= options[:foreign_subtype] || "#{name}_subtype"
+        end
+      end
+    end
+    
+    # = Active Record Belongs To Polymorphic Association
+    module Associations
+      class BelongsToPolymorphicAssociation < BelongsToAssociation #:nodoc:
+        private
+
+          def replace_keys(record)
+            super
+            owner[reflection.foreign_type] = record && record.class.base_class.name
+            owner[reflection.foreign_subtype] = record && record.class.sti_name
+          end
+      end
+    end
+  end
+
+end

data/store_base_sti_class_for_3_0.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{store_base_sti_class_for_3_0}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Paul Kmiec"]
-  s.date = %q{2011-04-26}
+  s.authors = [%q{Paul Kmiec}]
+  s.date = %q{2011-06-02}
   s.description = %q{
     ActiveRecord has always stored the base class in polymorphic _type columns when using STI. This can have non-trivial
     performance implications in certain cases. This gem adds 'store_base_sti_class' configuration options which controls
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/store_base_sti_class_for_3_0.rb",
+    "lib/store_base_sti_class_for_3_1.rb",
     "polymorphic_and_sti_fix_for_rails_2.3-1.diff",
     "polymorphic_and_sti_fix_for_rails_2.3-2.diff",
     "store_base_sti_class_for_3_0.gemspec",
@@ -40,9 +41,9 @@ Gem::Specification.new do |s|
     "test/test_store_base_sti_class_for_3_0.rb"
   ]
   s.homepage = %q{http://github.com/pkmiec/store_base_sti_class_for_3_0}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.4}
   s.summary = %q{Modifies ActiveRecord 3.0.x with the ability to store the actual class (instead of the base class) in polymorhic _type columns when using STI}
   s.test_files = [
     "test/connection.rb",
@@ -53,24 +54,23 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.5"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.5"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, ["~> 3.0.5"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.5"])
       s.add_dependency(%q<mysql2>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["~> 3.0.5"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.5"])
     s.add_dependency(%q<mysql2>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: store_base_sti_class_for_3_0
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Paul Kmiec
@@ -15,17 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
-default_executable: 
+date: 2011-06-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 13
         segments: 
@@ -33,12 +29,12 @@ dependencies:
         - 0
         - 5
         version: 3.0.5
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: activerecord
   prerelease: false
-  type: :development
-  name: mysql2
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: mysql2
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +59,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +75,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: rcov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: jeweler
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,7 +89,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  type: :development
+  name: rcov
+  prerelease: false
+  version_requirements: *id005
 description: "\n    ActiveRecord has always stored the base class in polymorphic _type columns when using STI. This can have non-trivial\n    performance implications in certain cases. This gem adds 'store_base_sti_class' configuration options which controls\n    whether ActiveRecord will store the base class or the actual class. Default to true for backwards compatibility.\n  "
 email: paul.kmiec@appfolio.com
 executables: []
@@ -113,6 +112,7 @@ files:
 - Rakefile
 - VERSION
 - lib/store_base_sti_class_for_3_0.rb
+- lib/store_base_sti_class_for_3_1.rb
 - polymorphic_and_sti_fix_for_rails_2.3-1.diff
 - polymorphic_and_sti_fix_for_rails_2.3-2.diff
 - store_base_sti_class_for_3_0.gemspec
@@ -121,7 +121,6 @@ files:
 - test/models.rb
 - test/schema.rb
 - test/test_store_base_sti_class_for_3_0.rb
-has_rdoc: true
 homepage: http://github.com/pkmiec/store_base_sti_class_for_3_0
 licenses: 
 - MIT
@@ -151,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: Modifies ActiveRecord 3.0.x with the ability to store the actual class (instead of the base class) in polymorhic _type columns when using STI