has_metadata 1.4.0 → 1.5.0

data/README.textile

@@ -1,7 +1,7 @@
 h1. has_metadata -- Keep your tables narrow
 
 | *Author* | Tim Morgan |
-| *Version* | 1.4 (Oct 30, 2011) |
+| *Version* | 1.5 (Nov 2, 2011) |
 | *License* | Released under the MIT License. |
 
 h2. Important note for those upgrading from 1.0 to 1.1

data/has_metadata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "has_metadata"
-  s.version = "1.4.0"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = "2011-10-31"
+  s.date = "2011-11-02"
   s.description = "has_metadata lets you move non-indexed and weighty columns off of your big tables by creating a separate metadata table to store all this extra information. Works with Ruby 1.9. and Rails 3.0."
   s.email = "git@timothymorgan.info"
   s.extra_rdoc_files = [

data/lib/has_metadata.rb

@@ -63,14 +63,20 @@ module HasMetadata
     #   has_metadata(optional: true, required: { presence: true }, number: { type: Fixnum })
 
     def has_metadata(fields)
-      belongs_to :metadata, dependent: :destroy
-      accepts_nested_attributes_for :metadata
-      after_save :save_metadata, if: :metadata_changed?
-      class_attribute :metadata_fields
-      self.metadata_fields = fields.deep_clone
-
-      define_method(:save_metadata) { metadata.save! }
-      define_method(:metadata_changed?) { metadata.try :changed? }
+      if !respond_to?(:metadata_fields) then
+        belongs_to :metadata, dependent: :destroy
+        accepts_nested_attributes_for :metadata
+        after_save :save_metadata, if: :metadata_changed?
+
+        class_attribute :metadata_fields
+        self.metadata_fields = fields.deep_clone
+
+        define_method(:save_metadata) { metadata.save! }
+        define_method(:metadata_changed?) { metadata.try :changed? }
+      else
+        raise "Cannot redefine existing metadata fields: #{(fields.keys & self.metadata_fields.keys).to_sentence}" unless (fields.keys & self.metadata_fields.keys).empty?
+        self.metadata_fields = self.metadata_fields.merge(fields)
+      end
 
       fields.each do |name, options|
         # delegate all attribute methods to the metadata

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_metadata
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
+date: 2011-11-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2154906620 !ruby/object:Gem::Requirement
+  requirement: &2155123840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2154906620
+  version_requirements: *2155123840
 - !ruby/object:Gem::Dependency
   name: boolean
-  requirement: &2154905980 !ruby/object:Gem::Requirement
+  requirement: &2155123220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154905980
+  version_requirements: *2155123220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2154905400 !ruby/object:Gem::Requirement
+  requirement: &2155122540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154905400
+  version_requirements: *2155122540
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2154904760 !ruby/object:Gem::Requirement
+  requirement: &2155121940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154904760
+  version_requirements: *2155121940
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2154890900 !ruby/object:Gem::Requirement
+  requirement: &2155121460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154890900
+  version_requirements: *2155121460
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2154890420 !ruby/object:Gem::Requirement
+  requirement: &2155116480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154890420
+  version_requirements: *2155116480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154889860 !ruby/object:Gem::Requirement
+  requirement: &2155115900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154889860
+  version_requirements: *2155115900
 description: has_metadata lets you move non-indexed and weighty columns off of your
   big tables by creating a separate metadata table to store all this extra information.
   Works with Ruby 1.9. and Rails 3.0.