custom-attributes 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/active_record/custom_attributes.rb

@@ -15,15 +15,16 @@ module ActiveRecord
       end
 
       def has_custom_attributes(extra_field_types = {}, &block)
-        raise "Block expected" unless block_given?
+        field_types = extra_field_types
+        field_types = self.defined_custom_field_types.merge(extra_field_types) if has_custom_attributes?
 
-        field_definitions = CustomAttributeDefinitionHelper.new extra_field_types
-        yield field_definitions
+        field_definitions = CustomAttributeDefinitionHelper.new field_types
+        yield field_definitions if block_given?
         defined_custom_attributes = field_definitions.defined_attributes
 
         if has_custom_attributes?
           write_inheritable_attribute(:defined_custom_attributes, self.defined_custom_attributes.deep_merge(defined_custom_attributes))
-          write_inheritable_attribute(:defined_custom_field_types, self.extra_field_types.merge(extra_field_types))
+          write_inheritable_attribute(:defined_custom_field_types, field_types)
         else
           write_inheritable_attribute(:defined_custom_attributes, defined_custom_attributes)
           class_inheritable_reader(:defined_custom_attributes)

data/spec/custom_attributes/has_custom_attributes_spec.rb

@@ -40,7 +40,7 @@ describe "Custom attributes of a person" do
     fields[0].value.should == "06 28 61 06 28"
   end
 
-  it "should cache fields locally" do
+  it "should cache the 'born on' date locally" do
     @person.custom_attributes.add_date "Born on", Date.civil(1981, 5, 31)
     @person.save
     @person.born_on.should == Date.civil(1981,5, 31)
@@ -103,13 +103,19 @@ describe "Custom attributes of a product" do
     fields[0].value.should == 5.60
   end
 
-  it "should cache not fields locally" do
+  it "should not cache width locally" do
     @product.custom_attributes.add_size "Width", 5.60
     @product.save
     @product.width.should == nil
     @product.custom_attributes.size_value_of(:width).should == 5.60
   end
 
+  it "should cache the details url locally" do
+    @product.custom_attributes.add_url "Details", "http://example.com/"
+    @product.save
+    @product.details_url.should == "http://example.com/"
+  end
+
   it "should rename labels" do
     @product.custom_attributes.add_size "Width", 5.60
 

data/spec/models.rb

@@ -10,10 +10,14 @@ end
 
 class Product < ActiveRecord::Base
 
+  has_custom_attributes :url => :string
+
   has_custom_attributes :size => :float do |fields|
     fields.size :width, :height, :depth
+    fields.url :details, :on_model => { :details => :details_url }
   end
 
+
 end
 
 class Location < ActiveRecord::Base

data/spec/schema.rb

@@ -34,6 +34,7 @@ ActiveRecord::Schema.define :version => 0 do
     t.string :name
     t.float :width
     t.float :height
+    t.string :details_url
   end
 
   create_table "locations", :force => true do |t|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: custom-attributes
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Matthijs Groen