has_eav 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/has_eav.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_eav}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hartog C. de Mik"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "test/app/models/post_attribute.rb",
     "test/app/models/product.rb",
     "test/app/models/product_attribute.rb",
+    "test/app/models/special_post.rb",
     "test/config.ru",
     "test/config/application.rb",
     "test/config/boot.rb",
@@ -50,6 +51,7 @@ Gem::Specification.new do |s|
     "test/db/migrate/20101210100309_create_post_attributes.rb",
     "test/db/migrate/20101210102322_create_products.rb",
     "test/db/migrate/20101210102347_create_product_attributes.rb",
+    "test/db/migrate/20101210125857_add_type_to_post.rb",
     "test/helper.rb",
     "test/log/development.log",
     "test/script/rails",
@@ -73,6 +75,7 @@ Gem::Specification.new do |s|
     "test/app/models/post_attribute.rb",
     "test/app/models/product.rb",
     "test/app/models/product_attribute.rb",
+    "test/app/models/special_post.rb",
     "test/config/application.rb",
     "test/config/boot.rb",
     "test/config/environment.rb",
@@ -89,6 +92,7 @@ Gem::Specification.new do |s|
     "test/db/migrate/20101210100309_create_post_attributes.rb",
     "test/db/migrate/20101210102322_create_products.rb",
     "test/db/migrate/20101210102347_create_product_attributes.rb",
+    "test/db/migrate/20101210125857_add_type_to_post.rb",
     "test/helper.rb",
     "test/test/unit/post_attribute_test.rb",
     "test/test/unit/post_test.rb",

data/lib/has_eav.rb

@@ -56,14 +56,18 @@ module ActiveRecord
           self.class_eav_attributes[name] = type
         end
                   
-        # class accessor
+        # class accessor - when the superclass != AR::Base asume we are in STI
+        # mode
         def class_eav_attributes # :nodoc:
-          @eav_attributes
+          superclass != ActiveRecord::Base ?
+            superclass.class_eav_attributes :
+            @eav_attributes          
         end
         
-        # class accessor
+        # class accessor - when the superclass != AR::Base asume we are in STI
+        # mode
         def eav_class # :nodoc:
-          @eav_class
+          superclass != ActiveRecord::Base ? superclass.eav_class : @eav_class
         end        
       end # /ClassMethods
       
@@ -188,7 +192,12 @@ module ActiveRecord
         
         # get the key to my <3
         def self_key # :nodoc:
-          "#{self.class.name.underscore}_id".to_sym
+          klass = self.class
+          if klass.superclass != ActiveRecord::Base
+            klass = klass.superclass
+          end
+          
+          "#{klass.name.underscore}_id".to_sym
         end
         
         # cast an eav value to it's desired class

data/test/app/models/special_post.rb

@@ -0,0 +1,2 @@
+class SpecialPost < Post
+end

data/test/db/migrate/20101210125857_add_type_to_post.rb

@@ -0,0 +1,9 @@
+class AddTypeToPost < ActiveRecord::Migration
+  def self.up
+    add_column :posts, :type, :string
+  end
+
+  def self.down
+    remove_column :posts, :type
+  end
+end

data/test/test_has_eav.rb

@@ -87,4 +87,10 @@ class TestHasEav < Test::Unit::TestCase
     
     assert_equal "failed", post, "has failed"
   end
+  
+  should "work with STI" do
+    p = SpecialPost.create(
+      :title => "title", :contents => "lorem ipsum", :author_name => "hartog"
+    )
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_eav
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Hartog C. de Mik
@@ -148,6 +148,7 @@ files:
 - test/app/models/post_attribute.rb
 - test/app/models/product.rb
 - test/app/models/product_attribute.rb
+- test/app/models/special_post.rb
 - test/config.ru
 - test/config/application.rb
 - test/config/boot.rb
@@ -167,6 +168,7 @@ files:
 - test/db/migrate/20101210100309_create_post_attributes.rb
 - test/db/migrate/20101210102322_create_products.rb
 - test/db/migrate/20101210102347_create_product_attributes.rb
+- test/db/migrate/20101210125857_add_type_to_post.rb
 - test/helper.rb
 - test/log/development.log
 - test/script/rails
@@ -218,6 +220,7 @@ test_files:
 - test/app/models/post_attribute.rb
 - test/app/models/product.rb
 - test/app/models/product_attribute.rb
+- test/app/models/special_post.rb
 - test/config/application.rb
 - test/config/boot.rb
 - test/config/environment.rb
@@ -234,6 +237,7 @@ test_files:
 - test/db/migrate/20101210100309_create_post_attributes.rb
 - test/db/migrate/20101210102322_create_products.rb
 - test/db/migrate/20101210102347_create_product_attributes.rb
+- test/db/migrate/20101210125857_add_type_to_post.rb
 - test/helper.rb
 - test/test/unit/post_attribute_test.rb
 - test/test/unit/post_test.rb