has_normalized_sti 1.0.0 → 1.1.0

data/Gemfile

@@ -9,6 +9,6 @@ end
 group :test do
   gem 'rspec'
   gem 'rspec-rails'
-  gem 'activerecord', '~> 3.0.0'
+  gem 'activerecord', '>= 3.0.0'
   gem 'sqlite3'
 end

data/Rakefile

@@ -4,10 +4,12 @@ begin
     gem.name        = 'has_normalized_sti'
     gem.summary     = 'allows rails STI to work when the type is normalized out'
     gem.description = <<-DESC
-      has_normalzied_sti expects the model to have a type_id column
-      referencing a types table containg all the possible types.
-      the types table will be auto populated with new types as new
-      subclasses are saved
+      has_normalzied_sti is a rails extension to allow Single Table Inheritance
+      to work with a database normalized type column.
+      The extension expects the STI model to have a type_id column instead of
+      a type column. type_id should reference a Types table containg all the possible types.
+      The types table will be auto populated with new types as new
+      subclasses are saved.
     DESC
     gem.email       = 'kevin@glowacz.info'
     gem.author      = 'Kevin Glowacz'

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/has_normalized_sti.gemspec

@@ -5,15 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_normalized_sti}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kevin Glowacz"]
-  s.date = %q{2011-06-24}
-  s.description = %q{      has_normalzied_sti expects the model to have a type_id column
-      referencing a types table containg all the possible types.
-      the types table will be auto populated with new types as new
-      subclasses are saved
+  s.authors = [%q{Kevin Glowacz}]
+  s.date = %q{2011-09-20}
+  s.description = %q{      has_normalzied_sti is a rails extension to allow Single Table Inheritance
+      to work with a database normalized type column.
+      The extension expects the STI model to have a type_id column instead of
+      a type column. type_id should reference a Types table containg all the possible types.
+      The types table will be auto populated with new types as new
+      subclasses are saved.
 }
   s.email = %q{kevin@glowacz.info}
   s.extra_rdoc_files = [
@@ -22,7 +24,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "README",
     "Rakefile",
     "VERSION",
@@ -34,8 +35,8 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/speed_test.rb"
   ]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{allows rails STI to work when the type is normalized out}
 
   if s.respond_to? :specification_version then

data/lib/has_normalized_sti.rb

@@ -39,7 +39,7 @@ module HasNormalizedSti
       extend  HasNormalizedSti::SingletonMethods
       include HasNormalizedSti::InstanceMethods
 
-      class_inheritable_accessor :sti_config
+      class_attribute :sti_config
       self.sti_config = {
         :type_class_name => "#{table_name.classify}Type",
         :foreign_key => 'type_id',
@@ -62,48 +62,26 @@ module HasNormalizedSti
       default_scope joins(:normal_type).select("#{table_name}.*, #{sti_config[:type_class_name].constantize.table_name}.#{sti_config[:type_column]}")
       validates_associated :normal_type
       validates_presence_of :normal_type
+      set_inheritance_column 'has_normalized_sti_proxy_type'
     end
   end
 
   module SingletonMethods
-    def instantiate(record)
-      if record.has_key?(sti_config[:type_column])
-        type_name = record[sti_config[:type_column]]
-      else
-        associated_record = sti_config[:type_class_name].constantize.find_by_id(record[sti_config[:foreign_key].to_s])
-        type_name = associated_record.try(sti_config[:type_column])
-      end
-      model = find_sti_class(type_name).allocate
-      model.init_with('attributes' => record)
-      model
+    def columns_hash
+      ch = super
+      # AR will only do its magic if it thinks the db table has the inheritance_column
+      ch[inheritance_column] = nil
+      ch
     end
 
-    def find_sti_class(type_name)
-      if type_name.blank?
-        self
-      else
-        begin
-          if store_full_sti_class
-            ActiveSupport::Dependencies.constantize(type_name)
-          else
-            compute_type(type_name)
-          end
-        rescue NameError
-          raise SubclassNotFound,
-            "The single-table inheritance mechanism failed to locate the subclass: '#{type_name}'. " +
-            "This error is raised because the column '#{inheritance_column}' is reserved for storing the class in case of inheritance. " +
-            "Please rename this column if you didn't intend it to be used for storing the inheritance class " +
-            "or overwrite #{name}.inheritance_column to use another column for that information."
-        end
-      end
-    end
+    # look up the type name on the associated object
+    # put in in the record's inheritance_column to trick AR
+    def instantiate(record)
+      associated_record = sti_config[:type_class_name].constantize.find_by_id(record[sti_config[:foreign_key].to_s])
+      type_name = associated_record.try(sti_config[:type_column])
+      record[inheritance_column] = type_name
 
-    def descends_from_active_record?
-      if superclass.abstract_class?
-        superclass.descends_from_active_record?
-      else
-        superclass == ActiveRecord::Base
-      end
+      super
     end
 
     def type_condition
@@ -116,7 +94,7 @@ module HasNormalizedSti
   end
 
   module InstanceMethods
-    def initialize(attributes = {})
+    def initialize(*args)
       super
       self.type = self.class.to_s
     end

metadata

@@ -1,63 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: has_normalized_sti
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Kevin Glowacz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-24 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153251520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153251520
+- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2153251000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153251000
+- !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2153250480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-description: "      has_normalzied_sti expects the model to have a type_id column\n      referencing a types table containg all the possible types.\n      the types table will be auto populated with new types as new\n      subclasses are saved\n"
+  version_requirements: *2153250480
+description: ! "      has_normalzied_sti is a rails extension to allow Single Table
+  Inheritance\n      to work with a database normalized type column.\n      The extension
+  expects the STI model to have a type_id column instead of\n      a type column.
+  type_id should reference a Types table containg all the possible types.\n      The
+  types table will be auto populated with new types as new\n      subclasses are saved.\n"
 email: kevin@glowacz.info
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - .rspec
 - Gemfile
-- Gemfile.lock
 - README
 - Rakefile
 - VERSION
@@ -68,36 +67,28 @@ files:
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/speed_test.rb
-has_rdoc: true
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3468596275297658209
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: allows rails STI to work when the type is normalized out
 test_files: []
-

data/Gemfile.lock

@@ -1,75 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionpack (3.0.8)
-      activemodel (= 3.0.8)
-      activesupport (= 3.0.8)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.8)
-      activesupport (= 3.0.8)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.8)
-      activemodel (= 3.0.8)
-      activesupport (= 3.0.8)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.8)
-    arel (2.0.10)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.6.2)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    mocha (0.9.12)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    railties (3.0.8)
-      actionpack (= 3.0.8)
-      activesupport (= 3.0.8)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
-    sqlite3 (1.3.3)
-    thor (0.14.6)
-    tzinfo (0.3.28)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.0.0)
-  i18n
-  jeweler
-  mocha
-  rspec
-  rspec-rails
-  sqlite3