inline_forms 0.7.4 → 0.8.0

data/app/helpers/form_elements/dropdown.rb

@@ -1,18 +1,19 @@
-module InlineFormsHelper
-  InlineForms::SPECIAL_COLUMN_TYPES[:dropdown]=:belongs_to
-  # dropdown
-  def dropdown_show(object, attribute, values)
-    attribute_value = object.send(attribute)._presentation rescue  nil
-    link_to_inline_edit object, attribute, attribute_value, nil
-  end
-  def dropdown_edit(object, attribute, values)
-    object.send('build_' + attribute.to_s) unless object.send(attribute)
-    values = object.send(attribute).class.name.constantize.find(:all) # TODO bring order!
-    # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
-    collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_s.foreign_key.to_sym, values, 'id', '_presentation', :selected => object.send(attribute).id)
-  end
-  def dropdown_update(object, attribute, values)
-    object[attribute.to_s.foreign_key.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_s.foreign_key.to_sym]
-  end
+InlineForms::SPECIAL_COLUMN_TYPES[:dropdown]=:belongs_to
+
+# dropdown
+def dropdown_show(object, attribute)
+  attribute_value = object.send(attribute)._presentation rescue  nil
+  link_to_inline_edit object, attribute, attribute_value
+end
+
+def dropdown_edit(object, attribute)
+  object.send('build_' + attribute.to_s) unless object.send(attribute)
+  values = object.send(attribute).class.name.constantize.find(:all) # TODO bring order!
+  # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
+  collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_s.foreign_key.to_sym, values, 'id', '_presentation', :selected => object.send(attribute).id)
+end
+
+def dropdown_update(object, attribute)
+  object[attribute.to_s.foreign_key.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_s.foreign_key.to_sym]
 end
 

data/app/helpers/form_elements/dropdown_with_integers.rb

@@ -1,26 +1,20 @@
-module InlineFormsHelper
-    InlineForms::SPECIAL_COLUMN_TYPES[:dropdown_with_integers]=:integer
-  # dropdown_with_integers generates a dropdown menu
-  # with the given list of integers as options
-  #
-  # values must be a Range or a one-dimensional array of Integers
-  def dropdown_with_integers_show(object, attribute, values)
-    unless values.is_a?(Hash)
-      options = Array.new
-      values.to_a.each_index do |i|
-        options << [ i.to_s, values.to_a[i] ]
-      end
-      values = Hash[ *options.flatten ]
-    end
-    link_to_inline_edit object, attribute, values[object.send(attribute).to_s], values
-  end
-  def dropdown_with_integers_edit(object, attribute, values)
-    # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
-    values = values.sort {|a,b| a[1].to_i<=>b[1].to_i}
-    collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'first', 'last', :selected => object.send(attribute))
-  end
-  def dropdown_with_integers_update(object, attribute, values)
-    object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
-  end
+InlineForms::SPECIAL_COLUMN_TYPES[:dropdown_with_integers]=:integer
+
+# dropdown_with_integers generates a dropdown menu
+# with the given list of integers as options
+#
+# values must be a Range or a one-dimensional array of Integers
+def dropdown_with_integers_show(object, attribute)
+  values = attribute_values(object, attribute)
+  link_to_inline_edit object, attribute, values[object.send(attribute)][1]
+end
+
+def dropdown_with_integers_edit(object, attribute)
+  # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
+  values = attribute_values(object, attribute)
+  collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'first', 'last', :selected => object.send(attribute))
 end
 
+def dropdown_with_integers_update(object, attribute)
+  object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
+end

data/app/helpers/form_elements/dropdown_with_values.rb

@@ -1,23 +1,16 @@
-module InlineFormsHelper
-    InlineForms::SPECIAL_COLUMN_TYPES[:dropdown_with_values]=:integer
-  # dropdown_with_values
-  def dropdown_with_values_show(object, attribute, values)
-    unless values.is_a?(Hash)
-      options = Array.new
-      values.to_a.each_index do |i|
-        options << [ i.to_s, values.to_a[i] ]
-      end
-      values = Hash[ *options.flatten ]
-    end
-    link_to_inline_edit object, attribute, values[object.send(attribute).to_s], values
-  end
-  def dropdown_with_values_edit(object, attribute, values)
-    # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
-    values = values.sort {|a,b| a[1]<=>b[1]}
-    collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'first', 'last', :selected => object.send(attribute))
-  end
-  def dropdown_with_values_update(object, attribute, values)
-    object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
-  end
+InlineForms::SPECIAL_COLUMN_TYPES[:dropdown_with_values]=:integer
+
+# dropdown_with_values
+def dropdown_with_values_show(object, attribute)
+  values = attribute_values(object, attribute)
+  link_to_inline_edit object, attribute, values[object.send(attribute).to_s]
+end
+def dropdown_with_values_edit(object, attribute)
+  # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
+  values = attribute_values(object, attribute)
+  collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'first', 'last', :selected => object.send(attribute))
+end
+def dropdown_with_values_update(object, attribute)
+  object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
 end
 

data/app/helpers/form_elements/geo_code_curacao.rb

@@ -1,17 +1,16 @@
-module InlineFormsHelper
-    InlineForms::SPECIAL_COLUMN_TYPES[:geo_code_curacao]=:string
-  # geo_code_curacao
-  def geo_code_curacao_show(object, attribute, values)
-    attribute_value = object.send(attribute)._presentation rescue nil
-    link_to_inline_edit object, attribute, attribute_value, nil
-  end
-  def geo_code_curacao_edit(object, attribute, values)
-    text_field_with_auto_complete :geo_code_curacao, :street, :skip_style => true
-  end
-  def geo_code_curacao_update(object, attribute, values)
-    # extract the geocode
-    geo_code = params[attribute.to_sym][:street].scan(/\d\d\d\d\d\d/).to_s || nil
-    object[attribute.to_sym] = GeoCodeCuracao.new(geo_code).valid? ? geo_code : nil
-  end
+InlineForms::SPECIAL_COLUMN_TYPES[:geo_code_curacao]=:string
+
+# geo_code_curacao
+def geo_code_curacao_show(object, attribute)
+  attribute_value = object.send(attribute)._presentation rescue nil
+  link_to_inline_edit object, attribute, attribute_value
+end
+def geo_code_curacao_edit(object, attribute)
+  text_field_with_auto_complete :geo_code_curacao, :street, :skip_style => true
+end
+def geo_code_curacao_update(object, attribute)
+  # extract the geocode
+  geo_code = params[attribute.to_sym][:street].scan(/\d\d\d\d\d\d/).to_s || nil
+  object[attribute.to_sym] = GeoCodeCuracao.new(geo_code).valid? ? geo_code : nil
 end
 

data/app/helpers/form_elements/image.rb

@@ -1,13 +1,14 @@
-module InlineFormsHelper
-  InlineForms::SPECIAL_COLUMN_TYPES[:image]=:image
-  # image via paperclip
-  def image_show(object, attribute, values)
-    link_to_inline_image_edit object, attribute
-  end
-  def image_edit(object, attribute, values)
-    file_field object.class.to_s.downcase, attribute
-  end
-  def image_update(object, attribute, values)
-    object.send(attribute+'=',values)
-  end
+InlineForms::SPECIAL_COLUMN_TYPES[:image]=:image
+
+# image via paperclip
+def image_show(object, attribute)
+  link_to_inline_image_edit object, attribute
+end
+
+def image_edit(object, attribute)
+  file_attribute object.class.to_s.downcase, attribute
+end
+
+def image_update(object, attribute)
+  object.send(attribute+'=',values)
 end

data/app/helpers/form_elements/scale_with_integers.rb

@@ -1,26 +1,22 @@
-module InlineFormsHelper
-    InlineForms::SPECIAL_COLUMN_TYPES[:scale_with_integers]=:integer
-  # scale_with_integers generates a sacle
-  # with the given list of integers as options
-  #
-  # values must be a Range or a one-dimensional array of Integers
-  def scale_with_integers_show(object, attribute, values)
-    unless values.is_a?(Hash)
-      options = Array.new
-      values.to_a.each_index do |i|
-        options << [ i.to_s, values.to_a[i] ]
-      end
-      values = Hash[ *options.flatten ]
-    end
-    link_to_inline_edit object, attribute, values[object.send(attribute).to_s], values
-  end
-  def scale_with_integers_edit(object, attribute, values)
-    # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
-    values = values.sort {|a,b| a[1].to_i<=>b[1].to_i}
-    collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'first', 'last', :selected => object.send(attribute))
-  end
-  def scale_with_integers_update(object, attribute, values)
-    object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
-  end
+InlineForms::SPECIAL_COLUMN_TYPES[:scale_with_integers]=:integer
+
+# scale_with_integers generates a scale
+# with the given list of integers as options
+#
+# values must be a Range or a one-dimensional array of Integers
+#
+def scale_with_integers_show(object, attribute)
+  values = attribute_values(object, attribute)
+  link_to_inline_edit object, attribute, values[object.send(attribute).to_s]
+end
+
+def scale_with_integers_edit(object, attribute)
+  # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
+  values = attribute_values(object, attribute)
+  collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'first', 'last', :selected => object.send(attribute))
+end
+
+def scale_with_integers_update(object, attribute)
+  object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
 end
 

data/app/helpers/form_elements/scale_with_values.rb

@@ -0,0 +1,21 @@
+InlineForms::SPECIAL_COLUMN_TYPES[:scale_with_values]=:integer
+
+# scale_with_values generates a scale
+# with the given list of values as options
+#
+# values must be a hash { integer => string, ... } or an one-dimensional array of strings
+def scale_with_values_show(object, attribute)
+  values = attribute_values(object, attribute)
+  link_to_inline_edit object, attribute, values[object.send(attribute)]
+end
+
+def scale_with_values_edit(object, attribute)
+  # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
+  values = attribute_values(object, attribute)
+  collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'first', 'last', :selected => object.send(attribute))
+end
+
+def scale_with_values_update(object, attribute)
+  object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
+end
+

data/app/helpers/form_elements/text_area.rb

@@ -1,13 +1,13 @@
-module InlineFormsHelper
-    InlineForms::SPECIAL_COLUMN_TYPES[:text_area]=:text
-  # text_area
-  def text_area_show(object, attribute, values)
-    link_to_inline_edit object, attribute, object.send(attribute), nil
-  end
-  def text_area_edit(object, attribute, values)
-    text_area_tag attribute, object[attribute], :class => 'field_text_area'
-  end
-  def text_area_update(object, attribute, values)
-    object[attribute.to_sym] = params[attribute.to_sym]
-  end
+InlineForms::SPECIAL_COLUMN_TYPES[:text_area]=:text
+
+def text_area_show(object, attribute)
+  link_to_inline_edit object, attribute, object.send(attribute)
+end
+
+def text_area_edit(object, attribute)
+  text_area_tag attribute, object[attribute], :class => 'attribute_text_area'
+end
+
+def text_area_update(object, attribute)
+  object[attribute.to_sym] = params[attribute.to_sym]
 end

data/app/helpers/form_elements/text_field.rb

@@ -1,14 +1,14 @@
-module InlineFormsHelper
-  InlineForms::SPECIAL_COLUMN_TYPES[:text_field]=:string
-  # text
-  def text_field_show(object, attribute, values)
-    link_to_inline_edit object, attribute, object.send(attribute), nil
-  end
-  def text_field_edit(object, attribute, values)
-    text_field_tag attribute, object[attribute], :class => 'input_text_field'
-  end
-  def text_field_update(object, attribute, values)
-    object[attribute.to_sym] = params[attribute.to_sym]
-  end
+InlineForms::SPECIAL_COLUMN_TYPES[:text_field]=:string
+
+def text_field_show(object, attribute)
+  link_to_inline_edit object, attribute, object.send(attribute)
+end
+
+def text_field_edit(object, attribute)
+  text_field_tag attribute, object[attribute], :class => 'input_text_field'
+end
+
+def text_field_update(object, attribute)
+  object[attribute.to_sym] = params[attribute.to_sym]
 end
 

data/app/helpers/inline_forms_helper.rb

@@ -1,24 +1,31 @@
-INLINE_FORMS_PATH = File.dirname(__FILE__) + "/form_elements/"
+module InlineFormsHelper
 
-Dir[INLINE_FORMS_PATH + "*.rb"].each do |form_element|
-  require form_element
-end
+  # load form elements. Each element goes into a separate file
+  # and defines a _show, _edit and _update method.
+  #
+  INLINE_FORMS_PATH = File.dirname(__FILE__) + "/form_elements/"
+  Dir[INLINE_FORMS_PATH + "*.rb"].each do |form_element|
+    require form_element
+  end
 
-module InlineFormsHelper
-  def inline_forms_show_record(object, attributes)
-    attributes = [ attributes ] unless attributes[0].is_a?(Array) # make sure we have an array of arrays
+  # default inline forms attribute list, for models that don't have an inline_attribute_attribute_list defined.
+  INLINE_FORMS_DEFAULT_ATTRIBUTE_LIST = { :name => [ 'name', :text ] }
+
+  # show a record by iterating through its attribute list
+  def inline_forms_show_record(object, attributes=nil)
+    attributes ||= object.inline_forms_attribute_list
     out = String.new
-    attributes.each do | attribute, name, form_element, values |
-      css_class_id = "field_#{attribute.to_s}_#{object.id}"
+    attributes.each do | attribute, name, form_element |
+      css_class_id = "attribute_#{attribute}_#{object.id}"
       name_cell = content_tag :td, :valign=>'top' do
-        content_tag :div, :class=> "field_name field_#{attribute.to_s} form_element_#{form_element.to_s}" do
+        content_tag :div, :class=> "attribute_name attribute_#{attribute} form_element_#{form_element}" do
           h(name)
         end
       end
       value_cell = content_tag :td, :valign=>'top' do
-        content_tag :div, :class=> "field_value field_#{attribute.to_s} form_element_#{form_element.to_s}" do
+        content_tag :div, :class=> "attribute_value attribute_#{attribute} form_element_#{form_element}" do
           content_tag :span, :id => css_class_id do
-            send("#{form_element.to_s}_show", object, attribute, values)
+            send("#{form_element}_show", object, attribute)
           end
         end
       end
@@ -29,22 +36,25 @@ module InlineFormsHelper
     return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
   end
 
-  def inline_form_display_new(object, attributes)
-    attributes = [ attributes ] if not attributes[0].is_a?(Array) # make sure we have an array of arrays
-    out = String.new #ugly as hell but that's how content_tag works...
-    attributes.each do | attribute, name, form_element, values |
-      #css_class_id = form_element == :associated ? "subform_#{attribute.to_s}_#{object.id}" : "field_#{attribute.to_s}_#{object.id}"
+  # show the form for a new record
+  #
+  # associated records are NOT shown!
+  #
+  def inline_forms_new_record(object, attributes=nil)
+    attributes ||= object.inline_forms_attribute_list
+    out = String.new 
+    attributes.each do | attribute, name, form_element |
       if not form_element.to_sym == :associated
-        css_class_id = "field_#{attribute.to_s}_#{object.id}"
+        css_class_id = "attribute_#{attribute}_#{object.id}"
         name_cell = content_tag :td, :valign=>'top' do
-          content_tag :div, :class=> "field_name field_#{attribute.to_s} form_element_#{form_element.to_s}" do
+          content_tag :div, :class=> "attribute_name attribute_#{attribute} form_element_#{form_element}" do
             h(name)
           end
         end
         value_cell = content_tag :td, :valign=>'top' do
-          content_tag :div, :class=> "field_value field_#{attribute.to_s} form_element_#{form_element.to_s}" do
+          content_tag :div, :class=> "attribute_value attribute_#{attribute} form_element_#{form_element}" do
             content_tag :span, :id => css_class_id do
-              send("#{form_element.to_s}_edit", object, attribute, values)
+              send("#{form_element}_edit", object, attribute)
             end
           end
         end
@@ -53,50 +63,76 @@ module InlineFormsHelper
     end
     return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
   end
+
   # display a list of objects
-  def inline_form_display_list(objects, tag=:li)
-    t = ''
+  def inline_forms_list(objects, tag=:li)
+    t = String.new
     objects.each do |object|
       css_class_id = @Klass.to_s.underscore + '_' + object.id.to_s
       t += content_tag tag, :id => css_class_id do
-        #inline_forms_show_record object, object.respond_to?(:inline_forms_field_list) ? object.inline_forms_field_list : [ :name, 'name', 'text_field' ]
-        link_to( h( object._presentation ), send( @Klass.to_s.underscore + '_path', object, :update => css_class_id), :remote => true )
+        link_to h(object._presentation), 
+                send( @Klass.to_s.underscore + '_path', object, :update => css_class_id),
+                :remote => true
       end
     end
     return raw(t)
   end
+
   # link for new item
-  def inline_form_new_record(attribute, form_element, text='new', update_span='inline_form_list')
-    link_to text, send('new_' + @Klass.to_s.underscore + '_path', :update => update_span), :remote => true
+  def inline_forms_new_record_link(text='new', update_span='inline_forms_list')
+    link_to text, 
+            send('new_' + @Klass.to_s.underscore + '_path', :update => update_span),
+            :remote => true
   end
-
-
   
   private
 
   # link_to_inline_edit
-  def link_to_inline_edit(object, attribute, attribute_value, values)
+  def link_to_inline_edit(object, attribute, attribute_value)
     attribute_value = h(attribute_value)
     spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
     attribute_value << "&nbsp;".html_safe * spaces
-    link_to raw(attribute_value), send('edit_' + @Klass.to_s.underscore + '_path',
-      object,
-      :field => attribute.to_s,
-      :form_element => calling_method.sub(/_[a-z]+$/,''),
-      :values => values,
-      :update => 'field_' + attribute.to_s + '_' + object.id.to_s ),
-      :remote => true
+    link_to raw(attribute_value), 
+            send( 'edit_' + @Klass.to_s.underscore + '_path',
+                  object,
+                  :attribute => attribute.to_s,
+                  :form_element => calling_method.sub(/_[a-z]+$/,''),
+                  :update => "attribute_#{attribute}_#{object.id}" ),
+            :remote => true
   end
 
+  # link to inline image edit
   def link_to_inline_image_edit(object, attribute)
-    text= image_tag object.send(attribute.to_s).send('url', :thumb)
+    text= image_tag object.send(attribute).send('url', :thumb)
+    link_to text,
+            send('edit_' + @Klass.to_s.underscore + '_path',
+              object,
+              :attribute => attribute.to_s,
+              :form_element => calling_method.sub(/_[a-z]+$/,''),
+              :update => "attribute_#{attribute}_#{object.id}" ),
+            :remote => true
+  end
 
-    link_to text, send('edit_' + @Klass.to_s.underscore + '_path',
-      object,
-      :field => attribute.to_s,
-      :form_element => calling_method.sub(/_[a-z]+$/,''),
-      :update => 'field_' + attribute.to_s + '_' + object.id.to_s ),
-      :remote => true
+  # get the values for an attribute
+  #
+  # values should be a Hash { integer => string, ... }
+  #
+  # or a one-dimensional array of strings
+  #
+  # or a Range
+  #
+  def attribute_values(object, attribute)
+    values = object.inline_forms_attribute_list.assoc(attribute.to_sym)[3]
+    raise "No Values defined in #{@Klass}, #{attribute}" if values.nil?
+    unless values.is_a?(Hash)
+      temp = Array.new
+      values.to_a.each_index do |i|
+        temp << [ i, values.to_a[i] ]
+      end
+    values = temp.sort {|a,b| a[1]<=>b[1]}
+    end
+   logger.info values.inspect
+values
   end
 
 end