custom-attributes 0.2.18 → 0.2.22

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.2.22

data/lib/active_record/custom_attributes/custom_attribute.rb

@@ -1,11 +1,11 @@
 class ActiveRecord::CustomAttributes::CustomAttribute
 
   def initialize(item_list, main_model, attribute_model)
-    @main_model = main_model
-    @item_list = item_list
-    @attribute_model = attribute_model
+    @main_model             = main_model
+    @item_list              = item_list
+    @attribute_model        = attribute_model
     @marked_for_destruction = false
-    @errors = ActiveModel::Errors.new(self)
+    @errors                 = ActiveModel::Errors.new(self)
     load if @attribute_model
   end
 
@@ -64,24 +64,24 @@ class ActiveRecord::CustomAttributes::CustomAttribute
   attr_reader :main_model, :item_list
 
   FIELD_MAPPING = {
-          :text => :text,
-          :string => :text,
-          :float => :float,
-          :number => :number,
-          :boolean => :number,
+          :text      => :text,
+          :string    => :text,
+          :float     => :float,
+          :number    => :number,
+          :boolean   => :number,
           :date_time => :date_time,
-          :date => :date_time,
-          :time => :date_time
+          :date      => :date_time,
+          :time      => :date_time
   }
 
   def assign_model_value
-    attribute_model.value_type = type.to_s
-    attribute_model.field_name = internal_label.to_s
+    attribute_model.value_type  = type.to_s
+    attribute_model.field_name  = internal_label.to_s
     attribute_model.field_label = label
-    write_value = item_list.supported_attribute_types[type]
-    field = FIELD_MAPPING[write_value]
+    write_value                 = item_list.supported_attribute_types[type]
+    field                       = FIELD_MAPPING[write_value]
 
-    converted_value = value
+    converted_value             = value
     converted_value = value ? 1 : 0 if write_value == :boolean
 
     ([:text, :date_time, :number, :float] - [field]).each { |value_field| attribute_model.send("#{value_field}_value=", nil) }
@@ -89,13 +89,17 @@ class ActiveRecord::CustomAttributes::CustomAttribute
   end
 
   def load
-    self.type = attribute_model.value_type.to_sym
-    self.internal_label = attribute_model.field_name.to_sym
+    self.type  = attribute_model.value_type.to_sym
+    if attribute_model.field_name.nil? or attribute_model.field_name.blank?
+      self.internal_label = nil
+    else
+      self.internal_label = attribute_model.field_name.to_sym
+    end
     self.label = attribute_model.field_label
 
     read_value = item_list.supported_attribute_types[self.type]
-    field = FIELD_MAPPING[read_value]
-    value = attribute_model.send("#{field}_value")
+    field      = FIELD_MAPPING[read_value]
+    value      = attribute_model.send("#{field}_value")
     value = value == 0 ? false : true if read_value == :boolean
     #puts "#{self.type} => #{read_value} = (#{field}) #{value} - #{self.label} (#{self.internal_label})"
     self.value = value

data/lib/active_record/custom_attributes/custom_attribute_list.rb

@@ -59,7 +59,7 @@ class ActiveRecord::CustomAttributes::CustomAttributeList
   end
 
   def get_custom_validations_for(type, name)
-    [defined_validations[type], defined_attributes[type][name][:validate_with]].compact
+    [defined_validations[type], (defined_attributes[type][name] || {})[:validate_with]].compact
   end
 
   def defined_attribute_types

data/lib/formtastic/custom_attributes.rb

@@ -38,7 +38,7 @@ module Formtastic
 
       index = 0
       value_fields = @object.custom_attributes.attributes_of_type(attribute_type).collect do |attribute|
-        result = custom_field_input(attribute_type, [attribute_type, storage_type], attribute.label, attribute.value, index, {})
+        result = custom_field_input(attribute_type, [attribute_type, storage_type], attribute.label, attribute.value, index, { :errors => attribute.errors })
         index += 1
         result
       end
@@ -163,22 +163,47 @@ module Formtastic
     ## Field addition support
 
     def custom_string_input(attribute_type, value, index, options = {})
-      default_custom_field_handler(:text_field_tag, attribute_type, value, index)
+      default_custom_field_handler(:text_field_tag, attribute_type, value, index, options)
     end
 
     def custom_email_input(attribute_type, value, index, options = {})
-      default_custom_field_handler(:email_field_tag, attribute_type, value, index)
+      default_custom_field_handler(:email_field_tag, attribute_type, value, index, options)
     end
 
     def custom_url_input(attribute_type, value, index, options = {})
-      default_custom_field_handler(:url_field_tag, attribute_type, value, index)
+      default_custom_field_handler(:url_field_tag, attribute_type, value, index, options)
     end
 
-    def default_custom_field_handler(method, attribute_type, value, index)
+    def custom_date_input(attribute_type, value, index, options = {})
       i18n_scope = [:activerecord, :custom_attributes, @object.class.model_name.underscore.to_sym]
       attribute_human_name = ::I18n.t(attribute_type, :count => 1, :scope => i18n_scope + [:attribute_names]).capitalize
+      format = options[:format] || I18n.t(:default, :scope => [:date, :formats]) || '%d %b %Y'
+
+      error_listing = ""
+      if options[:errors]
+        errors = [options[:errors][:value]]
+        errors = errors.flatten.compact.uniq
+        error_listing = send(:"error_#{self.class.inline_errors}", [*errors]) if errors.any?
+      end
+
+      str_value = value.respond_to?(:strftime) ? value.try(:strftime, format) : value
+
+      template.text_field_tag(field_name_for(attribute_type, "value", index), str_value, :class => 'custom-datepicker') <<
+              custom_attribute_delete_link(attribute_human_name) << error_listing
+    end
+
+    def default_custom_field_handler(method, attribute_type, value, index, options)
+      i18n_scope = [:activerecord, :custom_attributes, @object.class.model_name.underscore.to_sym]
+      attribute_human_name = ::I18n.t(attribute_type, :count => 1, :scope => i18n_scope + [:attribute_names]).capitalize
+      error_listing = ""
+      if options[:errors]
+        errors = [options[:errors][:value]]
+        errors = errors.flatten.compact.uniq
+        error_listing = send(:"error_#{self.class.inline_errors}", [*errors]) if errors.any?
+      end
+
       template.send(method, field_name_for(attribute_type, "value", index), value) <<
-              custom_attribute_delete_link(attribute_human_name)
+              custom_attribute_delete_link(attribute_human_name) << error_listing
     end
 
     delegate :content_tag, :to => :template

data/spec/custom_attributes/has_custom_attributes_spec.rb

@@ -59,6 +59,14 @@ describe "Custom attributes of a person" do
     loaded_person.custom_attributes.telephone_value_of(:private).should == "06 28 61 06 28"
   end
 
+  it "should accept custom defined labels" do
+    @person.custom_attributes.add_telephone "Werk", "06 28 61 06 28"
+    @person.save
+
+    loaded_person = Person.find @person.id
+    loaded_person.custom_attributes.telephone_value_of("Werk").should == "06 28 61 06 28"
+  end
+
   it "should rename labels" do
     @person.custom_attributes.add_telephone "Werk", "06 28 61 06 28"
 
@@ -241,4 +249,9 @@ describe "Custom attributes of a product" do
     @product.should be_valid
   end
 
+  it "should not run custom validations if name differs" do
+    @product.custom_attributes.add_date "In stock sance", Date.civil(2009, 12, 31)
+    @product.should be_valid
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: custom-attributes
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 2
-  - 18
-  version: 0.2.18
+  - 22
+  version: 0.2.22
 platform: ruby
 authors: 
 - Matthijs Groen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +02:00
+date: 2010-10-28 00:00:00 +02:00
 default_executable: 
 dependencies: []