inline_forms 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/app/helpers/form_elements/associated.rb

@@ -0,0 +1,91 @@
+module InlineFormsHelper
+  # associated
+  def associated_show(object, attribute, values)
+    #show a list of records
+    out = ""
+    if @sub_id && @sub_id.to_i > 0
+      # if it's not a new record (sub_id > 0) then just update the list-element
+      out << '<li>'
+      out << link_to( @associated_record.title,
+        send('edit_' + @Klass.to_s.underscore + '_path', object,
+          :field => attribute,
+          :sub_id => @sub_id,
+          :form_element => this_method.reverse.sub(/.*_/,'').reverse,
+          :values => values,
+          :update => "field_#{attribute.singularize}_#{@sub_id.to_s}" ),
+        :method => :get,
+        :remote => true )
+      out << '</li>'
+    else
+      # if it's a new record (sub_id == 0) then update the whole <ul> and redraw all list-elements
+      out << "<ul class='associated #{attribute}' id='list_#{attribute}_#{object.id.to_s}'>" if @sub_id.nil?
+      if not object.send(attribute.pluralize).empty?
+        # if there are things to show, show them
+        object.send(attribute.pluralize).each do |m|
+          out << "<span id='field_#{attribute.singularize}_#{m.id.to_s}'>"
+          out << '<li>'
+          out << link_to( m.title, send('edit_' + @Klass.to_s.underscore + '_path',
+              object,
+              :field => attribute,
+              :sub_id => m.id,
+              :form_element => this_method.sub(/_[a-z]+$/,''),
+              :values => values,
+              :update => "field_#{attribute.singularize}_#{m.id.to_s}" ),
+            :method => :get,
+            :remote => true )
+          out << '</li>'
+          out << '</span>'
+        end
+      end
+      # add a 'new' link for creating a new record
+      out << '<li>'
+      out << link_to( 'new', send('edit_' + @Klass.to_s.underscore + '_path',
+          object,
+          :field => attribute,
+          :sub_id => 0,
+          :form_element => this_method.sub(/_[a-z]+$/,''),
+          :values => values,
+          :update => "list_#{attribute}_#{object.id.to_s}" ),
+        :method => :get,
+        :remote => true )
+      out << '</li>'
+      out << '</ul>' if @sub_id.nil?
+    end
+    raw(out)
+  end
+  def associated_edit(object, attribute, values)
+    # @sub_id is the id of the associated record
+    if @sub_id.to_i > 0
+      # only if @sub_id > 0, means we have a associated record
+      @associated_record_id = object.send(attribute.singularize + "_ids").index(@sub_id.to_i)
+      @associated_record = object.send(attribute)[@associated_record_id]
+      @update_span = "field_#{attribute.singularize}_#{@sub_id.to_s}"
+    else
+      # but if @sub_id = 0, then we are dealing with a new associated record
+      # in that case, we .new a record, and the update_span is the whole <ul>
+      @associated_record = attribute.singularize.capitalize.constantize.new
+      @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
+    end
+    render :partial => "inline_forms/subform"
+  end
+  def associated_update(object, attribute, values)
+    return if object.id.nil?
+    if @sub_id.to_i > 0
+      # get the existing associated record
+      @associated_record_id = object.send(attribute.singularize + "_ids").index(@sub_id.to_i)
+      @associated_record = object.send(attribute)[@associated_record_id]
+      @update_span = "field_" + attribute.singularize + '_' + @sub_id.to_s
+    else
+      # create a new associated record
+      @associated_record = object.send(attribute.to_sym).new
+      @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
+    end
+    # process the sub_form fields (attributes). These are declared in the model!
+    @associated_record.inline_forms_field_list.each do | @subform_description, @subform_field, @subform_element |
+      # have no fear
+      send("#{@subform_element}_update", @associated_record, @subform_field, nil)
+    end
+    @associated_record.save
+  end
+end
+

data/app/helpers/form_elements/check_box.rb

@@ -0,0 +1,15 @@
+module InlineFormsHelper
+  # boolean, bit unaptly named check_box
+  def check_box_show(object, attribute, values)
+    values ||= { 'false' => 'no', 'true' => 'yes' }
+    link_to_inline_edit object, attribute, values[object.send(attribute).to_s], values
+  end
+  def check_box_edit(object, attribute, values)
+    values ||= { 'false' => 'no', 'true' => 'yes' }
+    collection_select( object.class.to_s.downcase, attribute, values, 'first', 'last', :selected => object.send(attribute).to_s)
+  end
+  def check_box_update(object, attribute, values)
+    object[attribute.to_s.to_sym] = params[object.class.to_s.downcase.to_sym][attribute.to_s.to_sym]
+  end
+end
+

data/app/helpers/form_elements/checklist.rb

@@ -0,0 +1,35 @@
+module InlineFormsHelper
+  # checklist
+  def checklist_show(object, attribute, values)
+    out = '<ul class="checklist">'
+    out << link_to_inline_edit(object, attribute, nil, nil) if object.send(attribute).empty?
+    object.send(attribute).sort.each do | item |
+      out << '<li>'
+      out << link_to_inline_edit(object, attribute, item.title, nil)
+      out << '</li>'
+    end
+    out <<  '</ul>'
+  end
+  def checklist_edit(object, attribute, values)
+    object.send(attribute).build  if object.send(attribute).empty?
+    values = object.send(attribute).first.class.name.constantize.find(:all) # TODO bring order
+    out = '<div class="edit_form_checklist">'
+    out << '<ul>'
+    values.each do | item |
+      out << '<li>'
+      out << check_box_tag( attribute + '[' + item.id.to_s + ']', 'yes', object.send(attribute.singularize + "_ids").include?(item.id) )
+      out << '<div class="edit_form_checklist_text">'
+      out << h(item.title)
+      out << '</div>'
+      out << '<div style="clear: both;"></div>'
+      out << '</li>'
+    end
+    out << '</ul>'
+    out << '</div>'
+  end
+  def checklist_update(object, attribute, values)
+    params[attribute] ||= {}
+    object.send(attribute.singularize + '_ids=', params[attribute].keys)
+  end
+end
+

data/app/helpers/form_elements/date.rb

@@ -0,0 +1,13 @@
+module InlineFormsHelper
+  # date
+  def date_show(object, attribute, values)
+    link_to_inline_edit object, attribute, object.send(attribute), nil
+  end
+  def date_edit(object, attribute, values)
+    calendar_date_select_tag attribute, object[attribute], :year_range => 30.years.ago..5.years.from_now, :popup => :force
+  end
+  def date_update(object, attribute, values)
+    object[attribute.to_sym] = params[attribute.to_sym]
+  end
+end
+

data/app/helpers/form_elements/dropdown.rb

@@ -0,0 +1,17 @@
+module InlineFormsHelper
+  # 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
+end
+

data/app/helpers/form_elements/dropdown_with_values.rb

@@ -0,0 +1,14 @@
+module InlineFormsHelper
+  # dropdown_with_values
+  def dropdown_with_values_show(object, attribute, values)
+    link_to_inline_edit object, attribute, values[object.send(attribute)], 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!
+    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
+end
+

data/app/helpers/form_elements/geo_code_curacao.rb

@@ -0,0 +1,16 @@
+module InlineFormsHelper
+  # 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
+end
+

data/app/helpers/form_elements/range.rb

@@ -0,0 +1,14 @@
+module InlineFormsHelper
+  # range
+  def range_show(object, attribute, values)
+    link_to_inline_edit object, attribute, object.send(attribute), nil
+  end
+  def range_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!
+    collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'to_i', 'to_s', :selected => object.send(attribute))
+  end
+  def range_update(object, attribute, values)
+    object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
+  end
+end
+

data/app/helpers/form_elements/text_area.rb

@@ -0,0 +1,12 @@
+module InlineFormsHelper
+  # 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
+end

data/app/helpers/form_elements/text_field.rb

@@ -0,0 +1,13 @@
+module InlineFormsHelper
+  # text_field
+  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
+end
+

data/app/helpers/inline_forms_helper.rb

@@ -1,3 +1,9 @@
+INLINE_FORMS_PATH = File.dirname(__FILE__) + "/form_elements/"
+
+Dir[INLINE_FORMS_PATH + "*.rb"].each do |form_element|
+   require form_element
+end
+
 module InlineFormsHelper
   # display the forms from an array of attributes
   def inline_form_display(object, attributes, action=:show)
@@ -5,7 +11,7 @@ module InlineFormsHelper
     out = String.new #ugly as hell but that's how content_tag works...
     case action
     when :show
-      attributes.each do | name, attribute, form_element, values |
+      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}"
         css_class_id = "field_#{attribute.to_s}_#{object.id}"
         name_cell = content_tag :td, :valign=>'top' do
@@ -25,7 +31,7 @@ module InlineFormsHelper
       end
       return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
     when :new
-      attributes.each do | name, attribute, form_element, values |
+      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}"
         if not form_element.to_sym == :associated
           css_class_id = "field_#{attribute.to_s}_#{object.id}"
@@ -52,235 +58,18 @@ module InlineFormsHelper
     t = ''
     objects.each do |object|
       t += content_tag tag do
-        inline_form_display object, object.respond_to?(:inline_forms_field_list) ? object.inline_forms_field_list : [ '', :name, :text ]
+        inline_form_display object, object.respond_to?(:inline_forms_field_list) ? object.inline_forms_field_list : [ :name, 'name', 'text' ]
       end
     end
     return raw(t)
   end
   # link for new item
-  def inline_form_new_record(attribute, form_element, text='neeeeew', update_span='inline_form_list')
+  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
   end
 
-  # 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
-
-  # dropdown_with_values
-  def dropdown_with_values_show(object, attribute, values)
-    link_to_inline_edit object, attribute, values[object.send(attribute)], 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!
-    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
-
-  # range
-  def range_show(object, attribute, values)
-    link_to_inline_edit object, attribute, object.send(attribute), nil
-  end
-  def range_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!
-    collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'to_i', 'to_s', :selected => object.send(attribute))
-  end
-  def range_update(object, attribute, values)
-    object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
-  end
-
-  # date
-  def date_show(object, attribute, values)
-    link_to_inline_edit object, attribute, object.send(attribute), nil
-  end
-  def date_edit(object, attribute, values)
-    calendar_date_select_tag attribute, object[attribute], :year_range => 30.years.ago..5.years.from_now, :popup => :force
-  end
-  def date_update(object, attribute, values)
-    object[attribute.to_sym] = params[attribute.to_sym]
-  end
-
-  # textarea
-  def textarea_show(object, attribute, values)
-    link_to_inline_edit object, attribute, object.send(attribute), nil
-  end
-  def textarea_edit(object, attribute, values)
-    text_area_tag attribute, object[attribute], :class => 'field_textarea'
-  end
-  def textarea_update(object, attribute, values)
-    object[attribute.to_sym] = params[attribute.to_sym]
-  end
-
-  # text
-  def text_show(object, attribute, values)
-    link_to_inline_edit object, attribute, object.send(attribute), nil
-  end
-  def text_edit(object, attribute, values)
-    text_field_tag attribute, object[attribute], :class => 'input_text'
-  end
-  def text_update(object, attribute, values)
-    object[attribute.to_sym] = params[attribute.to_sym]
-  end
-
-  # bool
-  def bool_show(object, attribute, values)
-    link_to_inline_edit object, attribute, values[object.send(attribute).to_s], values
-  end
-  def bool_edit(object, attribute, values)
-    collection_select( object.class.to_s.downcase, attribute, values, 'first', 'last', :selected => object.send(attribute).to_s)
-  end
-  def bool_update(object, attribute, values)
-    object[attribute.to_s.to_sym] = params[object.class.to_s.downcase.to_sym][attribute.to_s.to_sym]
-  end
-
-  # checklist
-  def checklist_show(object, attribute, values)
-    out = '<ul class="checklist">'
-    out << link_to_inline_edit(object, attribute, nil, nil) if object.send(attribute).empty?
-    object.send(attribute).sort.each do | item |
-      out << '<li>'
-      out << link_to_inline_edit(object, attribute, item.title, nil)
-      out << '</li>'
-    end
-    out <<  '</ul>'
-  end
-  def checklist_edit(object, attribute, values)
-    object.send(attribute).build  if object.send(attribute).empty?
-    values = object.send(attribute).first.class.name.constantize.find(:all) # TODO bring order
-    out = '<div class="edit_form_checklist">'
-    out << '<ul>'
-    values.each do | item |
-      out << '<li>'
-      out << check_box_tag( attribute + '[' + item.id.to_s + ']', 'yes', object.send(attribute.singularize + "_ids").include?(item.id) )
-      out << '<div class="edit_form_checklist_text">'
-      out << h(item.title)
-      out << '</div>'
-      out << '<div style="clear: both;"></div>'
-      out << '</li>'
-    end
-    out << '</ul>'
-    out << '</div>'
-  end
-  def checklist_update(object, attribute, values)
-    params[attribute] ||= {}
-    object.send(attribute.singularize + '_ids=', params[attribute].keys)
-  end
-
-  # associated
-  def associated_show(object, attribute, values)
-    #show a list of records
-    out = ""
-    if @sub_id && @sub_id.to_i > 0
-      # if it's not a new record (sub_id > 0) then just update the list-element
-      out << '<li>'
-      out << link_to( @associated_record.title,
-        send('edit_' + @Klass.to_s.underscore + '_path', object,
-          :field => attribute,
-          :sub_id => @sub_id,
-          :form_element => this_method.reverse.sub(/.*_/,'').reverse,
-          :values => values,
-          :update => "field_#{attribute.singularize}_#{@sub_id.to_s}" ),
-        :method => :get,
-        :remote => true )
-      out << '</li>'
-    else
-      # if it's a new record (sub_id == 0) then update the whole <ul> and redraw all list-elements
-      out << "<ul class='associated #{attribute}' id='list_#{attribute}_#{object.id.to_s}'>" if @sub_id.nil?
-      if not object.send(attribute.pluralize).empty?
-        # if there are things to show, show them
-        object.send(attribute.pluralize).each do |m|
-          out << "<span id='field_#{attribute.singularize}_#{m.id.to_s}'>"
-          out << '<li>'
-          out << link_to( m.title, send('edit_' + @Klass.to_s.underscore + '_path',
-              object,
-              :field => attribute,
-              :sub_id => m.id,
-              :form_element => this_method.sub(/_[a-z]+$/,''),
-              :values => values,
-              :update => "field_#{attribute.singularize}_#{m.id.to_s}" ),
-            :method => :get,
-            :remote => true )
-          out << '</li>'
-          out << '</span>'
-        end
-      end
-      # add a 'new' link for creating a new record
-      out << '<li>'
-      out << link_to( 'new', send('edit_' + @Klass.to_s.underscore + '_path',
-          object,
-          :field => attribute,
-          :sub_id => 0,
-          :form_element => this_method.sub(/_[a-z]+$/,''),
-          :values => values,
-          :update => "list_#{attribute}_#{object.id.to_s}" ),
-        :method => :get,
-        :remote => true )
-      out << '</li>'
-      out << '</ul>' if @sub_id.nil?
-    end
-    raw(out)
-  end
-  def associated_edit(object, attribute, values)
-    # @sub_id is the id of the associated record
-    if @sub_id.to_i > 0
-      # only if @sub_id > 0, means we have a associated record
-      @associated_record_id = object.send(attribute.singularize + "_ids").index(@sub_id.to_i)
-      @associated_record = object.send(attribute)[@associated_record_id]
-      @update_span = "field_#{attribute.singularize}_#{@sub_id.to_s}"
-    else
-      # but if @sub_id = 0, then we are dealing with a new associated record
-      # in that case, we .new a record, and the update_span is the whole <ul>
-      @associated_record = attribute.singularize.capitalize.constantize.new
-      @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
-    end
-    render :partial => "inline_forms/subform"
-  end
-  def associated_update(object, attribute, values)
-    return if object.id.nil?
-    if @sub_id.to_i > 0
-      # get the existing associated record
-      @associated_record_id = object.send(attribute.singularize + "_ids").index(@sub_id.to_i)
-      @associated_record = object.send(attribute)[@associated_record_id]
-      @update_span = "field_" + attribute.singularize + '_' + @sub_id.to_s
-    else
-      # create a new associated record
-      @associated_record = object.send(attribute.to_sym).new
-      @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
-    end
-    # process the sub_form fields (attributes). These are declared in the model!
-    @associated_record.inline_forms_field_list.each do | @subform_description, @subform_field, @subform_element |
-      # have no fear
-      send("#{@subform_element}_update", @associated_record, @subform_field, nil)
-    end
-    @associated_record.save
-  end
-
-  # 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
 
+  
   private
 
   # link_to_inline_edit

data/app/views/inline_forms/_new.html.erb

@@ -1,7 +1,7 @@
 <% form_tag  send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span || 'inline_form_list' ),
   :multipart => true, :remote => true, :class  => "edit_form"  do -%>
   <div class="edit_form_field">
-    <%= inline_form_display(@object, @object.respond_to?(:inline_forms_field_list) ? @object.inline_forms_field_list : [ '', :name, :text ], :new) %>
+    <%= inline_form_display(@object, @object.respond_to?(:inline_forms_field_list) ? @object.inline_forms_field_list : [ :name, 'name', :text ], :new) %>
   </div>
   <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path',:update => @update_span || 'inline_form_list'), :remote => true,
     :class  => "edit_form_cancel" ) do  %>

data/app/views/inline_forms/_subform.html.erb

@@ -1,5 +1,5 @@
 <table cellpadding="0" cellspacing="0" class="subform">
-  <% @associated_record.inline_forms_field_list.each do | @subform_description, @subform_field, @subform_element, @values | %>
+  <% @associated_record.inline_forms_field_list.each do | @subform_field, @subform_description, @subform_element, @values | %>
     <tr>
       <td valign="top">
         <div class="subform_field-name">

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-01-31}
+  s.date = %q{2011-02-03}
   s.description = %q{Inline Forms aims to ease the setup of forms that provide inline editing. The field list can be specified in the model.}
   s.email = %q{ace@suares.an}
   s.extra_rdoc_files = [
@@ -25,6 +25,16 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/controllers/inline_forms_controller.rb",
+    "app/helpers/form_elements/associated.rb",
+    "app/helpers/form_elements/check_box.rb",
+    "app/helpers/form_elements/checklist.rb",
+    "app/helpers/form_elements/date.rb",
+    "app/helpers/form_elements/dropdown.rb",
+    "app/helpers/form_elements/dropdown_with_values.rb",
+    "app/helpers/form_elements/geo_code_curacao.rb",
+    "app/helpers/form_elements/range.rb",
+    "app/helpers/form_elements/text_area.rb",
+    "app/helpers/form_elements/text_field.rb",
     "app/helpers/inline_forms_helper.rb",
     "app/models/geo_code_curacao.rb",
     "app/models/inline_form.rb",

data/lib/generators/inline_forms/inline_forms_generator.rb

@@ -1,49 +1,85 @@
-class InlineFormsGenerator < Rails::Generators::NamedBase
-  argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+module InlineForms
+  class InlineFormsGenerator < Rails::Generators::NamedBase
 
-  source_root File.expand_path('../templates', __FILE__)
+    Rails::Generators::GeneratedAttribute.class_eval do
+      def migration_type
+        # convert our form_elements to real types for migration
+        case type
+          # normal types don't get converted
+          when :string, :text, :integer, :float, :decimal, :datetime, :timestamp, :time, :date, :binary, :boolean then type
+          # our types get converted
+          when :dropdown, :dropdown_with_values   then :integer
+          when :check_box, :boolean_with_values   then :boolean
+          when :date                      then :date
+          when :text_area                 then :text
+          else
+            :unknown # migration will fail, probably.
+        end
+       
+      end
+      def field_type
+        case type
+          # out types don't get converted
+          when :dropdown, :dropdown_with_values, :check_box, :boolean_with_values then type
+          when :integer, :float, :decimal then :text_field # who knows if they wanted a dropdown?
+          when :time                      then :time_select
+          when :datetime, :timestamp      then :datetime_select
+          when :date                      then :date_select
+          when :text                      then :text_area
+          when :boolean                   then :check_box
+          else
+            :unkown # form will fail to generatie, probably
+        end
+      end
 
-  def generate_model
-    #copy_file "stylesheet.css", "public/stylesheets/#{file_name}.css"
-    template "model.rb", "app/models/#{model_file_name}.rb"
-  end
+   end
 
-  def generate_controller
-    template "controller.rb", "app/controllers/#{controller_file_name}.rb"
-  end
+    argument :attributes, :type => :array,  :banner => "field:type field:type"
 
-  def generate_route
-    route "resources :#{resource_name}"
-  end
+    source_root File.expand_path('../templates', __FILE__)
 
-  def generate_migration
-    template "migration.rb", "db/migrate/#{time_stamp}_inline_forms_create_#{table_name}.rb"
-  end
+    def generate_model
+      #copy_file "stylesheet.css", "public/stylesheets/#{file_name}.css"
+      template "model.rb", "app/models/#{model_file_name}.rb"
+    end
 
-  private
-  def model_file_name
-    name.underscore
-  end
+    def generate_controller
+      template "controller.rb", "app/controllers/#{controller_file_name}.rb"
+    end
 
-  def resource_name
-    name.pluralize.underscore
-  end
+    def generate_route
+      route "resources :#{resource_name}"
+    end
 
-  def controller_name
-    name.pluralize + 'Controller'
-  end
+    def generate_migration
+      template "migration.rb", "db/migrate/#{time_stamp}_inline_forms_create_#{table_name}.rb"
+    end
 
-  def controller_file_name
-    controller_name.underscore
-  end
+    private
+    def model_file_name
+      name.underscore
+    end
 
-  def table_name
-    name.pluralize.underscore
-  end
+    def resource_name
+      name.pluralize.underscore
+    end
 
-  def time_stamp
-    Time.now.utc.strftime("%Y%m%d%H%M%S")
-#    found it here http://whynotwiki.com/Ruby_/_Dates_and_times
-  end
+    def controller_name
+      name.pluralize + 'Controller'
+    end
+
+    def controller_file_name
+      controller_name.underscore
+    end
 
+    def table_name
+      name.pluralize.underscore
+    end
+
+    def time_stamp
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+      #    found it here http://whynotwiki.com/Ruby_/_Dates_and_times
+    end
+
+  end
 end

data/lib/generators/inline_forms/templates/migration.rb

@@ -1,15 +1,15 @@
 class InlineFormsCreate<%= table_name.camelize %> < ActiveRecord::Migration
   def self.up
-    create_table(:<%= table_name %>) do |t|
+    create_table :<%= table_name %> do |t|
   <% for attribute in attributes -%>
-      t.<%= attribute.type %> :<%= attribute.name %>
+      t.<%= attribute.migration_type %> :<%= attribute.name %>
   <% end -%>
       t.timestamps
     end
-
 end
 
 def self.down
   drop_table :<%= table_name %>
+  end
 end
 #The types supported by Active Record are :primary_key, :string, :text, :integer, :float, :decimal, :datetime, :timestamp, :time, :date, :binary, :boolean

data/lib/generators/inline_forms/templates/model.rb

@@ -6,9 +6,9 @@ class <%= name %> < ActiveRecord::Base
 
   def inline_forms_field_list
   [
-  <% for attribute in attributes -%>
-     [ '<%= attribute.name %>', :<%= attribute.name %>, '<%= attribute.type %>' ]
-  <% end -%>
+  <% for attribute in attributes %>
+     [ :<%= attribute.migration_type %>, '<%= attribute.name %>', :<%= attribute.field_type %> ],
+  <% end %>
   ]
-  end
 end
+end

data/lib/inline_forms.rb

@@ -2,9 +2,9 @@ puts 'loading inline_forms...'
 
 module InlineForms
   class InlineFormsEngine < Rails::Engine
-      initializer 'inline_forms.helper' do |app|
-            ActionView::Base.send :include, InlineFormsHelper
-                end
-                  end
-                  end
+    initializer 'inline_forms.helper' do |app|
+      ActionView::Base.send :include, InlineFormsHelper
+    end
+  end
+end
 # http://www.ruby-forum.com/topic/211017#927932

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -04:00
+date: 2011-02-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,16 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/inline_forms_controller.rb
+- app/helpers/form_elements/associated.rb
+- app/helpers/form_elements/check_box.rb
+- app/helpers/form_elements/checklist.rb
+- app/helpers/form_elements/date.rb
+- app/helpers/form_elements/dropdown.rb
+- app/helpers/form_elements/dropdown_with_values.rb
+- app/helpers/form_elements/geo_code_curacao.rb
+- app/helpers/form_elements/range.rb
+- app/helpers/form_elements/text_area.rb
+- app/helpers/form_elements/text_field.rb
 - app/helpers/inline_forms_helper.rb
 - app/models/geo_code_curacao.rb
 - app/models/inline_form.rb