has_metadata 1.2.4 → 1.3.0

data/README.textile

@@ -1,7 +1,7 @@
 h1. has_metadata -- Keep your tables narrow
 
 | *Author* | Tim Morgan |
-| *Version* | 1.2.4 (Jan 24, 2012) |
+| *Version* | 1.3 (Aug 30, 2011) |
 | *License* | Released under the MIT License. |
 
 h2. Important note for those upgrading from 1.0 to 1.1

data/has_metadata.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "has_metadata"
-  s.version = "1.2.4"
+  s.name = %q{has_metadata}
+  s.version = "1.3.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.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.authors = [%q{Tim Morgan}]
+  s.date = %q{2011-08-31}
+  s.description = %q{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 = %q{git@timothymorgan.info}
   s.extra_rdoc_files = [
     "LICENSE",
     "README.textile"
@@ -26,17 +26,17 @@ Gem::Specification.new do |s|
     "templates/create_metadata.rb",
     "templates/metadata.rb"
   ]
-  s.homepage = "http://github.com/riscfuture/has_metadata"
-  s.require_paths = ["lib"]
+  s.homepage = %q{http://github.com/riscfuture/has_metadata}
+  s.require_paths = [%q{lib}]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "1.8.15"
-  s.summary = "Reduce your table width by moving non-indexed columns to a separate metadata table"
+  s.rubygems_version = %q{1.8.9}
+  s.summary = %q{Reduce your table width by moving non-indexed columns to a separate metadata table}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["< 3.1"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.1"])
       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.1"])
+      s.add_dependency(%q<rails>, [">= 3.1"])
       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.1"])
+    s.add_dependency(%q<rails>, [">= 3.1"])
     s.add_dependency(%q<boolean>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/lib/has_metadata/model.rb

@@ -11,6 +11,9 @@ module HasMetadata
     after_initialize :initialize_data
     before_save :nullify_empty_fields
 
+    validates :data,
+              presence: true
+
     # @private
     def set_fields(fields)
       return self if @_fields_set
@@ -56,19 +59,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

data/lib/has_metadata.rb

@@ -26,7 +26,7 @@ module HasMetadata
     if value.kind_of?(String) then
       if type == Integer or type == Fixnum then
         begin
-          return Integer(value.sub(/^0+/, '')) # so that it doesn't think it's in octal
+          return Integer(value)
         rescue ArgumentError
           return value
         end
@@ -63,23 +63,14 @@ module HasMetadata
     #   has_metadata(optional: true, required: { presence: true }, number: { type: Fixnum })
 
     def has_metadata(fields)
-      if !respond_to?(:metadata_fields) then
-        belongs_to :metadata, dependent: :destroy
-        accepts_nested_attributes_for :metadata
-        after_save :save_metadata, if: :metadata_changed?
+      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
 
-        class_inheritable_hash :metadata_fields
-        self.metadata_fields = fields.deep_clone
-
-        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)
-      end
+      define_method(:save_metadata) { metadata.save! }
+      define_method(:metadata_changed?) { metadata.try :changed? }
 
       fields.each do |name, options|
         # delegate all attribute methods to the metadata
@@ -87,7 +78,6 @@ module HasMetadata
         
         if options.kind_of?(Hash) then
           type = options.delete(:type)
-          type_validate = !options.delete(:skip_type_validation)
           options.delete :default
           
           validate do |obj|
@@ -95,7 +85,7 @@ module HasMetadata
             errors.add(name, :incorrect_type) unless
               HasMetadata.metadata_typecast(value, type).kind_of?(type) or
                 ((options[:allow_nil] and value.nil?) or (options[:allow_blank] and value.blank?))
-          end if type && type_validate
+          end if type
           validates(name, options) unless options.empty? or (options.keys - [ :allow_nil, :allow_blank ]).empty?
         end
       end
@@ -106,19 +96,6 @@ module HasMetadata
 
   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
-
     # @private
     def assign_multiparameter_attributes(pairs)
       fake_attributes = pairs.select { |(field, _)| self.class.metadata_fields.include? field[0, field.index('(')].to_sym }
@@ -147,17 +124,13 @@ module HasMetadata
 
     # @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
+      if instance_variables.include?(:@metadata) then
+        metadata.set_fields self.class.metadata_fields
       else
-        if new_record? then
-          metadata || build_metadata
-        else
-          metadata || Metadata.transaction { metadata || create_metadata }
-        end
-      end.set_fields self.class.metadata_fields
+        (metadata || Metadata.transaction { metadata || create_metadata }).set_fields self.class.metadata_fields
+      end
     end
 
     # @private
@@ -165,18 +138,4 @@ module HasMetadata
       "#<#{self.class.to_s} #{attributes.merge(metadata.try(:data).try(:stringify_keys) || {}).map { |k,v| "#{k}: #{v.inspect}" }.join(', ')}>"
     end
   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/templates/create_metadata.rb

@@ -1,7 +1,7 @@
 class CreateMetadata < ActiveRecord::Migration
   def self.up
     create_table :metadata do |t|
-      t.text :data
+      t.text :data, null: false
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_metadata
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.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: 2011-08-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70328104605200 !ruby/object:Gem::Requirement
+  requirement: &2173498820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70328104605200
+  version_requirements: *2173498820
 - !ruby/object:Gem::Dependency
   name: boolean
-  requirement: &70328104604620 !ruby/object:Gem::Requirement
+  requirement: &2173498260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328104604620
+  version_requirements: *2173498260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70328104604020 !ruby/object:Gem::Requirement
+  requirement: &2173358180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328104604020
+  version_requirements: *2173358180
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70328104603440 !ruby/object:Gem::Requirement
+  requirement: &2173357580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328104603440
+  version_requirements: *2173357580
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70328104602820 !ruby/object:Gem::Requirement
+  requirement: &2173356920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328104602820
+  version_requirements: *2173356920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70328104602260 !ruby/object:Gem::Requirement
+  requirement: &2173356440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328104602260
+  version_requirements: *2173356440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70328104601540 !ruby/object:Gem::Requirement
+  requirement: &2173355920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328104601540
+  version_requirements: *2173355920
 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.
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Reduce your table width by moving non-indexed columns to a separate metadata