has_metadata 1.1.0 → 1.1.1

data/README.textile

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

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/has_metadata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_metadata}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = %q{2010-11-17}
+  s.date = %q{2010-11-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 = [

data/lib/has_metadata/model.rb

@@ -16,12 +16,46 @@ module HasMetadata
 
     # @private
     def set_fields(fields)
-      return self if @fields_set
-      @fields_set = true
-
-      fields.each do |name, _|
-        singleton_class.send(:define_method, name) { |default=nil| data.include?(name) ? data[name] : default }
-        singleton_class.send(:define_method, :"#{name}=") { |value| data[name] = value }
+      return self if @_fields_set
+      @_fields_set = true
+      
+      singleton_class.send(:define_method, :attribute_method?) do |name|
+        name = name.to_sym
+        super(name) or fields.include?(name)
+      end
+      
+      # override attribute prefix/suffix methods to get full first-class
+      # property functionality
+      
+      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
+        data.include?(name) ? data[name] : default
+      end
+      singleton_class.send :alias_method, :attribute_before_type_cast, :attribute
+      
+      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
+            not send(name).zero?
+          else
+            not send(name).blank?
+          end
+        else
+          not send(name).blank?
+        end
+      end
+      
+      singleton_class.send(:define_method, :attribute=) do |name, value|
+        name = name.to_sym
+        super(name, value) unless fields.include?(name)
+        
+        data[name] = value
       end
 
       self
@@ -37,4 +71,4 @@ module HasMetadata
       data.each { |key, value| data[key] = nil if data[key].blank? }
     end
   end
-end
+end

data/lib/has_metadata.rb

@@ -52,23 +52,19 @@ module HasMetadata
       #define_method(:metadata_changed?) { metadata and metadata.changed? }
 
       fields.each do |name, options|
-        delegate :"#{name}=", to: :metadata!
+        # delegate all attribute methods to the metadata
+        attribute_method_matchers.each { |matcher| delegate matcher.method_name(name), to: :metadata! }
         
         if options.kind_of?(Hash) then
-          default = options.delete(:default)
-          define_method(name) { metadata!.send(name, default) }
+          type = options.delete(:type)
+          options.delete :default
           
-          unless options.empty?
-            type = options.delete(:type)
-            validate do |obj|
-              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?))
-            end if type
-            validates(name, options) unless options.empty? or (options.keys - [ :allow_nil, :allow_blank ]).empty?
-          end
-        else
-          delegate name, to: :metadata!
+          validate do |obj|
+            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?))
+          end if type
+          validates(name, options) unless options.empty? or (options.keys - [ :allow_nil, :allow_blank ]).empty?
         end
       end
     end

data/spec/has_metadata_spec.rb

@@ -13,7 +13,7 @@ module SpecSupport
       untyped: {},
       can_be_nil: { type: Date, allow_nil: true },
       can_be_blank: { type: Date, allow_blank: true },
-      number: { numericality: true },
+      number: { type: Fixnum, numericality: true },
       multiparam: { type: SpecSupport::ConstructorTester },
       has_default: { default: 'default' }
     })
@@ -30,46 +30,44 @@ describe HasMetadata do
       SpecSupport::HasMetadataTester.nested_attributes_options[:metadata].should_not be_nil
     end
     
-    it "should make a getter for each field" do
-      SpecSupport::HasMetadataTester.new.should respond_to(:untyped)
-      SpecSupport::HasMetadataTester.new.should respond_to(:multiparam)
-      SpecSupport::HasMetadataTester.new.should respond_to(:number)
-    end
-
-    context "getters" do
-      before :each do
-        @object = SpecSupport::HasMetadataTester.new
-        @metadata = @object.metadata!
-      end
-
-      it "should return a field in the metadata object" do
-        @metadata.data[:untyped] = 'bar'
-        @object.untyped.should eql('bar')
+    it "should define methods for each field" do
+      [ :attribute, :attribute_before_type_cast, :attribute= ].each do |meth|
+        SpecSupport::HasMetadataTester.new.should respond_to(meth.to_s.sub('attribute', 'untyped'))
+        SpecSupport::HasMetadataTester.new.should respond_to(meth.to_s.sub('attribute', 'multiparam'))
+        SpecSupport::HasMetadataTester.new.should respond_to(meth.to_s.sub('attribute', 'number'))
       end
+    end
 
-      it "should return nil if there is no associated metadata" do
-        @object.stub!(:metadata).and_return(nil)
-        ivars = @object.instance_variables - [ :@metadata ]
-        @object.stub!(:instance_variables).and_return(ivars)
-
-        @object.untyped.should be_nil
-      end
+    [ :attribute, :attribute_before_type_cast ].each do |getter|
+      describe "##{getter}" do
+        before :each do
+          @object = SpecSupport::HasMetadataTester.new
+          @metadata = @object.metadata!
+        end
+
+        it "should return a field in the metadata object" do
+          @metadata.data[:untyped] = 'bar'
+          @object.send(getter.to_s.sub('attribute', 'untyped')).should eql('bar')
+        end
+
+        it "should return nil if there is no associated metadata" do
+          @object.stub!(:metadata).and_return(nil)
+          ivars = @object.instance_variables - [ :@metadata ]
+          @object.stub!(:instance_variables).and_return(ivars)
+
+          @object.send(getter.to_s.sub('attribute', 'untyped')).should be_nil
+        end
       
-      it "should return a default if one is specified" do
-        @object.has_default.should eql('default')
-      end
+        it "should return a default if one is specified" do
+          @object.send(getter.to_s.sub('attribute', 'has_default')).should eql('default')
+        end
       
-      it "should return nil if nil is stored and the default is not nil" do
-        @metadata.data[:has_default] = nil
-        @object.has_default.should eql(nil)
+        it "should return nil if nil is stored and the default is not nil" do
+          @metadata.data[:has_default] = nil
+          @object.send(getter.to_s.sub('attribute', 'has_default')).should eql(nil)
+        end
       end
     end
-    
-    it "should make a setter for each field" do
-      SpecSupport::HasMetadataTester.new.should respond_to(:untyped=)
-      SpecSupport::HasMetadataTester.new.should respond_to(:multiparam=)
-      SpecSupport::HasMetadataTester.new.should respond_to(:number=)
-    end
 
     context "setters" do
       before :each do
@@ -131,5 +129,51 @@ describe HasMetadata do
         @object.multiparam.args.should eql([ 1982, 10.5 ])
       end
     end
+    
+    describe "#attribute?" do
+      before :each do
+        @object = SpecSupport::HasMetadataTester.new
+        @metadata = @object.metadata!
+      end
+
+      context "untyped field" do
+        it "should return true if the string is not blank" do
+          @metadata.data = { untyped: 'foo' }
+          @object.untyped?.should be_true
+        end
+
+        it "should return false if the string is blank" do
+          @metadata.data = { untyped: ' ' }
+          @object.untyped?.should be_false
+
+          @metadata.data = { untyped: '' }
+          @object.untyped?.should be_false
+        end
+      end
+
+      context "numeric field" do
+        it "should return true if the number is not zero" do
+          @metadata.data = { number: 4 }
+          @object.number?.should be_true
+        end
+        
+        it "should return false if the number is zero" do
+          @metadata.data = { number: 0 }
+          @object.number?.should be_false
+        end
+      end
+
+      context "typed, non-numeric field" do
+        it "should return true if the string is not blank" do
+          @metadata.data = { can_be_nil: Date.today }
+          @object.can_be_nil?.should be_true
+        end
+        
+        it "should return false if the string is blank" do
+          @metadata.data = { can_be_nil: nil }
+          @object.can_be_nil?.should be_false
+        end
+      end
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Tim Morgan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2010-11-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency