has_metadata 1.5.2 → 1.5.3

data/README.textile

@@ -1,7 +1,7 @@
 h1. has_metadata -- Keep your tables narrow
 
 | *Author* | Tim Morgan |
-| *Version* | 1.5.2 (Dec 27, 2011) |
+| *Version* | 1.5.3 (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

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = "2011-12-28"
+  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 = [
@@ -29,14 +29,14 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/riscfuture/has_metadata"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "1.8.13"
+  s.rubygems_version = "1.8.15"
   s.summary = "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.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.1"])
+      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.1"])
+    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

@@ -26,7 +26,7 @@ module HasMetadata
     if value.kind_of?(String) then
       if type == Integer or type == Fixnum then
         begin
-          return Integer(value)
+          return Integer(value.sub(/^0+/, '')) # so that it doesn't think it's in octal
         rescue ArgumentError
           return value
         end
@@ -84,6 +84,7 @@ 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|
@@ -91,7 +92,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
+          end if type && type_validate
           validates(name, options) unless options.empty? or (options.keys - [ :allow_nil, :allow_blank ]).empty?
         end
       end
@@ -143,13 +144,17 @@ module HasMetadata
 
     # @return [Metadata] An existing associated {Metadata} instance, or new,
     #   saved one if none was found.
-
+    
     def metadata!
       if instance_variables.include?(:@metadata) then
-        metadata.set_fields self.class.metadata_fields
+        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

data/templates/create_metadata.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_metadata
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70205459933480 !ruby/object:Gem::Requirement
+  requirement: &70238498869260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70205459933480
+  version_requirements: *70238498869260
 - !ruby/object:Gem::Dependency
   name: boolean
-  requirement: &70205459933000 !ruby/object:Gem::Requirement
+  requirement: &70238498722520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205459933000
+  version_requirements: *70238498722520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70205459932520 !ruby/object:Gem::Requirement
+  requirement: &70238498878240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205459932520
+  version_requirements: *70238498878240
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70205459932040 !ruby/object:Gem::Requirement
+  requirement: &70238498887960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205459932040
+  version_requirements: *70238498887960
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70205459931560 !ruby/object:Gem::Requirement
+  requirement: &70238498966980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205459931560
+  version_requirements: *70238498966980
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70205459931080 !ruby/object:Gem::Requirement
+  requirement: &70238498988960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205459931080
+  version_requirements: *70238498988960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70205459930600 !ruby/object:Gem::Requirement
+  requirement: &70238499053380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205459930600
+  version_requirements: *70238499053380
 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.13
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Reduce your table width by moving non-indexed columns to a separate metadata