has_eav 1.1.2 → 1.1.4

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "activerecord", "~> 3.0.3"
+gem "activerecord", "~> 3.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -9,6 +9,6 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.1"
   gem "rcov", ">= 0"
-  gem "rails", "~> 3.0.3"
+  gem "rails", "~> 3.0"
   gem "sqlite3-ruby", :require => "sqlite3"
 end

data/Gemfile.lock

@@ -76,10 +76,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.3)
+  activerecord (~> 3.0)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.1)
-  rails (~> 3.0.3)
+  rails (~> 3.0)
   rcov
   shoulda
   sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.4

data/has_eav.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{has_eav}
-  s.version = "1.1.2"
+  s.name = "has_eav"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hartog C. de Mik"]
-  s.date = %q{2011-06-01}
-  s.description = %q{Put EAV behaviour on your ActiveRecord models}
-  s.email = %q{hcdm@matchvertise.com}
+  s.date = "2011-09-13"
+  s.description = "Put EAV behaviour on your ActiveRecord models"
+  s.email = "hcdm@matchvertise.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -65,11 +65,11 @@ Gem::Specification.new do |s|
     "test/test/unit/product_test.rb",
     "test/test_has_eav.rb"
   ]
-  s.homepage = %q{http://github.com/coffeeaddict/has_eav}
+  s.homepage = "http://github.com/coffeeaddict/has_eav"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Put EAV behaviour on your ActiveRecord models}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Put EAV behaviour on your ActiveRecord models"
   s.test_files = [
     "test/app/models/post.rb",
     "test/app/models/post_attribute.rb",
@@ -102,33 +102,32 @@ 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.3"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_development_dependency(%q<rails>, ["~> 3.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_dependency(%q<rails>, ["~> 3.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rails>, ["~> 3.0.3"])
+    s.add_dependency(%q<rails>, ["~> 3.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end
 end

data/lib/has_eav.rb

@@ -21,7 +21,7 @@ module ActiveRecord
         # end
         #
         # # specify some eav_attributes at class level
-        # has_eav :through => :x_attributes do
+        # has_eav :through => "BoundAttribute" do
         #   eav_attribute :remote_ip
         #   eav_attribute :uniq_id
         # end
@@ -32,16 +32,20 @@ module ActiveRecord
         #
         def has_eav opts={}, &block
           klass = opts.delete :through
+          klass = klass.to_s if klass.is_a? Symbol
+          klass = klass.camelize
+          
           raise(
-          "Eav Class cannot be nil. Specify a class using " +
-          "has_eav :through => :class"
+            "Eav Class cannot be nil. Specify a class using " +
+            "has_eav :through => :class"
           ) if klass.blank?
 
           class_eval do
+            has_many   :eav_attributes, :class_name => klass
             after_save :save_eav_attributes
           end
 
-          @eav_class      = klass.to_s.camelize.constantize
+          @eav_class      = klass.constantize
           @eav_attributes = {}
 
           yield if block_given?
@@ -154,17 +158,6 @@ module ActiveRecord
           end
         end
 
-        # get all the eav attribute instances available for this model instance
-        #
-        # eg: if you model says 'has_eav :through => :post_attribute' these are
-        # all PostAttribute's
-        #
-        def eav_attributes
-          @eav_attributes ||= eav_class.all(
-            :conditions => { self_key => self.id }
-          )
-        end
-
         # save the list of eav_attribute back to the database
         def save_eav_attributes # :nodoc:
           eav_attributes.select { |a| a.changed? }.each do |a|
@@ -236,6 +229,7 @@ module ActiveRecord
                 # for date/time classes [eg: Date.parse("2011-03-20")]
                 eval("#{attributes[attribute]}.parse('#{value}')")
               rescue
+                # nothing worked, falling back to whatever the ORM supplied
                 value
               end
 
@@ -251,4 +245,4 @@ module ActiveRecord
 end # /ActiveRecord
 
 # insert the has_eav method into ActiveRecord
-ActiveRecord::Base.send( :include, ActiveRecord::ActsAs::HasEav )
+ActiveRecord::Base.send( :include, ActiveRecord::ActsAs::HasEav )

data/test/test_has_eav.rb

@@ -114,7 +114,7 @@ class TestHasEav < Test::Unit::TestCase
   end
 
   should "not create attributes with nil value" do
-    p = Post.last
+    p = Post.create
     p.author_name = nil
 
     assert_equal [], p.eav_attributes, "No attributes where defined"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_eav
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Hartog C. de Mik
@@ -15,27 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 +02:00
-default_executable: 
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
-  requirement: *id001
-  prerelease: false
+        version: "3.0"
   type: :runtime
   name: activerecord
+  version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +42,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  prerelease: false
   type: :development
   name: shoulda
+  version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,12 +58,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id003
-  prerelease: false
   type: :development
   name: bundler
+  version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,12 +74,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id004
-  prerelease: false
   type: :development
   name: jeweler
+  version_requirements: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,28 +88,27 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-  prerelease: false
   type: :development
   name: rcov
+  version_requirements: *id005
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
-  requirement: *id006
-  prerelease: false
+        version: "3.0"
   type: :development
   name: rails
+  version_requirements: *id006
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,10 +117,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
-  prerelease: false
   type: :development
   name: sqlite3-ruby
+  version_requirements: *id007
+  prerelease: false
 description: Put EAV behaviour on your ActiveRecord models
 email: hcdm@matchvertise.com
 executables: []
@@ -181,7 +178,6 @@ files:
 - test/test/unit/product_attribute_test.rb
 - test/test/unit/product_test.rb
 - test/test_has_eav.rb
-has_rdoc: true
 homepage: http://github.com/coffeeaddict/has_eav
 licenses: 
 - MIT
@@ -211,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Put EAV behaviour on your ActiveRecord models