has_metadata 1.1.1 → 1.2.0

data/Gemfile

@@ -1,6 +1,7 @@
 source :rubygems
 
 gem 'rails', '>= 3.0'
+gem 'boolean'
 
 group :development do
   gem 'jeweler'

data/Gemfile.lock

@@ -1,99 +1,97 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.3)
+    RedCloth (4.2.7)
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.3)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
+    arel (2.0.10)
+    boolean (1.0.1)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
     git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
+    i18n (0.5.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mail (2.2.10)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
-      i18n (~> 0.4.1)
+      i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.3)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rake (0.9.2)
+    rdoc (3.6.1)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    sqlite3 (0.1.1)
-      ffi (>= 0.6.3)
-    thor (0.14.4)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.3)
+    thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-    yard (0.6.2)
+    tzinfo (0.3.28)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   RedCloth
+  boolean
   jeweler
   rails (>= 3.0)
   rspec
   sqlite3
   yard
-
-METADATA
-  version: 1.0.6

data/README.textile

@@ -1,7 +1,7 @@
 h1. has_metadata -- Keep your tables narrow
 
 | *Author* | Tim Morgan |
-| *Version* | 1.1.1 (Nov 21, 2010) |
+| *Version* | 1.2 (Jun 20, 2011) |
 | *License* | Released under the MIT License. |
 
 h2. Important note for those upgrading from 1.0 to 1.1

data/Rakefile

@@ -30,7 +30,7 @@ YARD::Rake::YardocTask.new('doc') do |doc|
   doc.options << "--protected"
   doc.options << "-r" << "README.textile"
   doc.options << "-o" << "doc"
-  doc.options << "--title" << "has_metadata Documentation".inspect
+  doc.options << "--title" << "has_metadata Documentation"
   
   doc.files = [ 'lib/**/*', 'README.textile', 'templates/metadata.rb' ]
 end

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/has_metadata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_metadata}
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tim Morgan"]
-  s.date = %q{2010-11-21}
+  s.authors = [%q{Tim Morgan}]
+  s.date = %q{2011-06-21}
   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 = [
@@ -36,22 +36,17 @@ Gem::Specification.new do |s|
     "templates/metadata.rb"
   ]
   s.homepage = %q{http://github.com/riscfuture/has_metadata}
-  s.require_paths = ["lib"]
+  s.require_paths = [%q{lib}]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Reduce your table width by moving non-indexed columns to a separate metadata table}
-  s.test_files = [
-    "spec/has_metadata_spec.rb",
-    "spec/metadata_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0"])
+      s.add_runtime_dependency(%q<boolean>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<RedCloth>, [">= 0"])
@@ -59,6 +54,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0"])
+      s.add_dependency(%q<boolean>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<RedCloth>, [">= 0"])
@@ -67,6 +63,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0"])
+    s.add_dependency(%q<boolean>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<RedCloth>, [">= 0"])

data/lib/has_metadata/model.rb

@@ -30,8 +30,9 @@ module HasMetadata
       singleton_class.send(:define_method, :attribute) do |name|
         name = name.to_sym
         super(name) unless fields.include?(name)
-        
-        default = (fields[name].kind_of?(Hash) && fields[name][:default]) ? fields[name][:default] : nil
+
+        options = fields[name] || {}
+        default = options.include?(:default) ? options[:default] : nil
         data.include?(name) ? data[name] : default
       end
       singleton_class.send :alias_method, :attribute_before_type_cast, :attribute
@@ -39,9 +40,10 @@ module HasMetadata
       singleton_class.send(:define_method, :query_attribute) do |name|
         name = name.to_sym
         super(name) unless fields.include?(name)
-        
-        if fields[name].kind_of?(Hash) and fields[name].include?(:type) then
-          if fields[name][:type].ancestors.include?(Numeric) then
+
+        options = fields[name] || {}
+        if options.include?(:type) then
+          if options[:type].ancestors.include?(Numeric) then
             not send(name).zero?
           else
             not send(name).blank?
@@ -54,8 +56,10 @@ module HasMetadata
       singleton_class.send(:define_method, :attribute=) do |name, value|
         name = name.to_sym
         super(name, value) unless fields.include?(name)
-        
-        data[name] = value
+
+        options = fields[name] || {}
+        data_will_change!
+        data[name] = HasMetadata.metadata_typecast(value, options[:type])
       end
 
       self
@@ -68,7 +72,7 @@ module HasMetadata
     end
 
     def nullify_empty_fields
-      data.each { |key, value| data[key] = nil if data[key].blank? }
+      data.each { |key, value| data[key] = nil if value.blank? }
     end
   end
 end

data/lib/has_metadata.rb

@@ -20,6 +20,26 @@ end
 module HasMetadata
   extend ActiveSupport::Concern
   
+  # @private
+  def self.metadata_typecast(value, type)
+    if value.kind_of?(String) then
+      if type == Integer or type == Fixnum then
+        begin
+          return Integer(value)
+        rescue ArgumentError
+          return value
+        end
+      elsif type == Float then
+        begin
+          return Float(value)
+        rescue ArgumentError
+          return value
+        end
+      elsif type == Boolean then return value.parse_bool end
+    end
+    return value
+  end
+  
   # Class methods that are added to your model.
   
   module ClassMethods
@@ -44,12 +64,12 @@ module HasMetadata
     def has_metadata(fields)
       belongs_to :metadata, dependent: :destroy
       accepts_nested_attributes_for :metadata
-      #after_save :save_metadata, if: :metadata_changed?
+      after_save :save_metadata, if: :metadata_changed?
       class_inheritable_hash :metadata_fields
       self.metadata_fields = fields.deep_clone
 
-      #define_method(:save_metadata) { metadata.save! }
-      #define_method(:metadata_changed?) { metadata and metadata.changed? }
+      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
@@ -60,9 +80,10 @@ module HasMetadata
           options.delete :default
           
           validate do |obj|
+            value = obj.send(name)
             errors.add(name, :incorrect_type) unless
-              metadata_typecast(obj.send(name), type).kind_of?(type) or
-                ((options[:allow_nil] and obj.send(name).nil?) or (options[:allow_blank] and obj.send(name).blank?))
+              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
           validates(name, options) unless options.empty? or (options.keys - [ :allow_nil, :allow_blank ]).empty?
         end
@@ -74,15 +95,6 @@ module HasMetadata
 
   module InstanceMethods
 
-    # @private
-    def metadata_typecast(value, type)
-      if value.kind_of?(String) then
-        if type == Integer or type == Fixnum then return value.to_i
-        elsif type == Float then return value.to_f end
-      end
-      return value
-    end
-
     # @private
     def assign_multiparameter_attributes(pairs)
       fake_attributes = pairs.select { |(field, _)| self.class.metadata_fields.include? field[0, field.index('(')].to_sym }

data/spec/has_metadata_spec.rb

@@ -12,8 +12,12 @@ module SpecSupport
     has_metadata({
       untyped: {},
       can_be_nil: { type: Date, allow_nil: true },
+      can_be_nil_with_default: { type: Date, allow_nil: true, default: Date.today },
       can_be_blank: { type: Date, allow_blank: true },
+      can_be_blank_with_default: { type: Date, allow_blank: true, default: Date.today },
+      cannot_be_nil_with_default: { type: Boolean, allow_nil: false, default: false },
       number: { type: Fixnum, numericality: true },
+      boolean: { type: Boolean },
       multiparam: { type: SpecSupport::ConstructorTester },
       has_default: { default: 'default' }
     })
@@ -69,10 +73,12 @@ describe HasMetadata do
       end
     end
 
-    context "setters" do
+    describe "#attribute=" do
       before :each do
         @object = SpecSupport::HasMetadataTester.new
         @metadata = @object.metadata!
+        @object.boolean = false
+        @object.multiparam = SpecSupport::ConstructorTester.new(1,2,3)
       end
 
       it "should set the value in the metadata object" do
@@ -95,6 +101,20 @@ describe HasMetadata do
         @object.should_not be_valid
         @object.errors[:multiparam].should_not be_empty
       end
+      
+      it "should cast a type if possible" do
+        @object.number = "50"
+        @object.should be_valid
+        @object.number.should eql(50)
+        
+        @object.boolean = "1"
+        @object.should be_valid
+        @object.boolean.should eql(true)
+        
+        @object.boolean = "0"
+        @object.should be_valid
+        @object.boolean.should eql(false)
+      end
 
       it "should not enforce a type if :allow_nil is given" do
         @object.can_be_nil = nil
@@ -107,6 +127,20 @@ describe HasMetadata do
         @object.valid? #@object.should be_valid
         @object.errors[:can_be_blank].should be_empty
       end
+      
+      it "should set to the default if given nil and allow_blank or allow_nil are false" do
+        @object.can_be_nil_with_default = nil
+        @object.can_be_nil_with_default.should be_nil
+        
+        @object.can_be_blank_with_default = nil
+        @object.can_be_blank_with_default.should be_nil
+        
+        @object.cannot_be_nil_with_default.should eql(false)
+        
+        @object.cannot_be_nil_with_default = nil
+        @object.should_not be_valid
+        @object.errors[:cannot_be_nil_with_default].should_not be_empty
+      end
 
       it "should enforce other validations as given" do
         @object.number = 'not number'
@@ -175,5 +209,16 @@ describe HasMetadata do
         end
       end
     end
+    
+    context "[association]" do
+      it "should save the metadata when it is changed" do
+        object = SpecSupport::HasMetadataTester.new
+        object.number = 123
+        object.boolean = true
+        object.multiparam = SpecSupport::ConstructorTester.new(1,2,3)
+        object.metadata.should_receive(:save).once.and_return(true)
+        object.save!
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'bundler'
+Bundler.require :default, :development
 require 'active_support'
 require 'active_record'
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: has_metadata
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
+  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors: 
 - Tim Morgan
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 -08:00
-default_executable: 
+date: 2011-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -24,78 +19,76 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: boolean
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: jeweler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: yard
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: RedCloth
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sqlite3
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 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.
 email: git@timothymorgan.info
 executables: []
@@ -123,7 +116,6 @@ files:
 - spec/spec_helper.rb
 - templates/create_metadata.rb
 - templates/metadata.rb
-has_rdoc: true
 homepage: http://github.com/riscfuture/has_metadata
 licenses: []
 
@@ -137,26 +129,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
       version: "1.9"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Reduce your table width by moving non-indexed columns to a separate metadata table
-test_files: 
-- spec/has_metadata_spec.rb
-- spec/metadata_spec.rb
-- spec/spec_helper.rb
+test_files: []
+