custom-attributes 0.2.5 → 0.2.12

data/README.markdown

@@ -7,6 +7,15 @@ or weight and size measurements to products.
 Most of these fields can be used purely dynamic and objects could have multiples of them (think telephone numbers, or email
 addresses)
 
+This code is *NOT* production ready yet!
+
+TODO
+====
+- Make Formtastic extension better
+- Supply specs for the formtastic part
+- Make custom extensions work as nested forms (accept_attributes_for stuff)
+
+
 Contents of the package
 =======================
 

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.12

data/lib/active_record/custom_attributes/custom_attribute.rb

@@ -4,7 +4,7 @@ class ActiveRecord::CustomAttributes::CustomAttribute
     @main_model = main_model
     @item_list = item_list
     @attribute_model = attribute_model
-    @marked_for_deletion = false
+    @marked_for_destruction = false
     load if @attribute_model
   end
 
@@ -12,7 +12,7 @@ class ActiveRecord::CustomAttributes::CustomAttribute
     attr_accessor property
 
     define_method "#{property}_with_activation=" do |new_value|
-      @marked_for_deletion = false
+      @marked_for_destruction = false
       send("#{property}_without_activation=".to_sym, new_value)
     end
     alias_method_chain "#{property}=".to_sym, :activation
@@ -22,16 +22,16 @@ class ActiveRecord::CustomAttributes::CustomAttribute
     item_list.rename_label_of self, new_name
   end
 
-  def mark_for_deletion
-    @marked_for_deletion = true
+  def mark_for_destruction
+    @marked_for_destruction = true
   end
 
-  def marked_for_deletion?
-    @marked_for_deletion
+  def marked_for_destruction?
+    @marked_for_destruction
   end
 
   def save
-    attribute_model.destroy and return if marked_for_deletion?
+    attribute_model.destroy and return if marked_for_destruction?
 
     attribute_model.value_type = type.to_s
     attribute_model.field_name = internal_label.to_s

data/lib/active_record/custom_attributes/custom_attribute_list.rb

@@ -8,18 +8,14 @@ class ActiveRecord::CustomAttributes::CustomAttributeList
   end
 
   def set_post_data(post_data)
-    loaded_attributes.each(&:mark_for_deletion)
+    loaded_attributes.each(&:mark_for_destruction)
     post_data.each do |attribute_type, values|
       attribute_type = attribute_type.to_sym
       if supported_attribute_types.keys.include? attribute_type
-        label_list = values["label"]
-        value_list = values["value"]
-
-        label_list.each_with_index do |label, index|
-          add attribute_type, label, value_list[index]
+        values.each do |key, attributes|
+          add attribute_type, attributes["label"], attributes["value"] unless key == "%nr%"
         end
-
-      end # TODO: Now what? Custom defined attributes also come here. Or should that be changed?
+      end
     end
   end
 
@@ -75,7 +71,7 @@ class ActiveRecord::CustomAttributes::CustomAttributeList
   end
 
   def attributes_of_type(type)
-    loaded_attributes.select { |i| i.type == type.to_sym and !i.marked_for_deletion? }
+    loaded_attributes.select { |i| i.type == type.to_sym and !i.marked_for_destruction? }
   end
 
   private
@@ -121,7 +117,7 @@ class ActiveRecord::CustomAttributes::CustomAttributeList
 
   def get_value_of(type, internal_label)
     found = get_attribute(type, internal_label)
-    return nil if found and found.marked_for_deletion?
+    return nil if found and found.marked_for_destruction?
     found.value if found
   end
 

data/lib/formtastic/custom_attributes.rb

@@ -36,10 +36,12 @@ module Formtastic
       storage_type = @object.custom_attributes.supported_attribute_types[attribute_type]
       i18n_scope = [:activerecord, :custom_attributes, @object.class.model_name.underscore.to_sym]
 
+      index = 0
       value_fields = @object.custom_attributes.attributes_of_type(attribute_type).collect do |attribute|
-        custom_field_input(attribute_type, [attribute_type, storage_type], attribute.label, attribute.value)
+        custom_field_input(attribute_type, [attribute_type, storage_type], attribute.label, attribute.value, index, {})
+        index += 1
       end
-      field_template = custom_field_input(attribute_type, [attribute_type, storage_type], "", nil, :template => true)
+      field_template = custom_field_input(attribute_type, [attribute_type, storage_type], "", nil, "%nr%", :template => true)
 
       attribute_human_name = ::I18n.t(attribute_type,
               :count => 1,
@@ -51,7 +53,8 @@ module Formtastic
                       :class => "add-link",
                       :title => ::I18n.t(:add, :scope => :default_actions, :model => attribute_human_name),
                       :'data-attribute-type' => attribute_type
-              ) << field_template << label_data_list_for(attribute_type, @object.custom_attributes.defined_labels_for(attribute_type)),
+              ) << inline_hints_for(attribute_type, {}) <<
+                      field_template << label_data_list_for(attribute_type, @object.custom_attributes.defined_labels_for(attribute_type)),
               :class => "field-addition"
       )
 
@@ -69,10 +72,13 @@ module Formtastic
       association = @object.class.reflect_on_association(association_name)
       storage_type = association.klass.model_name.underscore.to_sym
 
+      index = 0
       value_fields = @object.send(association_name).collect do |item|
-        custom_field_input(storage_type, [storage_type], item.name, item)
+        result = custom_field_input(storage_type, [storage_type], item.name, item, index, {})
+        index += 1
+        result
       end
-      field_template = custom_field_input(storage_type, [storage_type], "", nil, :template => true)
+      field_template = custom_field_input(association_name, [storage_type], "", nil, "%nr%", :template => true)
 
       attribute_human_name = association.klass.model_name.human
       value_fields << content_tag(:li,
@@ -122,24 +128,28 @@ module Formtastic
 
     end
 
-    def field_name_for(attribute_type, field_type)
+    def field_name_for(attribute_type, field_type, index)
       if @object.custom_attributes.supported_attribute_types.keys.include? attribute_type
-        "#{@object.class.model_name.underscore}[custom_attributes][#{attribute_type}][#{field_type}][]"
+        "#{@object.class.model_name.underscore}[custom_attributes][#{attribute_type}][#{index}][#{field_type}]"
       else
-        "#{@object.class.model_name.underscore}[#{attribute_type}][#{field_type}][]"
+        "#{@object.class.model_name.underscore}[#{attribute_type}_attributes][#{index}][#{field_type}]"
       end
     end
 
-    def custom_field_input(attribute_type, field_method_priority, label, value, options = {})
-      label_name  = field_name_for attribute_type, "label"
+    def custom_field_input(attribute_type, field_method_priority, label, value, index, options)
+      label_name  = field_name_for attribute_type, "label", index
       label_field = template.text_field_tag(label_name, label, :list => "#{attribute_type}-label-suggestions", :autocomplete => "off")
 
       input_field_method = field_method_priority.collect { |m| "custom_#{m}_input".to_sym }.find { |m| self.respond_to? m, true }
-      input_field = send(input_field_method, attribute_type, value, options)
+      input_field = send(input_field_method, attribute_type, value, index, options)
 
-      content_tag(options[:template] ? :div : :li,
-              Formtastic::Util.html_safe(content_tag(:div, label_field, :class => "label") <<
-                      input_field) << inline_hints_for(field_method_priority.first, options),
+      field_contents = Formtastic::Util.html_safe(
+              content_tag(:div, label_field, :class => "label") << input_field
+      )
+      field_contents << template.hidden_field_tag(field_name_for(attribute_type, "_destroy", index),
+              false, :class => "delete_check") unless options[:template]
+
+      content_tag(options[:template] ? :div : :li, field_contents,
               :class => options[:template] ? "template" : "value optional #{attribute_type}"
       )
     end
@@ -151,22 +161,22 @@ module Formtastic
 
     ## Field addition support
 
-    def custom_string_input(attribute_type, value, options = {})
-      default_custom_field_handler(:text_field_tag, attribute_type, value)
+    def custom_string_input(attribute_type, value, index, options = {})
+      default_custom_field_handler(:text_field_tag, attribute_type, value, index)
     end
 
-    def custom_email_input(attribute_type, value, options = {})
-      default_custom_field_handler(:email_field_tag, attribute_type, value)
+    def custom_email_input(attribute_type, value, index, options = {})
+      default_custom_field_handler(:email_field_tag, attribute_type, value, index)
     end
 
-    def custom_url_input(attribute_type, value, options = {})
-      default_custom_field_handler(:url_field_tag, attribute_type, value)
+    def custom_url_input(attribute_type, value, index, options = {})
+      default_custom_field_handler(:url_field_tag, attribute_type, value, index)
     end
 
-    def default_custom_field_handler(method, attribute_type, value)
+    def default_custom_field_handler(method, attribute_type, value, index)
       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
-      template.send(method, field_name_for(attribute_type, "value"), value) <<
+      template.send(method, field_name_for(attribute_type, "value", index), value) <<
               custom_attribute_delete_link(attribute_human_name)
     end
 

data/spec/custom_attributes/has_custom_attributes_spec.rb

@@ -88,7 +88,7 @@ describe "Custom attributes of a person" do
 
     fields = @person.custom_attributes.telephone_attributes
     fields.should have(1).item
-    fields[0].mark_for_deletion
+    fields[0].mark_for_destruction
 
     deleted_fields = @person.custom_attributes.telephone_attributes
     deleted_fields.should have(0).items
@@ -102,12 +102,20 @@ describe "Custom attributes of a person" do
 
     custom_attribute_post_data = {
             "telephone" => {
-                    "label" => ["Prive", "Werk", ""],
-                    "value" => ["06 28 61 06 28", "1234567890", ""]
+                    "0" => {
+                            "label" => "Prive",
+                            "value" => "06 28 61 06 28"
+                    },
+                    "1" => {
+                            "label" => "Werk",
+                            "value" => "1234567890"
+                    }
             },
             "email" => {
-                    "label" => ["Prive", ""],
-                    "value" => ["matthijs.groen@gmail.com", ""]
+                    "0" => {
+                            "label" => "Prive",
+                            "value" => "matthijs.groen@gmail.com"
+                    }
             }
     }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: custom-attributes
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 12
+  version: 0.2.12
 platform: ruby
 authors: 
 - Matthijs Groen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
+date: 2010-10-13 00:00:00 +02:00
 default_executable: 
 dependencies: []