inline_forms 0.9.1 → 0.9.2

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/app/controllers/inline_forms_controller.rb

@@ -83,9 +83,9 @@ class InlineFormsController < ApplicationController
       send("#{form_element.to_s}_update", object, attribute) unless form_element == :associated
     end
     if object.save
-      flash[:success] = "Successfully created product."
+      flash[:success] = "Successfully created #{object.class.to_s.downcase}."
     else
-      flash[:error] = "NOT Successfully created product."
+      flash[:error] = "Failed to create #{object.class.to_s.downcase}."
     end
     @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC'
     respond_to do |format|

data/app/helpers/inline_forms_helper.rb

@@ -37,7 +37,11 @@ module InlineFormsHelper
       value_cell = content_tag :td, :valign=>'top' 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}_show", object, attribute)
+            if form_element == :associated
+              inline_forms_list(object.send(attribute.to_s.pluralize), attribute )
+            else
+              send("#{form_element}_show", object, attribute)
+            end
           end
         end
       end
@@ -53,8 +57,16 @@ module InlineFormsHelper
   # associated records are NOT shown!
   #
   def inline_forms_new_record(object, attributes=nil)
-    attributes ||= object.inline_forms_attribute_list
     out = String.new
+    out += content_tag :tr do
+      content_tag :th, :colspan => 2, :valign=>'top' do
+        content_tag :div, :class=> "object_presentation" do
+          "New #{object.class.to_s}"
+        end
+      end
+    end
+    out << "\n"
+    attributes ||= object.inline_forms_attribute_list
     attributes.each do | attribute, name, form_element |
       unless form_element.to_sym == :associated
         css_class_id = "attribute_#{attribute}_#{object.id}"
@@ -77,29 +89,30 @@ module InlineFormsHelper
   end
 
   # display a list of objects
-  def inline_forms_list(objects, tag=:li)
+  def inline_forms_list(objects, attribute )
     t = String.new
+    # link to new
+    update_span = attribute.to_s.underscore + '_list'
+    t += content_tag :li, :class => "new_record_link_li" do
+      link_to "New",
+        send('new_' + attribute.to_s.singularize.underscore + '_path', :update => update_span),
+        :remote => true
+    end
+    # list of objects
     objects.each do |object|
       css_class_id = object.class.to_s.underscore + '_' + object.id.to_s
-      t += content_tag tag, :id => css_class_id, :class => cycle("odd", "even") do
+      t += content_tag :li, :id => css_class_id, :class => cycle("odd", "even") do
         link_to h(object._presentation),
           send( object.class.to_s.underscore + '_path', object, :update => css_class_id),
           :remote => true
       end
     end
-    t = content_tag :ul, :class => "inline_forms_list" do
+    t = content_tag :ul, :id => update_span, :class => "inline_forms_list" do
       t.html_safe
     end
     return t
   end
 
-  # link for new item
-  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
 
   # close icon

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

@@ -1 +1 @@
-<div id="Header">Hello Header</div>
+<div id="Header">Inline Forms</div>

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

@@ -1,10 +1,6 @@
 <% flash.each do |key, value| %>
-  <div class="flash <%= key %>"><%= value %></div>
+  <div id="flash" class="flash <%= key %>"><%= value %></div>
 <% end %>
-
-<li class="inline_forms_new_record">
-  <%= inline_forms_new_record_link %>
-</li>
-<%= inline_forms_list(@objects) %>
+<%= inline_forms_list(@objects, @Klass.to_s.pluralize) %>
 <%= will_paginate @objects %>
 <div id="paginate_info"><%= page_entries_info @objects %></div>

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

@@ -1,10 +1,7 @@
 <% flash.each do |key, value| %>
-  <div class="flash <%= key %>"><%= value %></div>
+  <div id="flash" class="flash <%= key %>"><%= value %></div>
 <% end %>
 
-<li class="inline_forms_new_record_link">
-  <%= inline_forms_new_record_link %>
-</li>
-<%= inline_forms_list(@objects) %>
+<%= inline_forms_list(@objects, @Klass.to_s.pluralize) %>
 <%= will_paginate @objects %>
 <div id="paginate_info"><%= page_entries_info @objects %></div>

data/inline_forms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
@@ -25,7 +25,6 @@ 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/check_list.rb",
     "app/helpers/form_elements/date.rb",
@@ -45,7 +44,6 @@ Gem::Specification.new do |s|
     "app/views/inline_forms/_header.html.erb",
     "app/views/inline_forms/_index.html.erb",
     "app/views/inline_forms/_new.html.erb",
-    "app/views/inline_forms/_subform.html.erb",
     "app/views/inline_forms/index.html.erb",
     "app/views/layouts/inline_forms.rhtml",
     "inline_forms.gemspec",

data/lib/inline_forms.rb

@@ -86,8 +86,9 @@ module InlineForms
   #   :country => [ "country", :dropdown ],
   # to the inline_forms_attribute_list in the model.
   #
-  SPECIAL_COLUMN_TYPES = {}
-
+  SPECIAL_COLUMN_TYPES = {
+    :associated => :no_migration
+  }
   # When a column has the type of :references or :belongs_to, then
   # there will be a line in the migration reflecting that, but not in the model.
   # == Why?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Ace Suares
@@ -96,7 +96,6 @@ 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/check_list.rb
 - app/helpers/form_elements/date.rb
@@ -116,7 +115,6 @@ files:
 - app/views/inline_forms/_header.html.erb
 - app/views/inline_forms/_index.html.erb
 - app/views/inline_forms/_new.html.erb
-- app/views/inline_forms/_subform.html.erb
 - app/views/inline_forms/index.html.erb
 - app/views/layouts/inline_forms.rhtml
 - inline_forms.gemspec

data/app/helpers/form_elements/associated.rb

@@ -1,94 +0,0 @@
-InlineForms::SPECIAL_COLUMN_TYPES[:associated]=:no_migration
-
-# associated
-def associated_show(object, attribute)
-  #show a list of records
-  inline_forms_list(object.send(attribute.to_s.pluralize))
-end
-#
-#  out = String.new
-#  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,
-#        :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]+$/,''),
-#        :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]+$/,''),
-#            :update => "attribute_#{attribute.to_s.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 << '</ul>' if @sub_id.nil?
-#  end
-#  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
-#  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) unless @subform_element == :associated
-#  end
-#  @associated_record.save
-#end
-#
-#

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

@@ -1,20 +0,0 @@
-<table cellpadding="0" cellspacing="0" class="subform">
-  <% @associated_record.inline_forms_attribute_list.each do | @subform_field, @subform_description, @subform_element  | %>
-    <tr>
-      <td valign="top">
-        <div class="subform_field-name">
-          <%= h(@subform_description) %>
-        </div>
-      </td>
-      <td valign="top">
-        <div class="subform_field-value">
-          <% if @subform_element == :associated -%>
-            <%= inline_forms_list @associated_record.send(@subform_field) %>
-          <% else %>
-            <%= send("#{@subform_element}_edit", @associated_record, @subform_field.to_s) %>
-          <% end %>
-        </div>
-      </td>
-    </tr>
-  <% end %>
-</table>