has_eav 1.1.5 → 1.2.0

data/Gemfile

@@ -6,9 +6,9 @@ gem "activerecord", "~> 3.0"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem "bundler", "~> 1.1"
+  gem "jeweler", "~> 1.8"
+  gem "simplecov", ">= 0"
   gem "rails", "~> 3.0"
   gem "sqlite3-ruby", :require => "sqlite3"
 end

data/Gemfile.lock

@@ -1,103 +1,110 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.1)
-      actionpack (= 3.1.1)
-      mail (~> 2.3.0)
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-    activesupport (3.1.1)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.0)
+    arel (3.0.2)
+    builder (3.0.4)
     erubis (2.7.0)
     git (1.2.5)
     hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    i18n (0.6.1)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.1)
-    mail (2.3.0)
+      rdoc
+    journey (1.0.4)
+    json (1.7.5)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.3)
+    mime-types (1.19)
+    multi_json (1.3.6)
     polyglot (0.3.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.1)
-      actionmailer (= 3.1.1)
-      actionpack (= 3.1.1)
-      activerecord (= 3.1.1)
-      activeresource (= 3.1.1)
-      activesupport (= 3.1.1)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.1.1)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
-    shoulda (2.11.3)
-    sprockets (2.0.3)
+    shoulda (3.3.2)
+      shoulda-context (~> 1.0.1)
+      shoulda-matchers (~> 1.4.1)
+    shoulda-context (1.0.1)
+    shoulda-matchers (1.4.1)
+      activesupport (>= 3.0.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.0)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.1)
+  bundler (~> 1.1)
+  jeweler (~> 1.8)
   rails (~> 3.0)
-  rcov
   shoulda
+  simplecov
   sqlite3-ruby

data/README.rdoc

@@ -66,6 +66,18 @@ your model as if the defined attributes where present in the database.
 In contradiction to acts_as_eav_model, has_eav will not allow for an all open
 structure. You must define the attributes to be required.
 
+=== STI
+
++has_eav+ works in an STI setting, and you can specify *more* attributes in the
+inheriting class. Since the root class is responsible for the relationship to
+the attributes class, you should not specify any options in the STI class
+
+  class PostponedPost < Post
+    has_eav do
+      eav_attribute :release_date
+    end
+  end
+
 ==== Instance eav_attributes
 
 If you create a method +instance_eav_attributes+ in your model, has_eav will

data/Rakefile

@@ -33,13 +33,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.2.0

data/has_eav.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "has_eav"
-  s.version = "1.1.5"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hartog C. de Mik"]
-  s.date = "2011-11-16"
+  s.date = "2012-10-24"
   s.description = "Put EAV behaviour on your ActiveRecord models"
   s.email = "hcdm@matchvertise.com"
   s.extra_rdoc_files = [
@@ -53,7 +53,6 @@ Gem::Specification.new do |s|
     "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",
     "test/test/fixtures/post_attributes.yml",
     "test/test/fixtures/posts.yml",
@@ -68,38 +67,8 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/coffeeaddict/has_eav"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Put EAV behaviour on your ActiveRecord models"
-  s.test_files = [
-    "test/app/models/post.rb",
-    "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",
-    "test/config/environments/development.rb",
-    "test/config/environments/production.rb",
-    "test/config/environments/test.rb",
-    "test/config/initializers/backtrace_silencers.rb",
-    "test/config/initializers/inflections.rb",
-    "test/config/initializers/mime_types.rb",
-    "test/config/initializers/secret_token.rb",
-    "test/config/initializers/session_store.rb",
-    "test/config/routes.rb",
-    "test/db/migrate/20101210093949_create_posts.rb",
-    "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",
-    "test/test/unit/product_attribute_test.rb",
-    "test/test/unit/product_test.rb",
-    "test/test_has_eav.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -107,26 +76,26 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       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<bundler>, ["~> 1.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rails>, ["~> 3.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
       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<bundler>, ["~> 1.1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rails>, ["~> 3.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
     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<bundler>, ["~> 1.1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rails>, ["~> 3.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end

data/lib/has_eav.rb

@@ -9,28 +9,41 @@ module ActiveRecord
         # Specify that the ActiveModel is an EAV model
         #
         # == Usage
-        # # specifiy eav_attributes at instance level
-        # has_eav :through => :some_class_with_name_and_value_attributes
-        # def available_eav_attributes
-        #   case self.origin
-        #   when "remote"
-        #     %(remote_ip user_agent)
-        #   when "local"
-        #     %(user)
-        #   end + [ :uniq_id ]
-        # end
+        #   # specifiy eav_attributes at instance level
+        #   has_eav :through => :some_class_with_name_and_value_attributes
+        #   def available_eav_attributes
+        #     case self.origin
+        #     when "remote"
+        #       %(remote_ip user_agent)
+        #     when "local"
+        #       %(user)
+        #     end + [ :uniq_id ]
+        #   end
         #
-        # # specify some eav_attributes at class level
-        # has_eav :through => "BoundAttribute" do
-        #   eav_attribute :remote_ip
-        #   eav_attribute :uniq_id
-        # end
+        #   # specify some eav_attributes at class level
+        #   has_eav :through => "BoundAttribute" do
+        #     eav_attribute :remote_ip
+        #     eav_attribute :uniq_id
+        #   end
+        #
+        #   # specify more attributes in an STI class
+        #   class ItalianJob < Job
+        #     has_eav do
+        #       eav_attribute :mini_driver
+        #     end
+        #   end
         #
         # == Mixing class and instance defined EAV attributes
         # You can define EAV attributes both in class and instance context and
         # they will be both adhered
         #
         def has_eav opts={}, &block
+          if self.superclass != ActiveRecord::Base && (opts.nil? || opts.empty?)
+            @eav_attributes = {}
+            yield
+            return
+          end
+
           klass = opts.delete :through
           klass = klass.to_s if klass.is_a? Symbol
           klass = klass.camelize
@@ -40,8 +53,10 @@ module ActiveRecord
             "has_eav :through => :class"
           ) if klass.blank?
 
+          opts[:class_name] = klass
+
           class_eval do
-            has_many   :eav_attributes, :class_name => klass
+            has_many   :eav_attributes, opts
             after_save :save_eav_attributes
           end
 
@@ -57,14 +72,14 @@ module ActiveRecord
         def eav_attribute name, type = String
           name = name.to_s if !name.is_a? String
 
-          self.class_eav_attributes[name] = type
+          @eav_attributes[name] = type
         end
 
         # class accessor - when the superclass != AR::Base asume we are in STI
         # mode
         def class_eav_attributes # :nodoc:
           superclass != ActiveRecord::Base ?
-            superclass.class_eav_attributes :
+            superclass.class_eav_attributes.merge(@eav_attributes || {}) :
             @eav_attributes
         end
 
@@ -214,17 +229,16 @@ module ActiveRecord
           return value unless attributes.keys.include?(attribute)
           return value if attributes[attribute] == String # no need for casting
 
-
           begin
             # for core types [eg: Integer '12']
             eval("#{attributes[attribute]} '#{value}'")
 
           rescue
             begin
-              attributes[attribute].new(value)
+              attributes[attribute].parse(value)
             rescue
               begin
-                attributes[attribute].parse(value)
+                attributes[attribute].new(value)
               rescue
                 value
               end

metadata

@@ -1,136 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: has_eav
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 5
-  version: 1.1.5
 platform: ruby
-authors: 
+authors:
 - Hartog C. de Mik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-10-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &18194920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  name: activerecord
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: shoulda
   prerelease: false
+  version_requirements: *18194920
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &18205040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *18205040
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &18209880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  name: bundler
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *18209880
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &18206560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  name: jeweler
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
   prerelease: false
+  version_requirements: *18206560
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &18216900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *18216900
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &18225920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  name: rails
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: sqlite3-ruby
   prerelease: false
+  version_requirements: *18225920
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &18222840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id007
+  prerelease: false
+  version_requirements: *18222840
 description: Put EAV behaviour on your ActiveRecord models
 email: hcdm@matchvertise.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -167,7 +132,6 @@ files:
 - 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
 - test/test/fixtures/post_attributes.yml
 - test/test/fixtures/posts.yml
@@ -179,64 +143,31 @@ files:
 - test/test/unit/product_test.rb
 - test/test_has_eav.rb
 homepage: http://github.com/coffeeaddict/has_eav
-licenses: 
+licenses:
 - MIT
 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: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2214727751547464973
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Put EAV behaviour on your ActiveRecord models
-test_files: 
-- test/app/models/post.rb
-- 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
-- test/config/environments/development.rb
-- test/config/environments/production.rb
-- test/config/environments/test.rb
-- test/config/initializers/backtrace_silencers.rb
-- test/config/initializers/inflections.rb
-- test/config/initializers/mime_types.rb
-- test/config/initializers/secret_token.rb
-- test/config/initializers/session_store.rb
-- test/config/routes.rb
-- test/db/migrate/20101210093949_create_posts.rb
-- 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
-- test/test/unit/product_attribute_test.rb
-- test/test/unit/product_test.rb
-- test/test_has_eav.rb
+test_files: []

data/test/log/development.log

@@ -1,4 +0,0 @@
-  SQL (0.4ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-