has_metadata 1.5.4 → 1.6.0

data/README.textile

@@ -1,7 +1,7 @@
 h1. has_metadata -- Keep your tables narrow
 
 | *Author* | Tim Morgan |
-| *Version* | 1.5.4 (Jan 24, 2012) |
+| *Version* | 1.6 (Jan 23, 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.5.4"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = "2012-01-25"
+  s.date = "2012-01-24"
   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 = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["< 3.2"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.2"])
       s.add_runtime_dependency(%q<boolean>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["< 3.2"])
+      s.add_dependency(%q<rails>, [">= 3.2"])
       s.add_dependency(%q<boolean>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["< 3.2"])
+    s.add_dependency(%q<rails>, [">= 3.2"])
     s.add_dependency(%q<boolean>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/lib/has_metadata.rb

@@ -73,9 +73,6 @@ 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)
@@ -102,81 +99,58 @@ module HasMetadata
     end
   end
 
-  # Instance methods that are added to your model.
-
-  module InstanceMethods
-
-    def as_json(options={})
-      options ||= Hash.new # the JSON encoder can sometimes give us nil options?
-      options[:except] = Array.wrap(options[:except]) + [ :metadata_id ]
-      options[:methods] = Array.wrap(options[:methods]) + metadata_fields.keys - options[:except].map(&:to_sym)
-      super options
-    end
-    
-    def to_xml(options={})
-      options[:except] = Array.wrap(options[:except]) + [ :metadata_id ]
-      options[:methods] = Array.wrap(options[:methods]) + metadata_fields.keys - options[:except].map(&:to_sym)
-      super options
-    end
+  def as_json(options={})
+    options ||= Hash.new # the JSON encoder can sometimes give us nil options?
+    options[:except] = Array.wrap(options[:except]) + [ :metadata_id ]
+    options[:methods] = Array.wrap(options[:methods]) + metadata_fields.keys - options[:except].map(&:to_sym)
+    super options
+  end
+  
+  def to_xml(options={})
+    options[:except] = Array.wrap(options[:except]) + [ :metadata_id ]
+    options[:methods] = Array.wrap(options[:methods]) + metadata_fields.keys - options[:except].map(&:to_sym)
+    super options
+  end
 
-    # @private
-    def assign_multiparameter_attributes(pairs)
-      fake_attributes = pairs.select { |(field, _)| self.class.metadata_fields.include? field[0, field.index('(')].to_sym }
-
-      fake_attributes.group_by { |(field, _)| field[0, field.index('(')] }.each do |field_name, parts|
-        options = self.class.metadata_fields[field_name.to_sym]
-        if options[:type] then
-          args = parts.each_with_object([]) do |(part_name, value), ary|
-            part_ann = part_name[part_name.index('(') + 1, part_name.length]
-            index = part_ann.to_i - 1
-            raise "Out-of-bounds multiparameter argument index" unless index >= 0
-            ary[index] = if value.blank? then nil
-              elsif part_ann.ends_with?('i)') then value.to_i
-              elsif part_ann.ends_with?('f)') then value.to_f
-              else value end
-          end
-          args.compact!
-          send :"#{field_name}=", options[:type].new(*args) unless args.empty?
-        else
-          raise "#{field_name} has no type and cannot be used for multiparameter assignment"
+  # @private
+  def assign_multiparameter_attributes(pairs)
+    fake_attributes = pairs.select { |(field, _)| self.class.metadata_fields.include? field[0, field.index('(')].to_sym }
+
+    fake_attributes.group_by { |(field, _)| field[0, field.index('(')] }.each do |field_name, parts|
+      options = self.class.metadata_fields[field_name.to_sym]
+      if options[:type] then
+        args = parts.each_with_object([]) do |(part_name, value), ary|
+          part_ann = part_name[part_name.index('(') + 1, part_name.length]
+          index = part_ann.to_i - 1
+          raise "Out-of-bounds multiparameter argument index" unless index >= 0
+          ary[index] = if value.blank? then nil
+            elsif part_ann.ends_with?('i)') then value.to_i
+            elsif part_ann.ends_with?('f)') then value.to_f
+            else value end
         end
-      end
-
-      super(pairs - fake_attributes)
-    end
-
-    # @return [Metadata] An existing associated {Metadata} instance, or new,
-    #   saved one if none was found.
-    
-    def metadata!
-      if instance_variables.include?(:@metadata) && metadata then
-        metadata
+        args.compact!
+        send :"#{field_name}=", options[:type].new(*args) unless args.empty?
       else
-        if new_record? then
-          metadata || build_metadata
-        else
-          metadata || Metadata.transaction { metadata || create_metadata }
-        end
-      end.set_fields self.class.metadata_fields
+        raise "#{field_name} has no type and cannot be used for multiparameter assignment"
+      end
     end
 
-    # @private
-    def inspect
-      "#<#{self.class.to_s} #{attributes.merge(metadata.try(:data).try(:stringify_keys) || {}).map { |k,v| "#{k}: #{v.inspect}" }.join(', ')}>"
-    end
+    super(pairs - fake_attributes)
   end
 
-  # @private
-  def changed_attributes_with_metadata
-    changed_attributes_without_metadata.merge(metadata.try(:changed_metadata) || {})
-  end
+  # @return [Metadata] An existing associated {Metadata} instance, or new,
+  #   saved one if none was found.
 
-  # @private
-  def attribute_will_change_with_metadata!(attr)
-    if attribute_names.include?(attr) then
-      attribute_will_change_without_metadata! attr
+  def metadata!
+    if instance_variables.include?(:@metadata) then
+      metadata.set_fields self.class.metadata_fields
     else
-      metadata!.send :attribute_will_change!, attr
+      (metadata || Metadata.transaction { metadata || create_metadata }).set_fields self.class.metadata_fields
     end
   end
+
+  # @private
+  def inspect
+    "#<#{self.class.to_s} #{attributes.merge(metadata.try(:data).try(:stringify_keys) || {}).map { |k,v| "#{k}: #{v.inspect}" }.join(', ')}>"
+  end
 end

data/lib/has_metadata/model.rb

@@ -5,7 +5,7 @@ module HasMetadata
   # information.
   
   class Model < ActiveRecord::Base
-    set_table_name 'metadata'
+    self.table_name = 'metadata'
     serialize :data, Hash
 
     after_initialize :initialize_data
@@ -56,19 +56,12 @@ 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.5.4
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70232408519820 !ruby/object:Gem::Requirement
+  requirement: &70170864527740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70232408519820
+  version_requirements: *70170864527740
 - !ruby/object:Gem::Dependency
   name: boolean
-  requirement: &70232408526660 !ruby/object:Gem::Requirement
+  requirement: &70170864527260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70232408526660
+  version_requirements: *70170864527260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70232412633380 !ruby/object:Gem::Requirement
+  requirement: &70170864526780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232412633380
+  version_requirements: *70170864526780
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70232412641340 !ruby/object:Gem::Requirement
+  requirement: &70170864526300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232412641340
+  version_requirements: *70170864526300
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70232412651340 !ruby/object:Gem::Requirement
+  requirement: &70170864525820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232412651340
+  version_requirements: *70170864525820
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70232412659240 !ruby/object:Gem::Requirement
+  requirement: &70170864525340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232412659240
+  version_requirements: *70170864525340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70232412546900 !ruby/object:Gem::Requirement
+  requirement: &70170864524860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232412546900
+  version_requirements: *70170864524860
 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.