inline_forms 0.7.4 → 0.8.0

data/README.rdoc

@@ -1,6 +1,17 @@
 = inline_forms
 
-Description goes here.
+Ever tired of setting up forms to manage your data? Inline Forms aims at quick and easy setup of models, migrations and controllers and providing a user-friendly interface.
+
+= Usage
+
+Look in the generator files for a hint about usage. In short:
+ rails g inline_forms Person first_name:string last_name:string age:dropdown_with_integers
+will create a model, a migration an a controller. In the model you would only have to add 
+values for the dropdown, or instance 12..45.
+In going to /persons you would see a nice form to add and edit persons.
+
+It's work in progress.
+
 
 == Contributing to inline_forms
  

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.8.0

data/app/controllers/inline_forms_controller.rb

@@ -54,15 +54,14 @@ class InlineFormsController < ApplicationController
     end
   end
 
-  # :edit presents a form to edit one specific field from an object
+  # :edit presents a form to edit one specific attribute from an object
   #
   # GET /examples/1/edit
   #
   def edit
     @object = @Klass.find(params[:id])
-    @field = params[:field]
+    @attribute = params[:attribute]
     @form_element = params[:form_element]
-    @values = params[:values]
     @sub_id = params[:sub_id]
     @update_span = params[:update]
     respond_to do |format|
@@ -79,69 +78,65 @@ class InlineFormsController < ApplicationController
   def create
     object = @Klass.new
     @update_span = params[:update]
-    attributes = object.respond_to?(:inline_forms_field_list) ? object.inline_forms_field_list : [ '', :name, :text ] # sensible default
-    attributes = [ attributes ] if not attributes[0].is_a?(Array) # make sure we have an array of arrays
-    attributes.each do | name, attribute, form_element, values |
-      send("#{form_element.to_s}_update", object, attribute, values)
+    attributes = object.inline_forms_attribute_list
+    attributes.each do | name, attribute, form_element |
+      send("#{form_element.to_s}_update", object, attribute)
     end
     object.save
-    @objects = @Klass.all
+    @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC'
     respond_to do |format|
       # found this here: http://www.ruby-forum.com/topic/211467
       format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/index'}
       }
     end
   end
-  # :update updates a specific field from an object.
+  # :update updates a specific attribute from an object.
   #
   # PUT /examples/1
   #
   def update
     @object = @Klass.find(params[:id])
-    @field = params[:field]
+    @attribute = params[:attribute]
     @form_element = params[:form_element]
-    @values = params[:values]
     @sub_id = params[:sub_id]
     @update_span = params[:update]
-    #@values = params[@Klass.to_s.downcase].is_a?(Array) ? params[@Klass.to_s.downcase][@field.to_sym] : nil
-    send("#{@form_element.to_s}_update", @object, @field, @values)
+    send("#{@form_element.to_s}_update", @object, @attribute)
     @object.save
     respond_to do |format|
       # found this here: http://www.ruby-forum.com/topic/211467
-      format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element.to_s}_show", @object, @field, @values) %>' }
+      format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element.to_s}_show", @object, @attribute) %>' }
       }
     end
   end
 
-  # :show shows one field (attribute) from a record (object). It inludes the link to 'edit'
+  # :show shows one attribute (attribute) from a record (object). It inludes the link to 'edit'
   #
-  # GET /examples/1?field=name&form_element=text
+  # GET /examples/1?attribute=name&form_element=text
   #
   
   def show
     @object = @Klass.find(params[:id])
-    @field = params[:field]
+    @attribute = params[:attribute]
     @form_element = params[:form_element]
     if @form_element == "associated"
       @sub_id = params[:sub_id]
       if @sub_id.to_i > 0
-        @associated_record_id = @object.send(@field.to_s.singularize + "_ids").index(@sub_id.to_i)
-        @associated_record = @object.send(@field)[@associated_record_id]
+        @associated_record_id = @object.send(@attribute.to_s.singularize + "_ids").index(@sub_id.to_i)
+        @associated_record = @object.send(@attribute)[@associated_record_id]
       end
     end
     @update_span = params[:update]
-    if @field.nil?
+    if @attribute.nil?
       respond_to do |format|
-        @attributes = @object.respond_to?(:inline_forms_field_list) ? @object.inline_forms_field_list : [ :name, 'name', 'text_field' ]
+        @attributes = @object.inline_forms_attribute_list
         # found this here: http://www.ruby-forum.com/topic/211467
-        format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send( "inline_forms_show_record", @object, @attributes) %>' }
+        format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send( "inline_forms_show_record", @object) %>' }
         }
       end
     else
-      @values = params[:values]
       respond_to do |format|
         # found this here: http://www.ruby-forum.com/topic/211467
-        format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element}_show", @object, @field, @values) %>' }
+        format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element}_show", @object, @attribute) %>' }
         }
       end
     end

data/app/helpers/form_elements/associated.rb

@@ -1,92 +1,94 @@
-module InlineFormsHelper
-    InlineForms::SPECIAL_COLUMN_TYPES[:associated]=:references
-  # 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._presentation,
-        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.to_s.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?
-      out << '<li class="associated_new">'
-      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>'
-      if not object.send(attribute.to_s.pluralize).empty?
-        # if there are things to show, show them
-        object.send(attribute.to_s.pluralize).each do |m|
-          out << "<span id='field_#{attribute.to_s.singularize}_#{m.id.to_s}'>"
-          out << '<li>'
-          out << link_to( m._presentation, 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.to_s.singularize}_#{m.id.to_s}" ),
-            :method => :get,
-            :remote => true )
-          out << '</li>'
-          out << '</span>'
-        end
+InlineForms::SPECIAL_COLUMN_TYPES[:associated]=:references
+
+# associated
+def associated_show(object, attribute)
+  #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._presentation,
+      send('edit_' + @Klass.to_s.underscore + '_path', object,
+        :attribute => attribute,
+        :sub_id => @sub_id,
+        :form_element => this_method.reverse.sub(/.*_/,'').reverse,
+        :values => values,
+        :update => "attribute_#{attribute.to_s.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?
+    out << '<li class="associated_new">'
+    out << link_to( 'new', send('edit_' + @Klass.to_s.underscore + '_path',
+        object,
+        :attribute => 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>'
+    if not object.send(attribute.to_s.pluralize).empty?
+      # if there are things to show, show them
+      object.send(attribute.to_s.pluralize).each do |m|
+        out << "<span id='attribute_#{attribute.to_s.singularize}_#{m.id.to_s}'>"
+        out << '<li>'
+        out << link_to( m._presentation, send('edit_' + @Klass.to_s.underscore + '_path',
+            object,
+            :attribute => attribute,
+            :sub_id => m.id,
+            :form_element => this_method.sub(/_[a-z]+$/,''),
+            :values => values,
+            :update => "attribute_#{attribute.to_s.singularize}_#{m.id.to_s}" ),
+          :method => :get,
+          :remote => true )
+        out << '</li>'
+        out << '</span>'
       end
-      # add a 'new' link for creating a new record
-      out << '</ul>' if @sub_id.nil?
     end
-    raw(out)
+    # add a 'new' link for creating a new record
+    out << '</ul>' if @sub_id.nil?
   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.to_s.singularize + "_ids").index(@sub_id.to_i)
-      @associated_record = object.send(attribute)[@associated_record_id]
-      @update_span = "field_#{attribute.to_s.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.to_s.singularize.capitalize.constantize.new
-      @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
-    end
-    render :partial => "inline_forms/subform"
+  raw(out)
+end
+
+def associated_edit(object, attribute)
+  # @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.to_s.singularize + "_ids").index(@sub_id.to_i)
+    @associated_record = object.send(attribute)[@associated_record_id]
+    @update_span = "attribute_#{attribute.to_s.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.to_s.singularize.capitalize.constantize.new
+    @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
   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.to_s.singularize + "_ids").index(@sub_id.to_i)
-      @associated_record = object.send(attribute)[@associated_record_id]
-      @update_span = "field_" + attribute.to_s.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
+  render :partial => "inline_forms/subform"
+end
+
+def associated_update(object, attribute)
+  return if object.id.nil?
+  if @sub_id.to_i > 0
+    # get the existing associated record
+    @associated_record_id = object.send(attribute.to_s.singularize + "_ids").index(@sub_id.to_i)
+    @associated_record = object.send(attribute)[@associated_record_id]
+    @update_span = "attribute_" + attribute.to_s.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 attributes (attributes). These are declared in the model!
+  @associated_record.inline_forms_attribute_list.each do | @subform_description, @subform_attribute, @subform_element |
+    # have no fear
+    send("#{@subform_element}_update", @associated_record, @subform_attribute)
+  end
+  @associated_record.save
 end
 
+

data/app/helpers/form_elements/check_box.rb

@@ -1,16 +1,15 @@
-module InlineFormsHelper
-    InlineForms::SPECIAL_COLUMN_TYPES[:check_box]=:boolean
-  # 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
+InlineForms::SPECIAL_COLUMN_TYPES[:check_box]=:boolean
+# boolean, bit unaptly named check_box
+def check_box_show(object, attribute)
+  values ||= { 'false' => 'no', 'true' => 'yes' }
+  link_to_inline_edit object, attribute, values[object.send(attribute).to_s]
+end
+
+def check_box_edit(object, attribute)
+  check_box_tag attribute.to_s, 1, object.send(attribute)
+end
+
+def check_box_update(object, attribute)
+  object[attribute.to_s.to_sym] = params[attribute.to_s.to_sym].nil? ? 0 : 1
 end
 

data/app/helpers/form_elements/checklist.rb

@@ -1,36 +1,37 @@
-module InlineFormsHelper
-    InlineForms::SPECIAL_COLUMN_TYPES[:checklist]=:references
-  # 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>'
+InlineForms::SPECIAL_COLUMN_TYPES[:checklist]=:references
+
+# checklist
+def checklist_show(object, attribute)
+  out = '<ul class="checklist">'
+  out << link_to_inline_edit(object, attribute) if object.send(attribute).empty?
+  object.send(attribute).sort.each do | item |
+    out << '<li>'
+    out << link_to_inline_edit(object, attribute, item.title)
+    out << '</li>'
   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 <<  '</ul>'
+end
+
+def checklist_edit(object, attribute)
+  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
-  def checklist_update(object, attribute, values)
-    params[attribute] ||= {}
-    object.send(attribute.singularize + '_ids=', params[attribute].keys)
-  end
+  out << '</ul>'
+  out << '</div>'
+end
+
+def checklist_update(object, attribute)
+  params[attribute] ||= {}
+  object.send(attribute.singularize + '_ids=', params[attribute].keys)
 end
 

data/app/helpers/form_elements/date.rb

@@ -1,20 +1,20 @@
-module InlineFormsHelper
-    InlineForms::SPECIAL_COLUMN_TYPES[:date_select]=:date
+InlineForms::SPECIAL_COLUMN_TYPES[:date_select]=:date
 
-  # date
-  def date_select_show(object, attribute, values)
-    link_to_inline_edit object, attribute, object.send(attribute), nil
-  end
-  def date_select_edit(object, attribute, values)
-    out = text_field_tag attribute, object[attribute]
-    out << '<SCRIPT>'.html_safe
-    out << "$(function() { ".html_safe
-    out << '$("#'.html_safe + attribute.to_s.html_safe + '").datepicker();'.html_safe
-    out << '});'.html_safe
-    out << '</SCRIPT>'.html_safe
-    return out
-  end
-  def date_select_update(object, attribute, values)
-    object[attribute.to_sym] = params[attribute.to_sym]
-  end
+# date
+def date_select_show(object, attribute)
+  link_to_inline_edit object, attribute, object.send(attribute)
+end
+
+def date_select_edit(object, attribute)
+  out = text_field_tag attribute, object[attribute]
+  out << '<SCRIPT>'.html_safe
+  out << "$(function() { ".html_safe
+  out << '$("#'.html_safe + attribute.to_s.html_safe + '").datepicker();'.html_safe
+  out << '});'.html_safe
+  out << '</SCRIPT>'.html_safe
+  return out
+end
+
+def date_select_update(object, attribute)
+  object[attribute.to_sym] = params[attribute.to_sym]
 end