has_metadata 1.6.0 → 1.6.1

data/README.textile

@@ -1,7 +1,7 @@
 h1. has_metadata -- Keep your tables narrow
 
 | *Author* | Tim Morgan |
-| *Version* | 1.6 (Jan 23, 2012) |
+| *Version* | 1.6.1 (Jan 24, 2012) |
 | *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.6.0"
+  s.version = "1.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = "2012-01-24"
+  s.date = "2012-01-25"
   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

@@ -73,6 +73,9 @@ module HasMetadata
 
         define_method(:save_metadata) { metadata.save! }
         define_method(:metadata_changed?) { metadata.try :changed? }
+
+        alias_method_chain :changed_attributes, :metadata
+        alias_method_chain :attribute_will_change!, :metadata
       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)
@@ -142,15 +145,33 @@ module HasMetadata
   #   saved one if none was found.
 
   def metadata!
-    if instance_variables.include?(:@metadata) then
-      metadata.set_fields self.class.metadata_fields
+    if instance_variables.include?(:@metadata) && metadata then
+      metadata
     else
-      (metadata || Metadata.transaction { metadata || create_metadata }).set_fields self.class.metadata_fields
-    end
+      if new_record? then
+        metadata || build_metadata
+      else
+        metadata || Metadata.transaction { metadata || create_metadata }
+      end
+    end.set_fields self.class.metadata_fields
   end
 
   # @private
   def inspect
     "#<#{self.class.to_s} #{attributes.merge(metadata.try(:data).try(:stringify_keys) || {}).map { |k,v| "#{k}: #{v.inspect}" }.join(', ')}>"
   end
+
+  # @private
+  def changed_attributes_with_metadata
+    changed_attributes_without_metadata.merge(metadata.try(:changed_metadata) || {})
+  end
+
+  # @private
+  def attribute_will_change_with_metadata!(attr)
+    if attribute_names.include?(attr) then
+      attribute_will_change_without_metadata! attr
+    else
+      metadata!.send :attribute_will_change!, attr
+    end
+  end
 end

data/lib/has_metadata/model.rb

@@ -56,12 +56,19 @@ module HasMetadata
 
         options = fields[name] || {}
         data_will_change!
+        attribute_will_change! name.to_s
         data[name] = HasMetadata.metadata_typecast(value, options[:type])
       end
 
       self
     end
 
+    # @return [Hash<String, Object>] A hash of metadata fields that have been
+    #   altered.
+    def changed_metadata
+      changed_attributes.except(*attribute_names)
+    end
+
     private
 
     def initialize_data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_metadata
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70170864527740 !ruby/object:Gem::Requirement
+  requirement: &70331322795420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70170864527740
+  version_requirements: *70331322795420
 - !ruby/object:Gem::Dependency
   name: boolean
-  requirement: &70170864527260 !ruby/object:Gem::Requirement
+  requirement: &70331322972780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170864527260
+  version_requirements: *70331322972780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70170864526780 !ruby/object:Gem::Requirement
+  requirement: &70331322983680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170864526780
+  version_requirements: *70331322983680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70170864526300 !ruby/object:Gem::Requirement
+  requirement: &70331322981100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170864526300
+  version_requirements: *70331322981100
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70170864525820 !ruby/object:Gem::Requirement
+  requirement: &70331322991560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170864525820
+  version_requirements: *70331322991560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70170864525340 !ruby/object:Gem::Requirement
+  requirement: &70331322997040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170864525340
+  version_requirements: *70331322997040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70170864524860 !ruby/object:Gem::Requirement
+  requirement: &70331323012700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170864524860
+  version_requirements: *70331323012700
 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.