inline_forms 0.2.4 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.6

data/app/controllers/inline_forms_controller.rb

@@ -16,7 +16,7 @@ class InlineFormsController < ApplicationController
   # if the request is an XhttpRequest. There is not much use permitting the actions outside of
   # the XhttpRequest context (except action => :index). Of course, this is not a security measure.
   before_filter :getKlass
-  before_filter :must_be_xhr_request, :except => :index
+  #before_filter :must_be_xhr_request, :except => :index
   include InlineFormsHelper # this might also be included in you application_controller with helper :all but it's not needed
   layout false
   # :index shows a list of all objects from class Klass, with all attribute values linked to the 'edit' action.
@@ -26,10 +26,15 @@ class InlineFormsController < ApplicationController
   # GET /examples
   #
   def index
-#    nolayout = params[:layout] == 'false' || false
     @objects = @Klass.all
-#    render( :layout => nolayout || 'inline_forms' )
-render 'inline_forms/inline_forms'
+    update_span = params[:update]
+    respond_to do |format|
+      # found this here: http://www.ruby-forum.com/topic/211467
+      format.html { render 'inline_forms/index', :layout => 'inline_forms' }
+      format.js { render(:update) {|page| page.replace_html update_span, :partial => 'inline_forms/index' }
+      }
+    end
+    
   end
 
   # :show shows one field (attribute) from a record (object). It inludes the link to 'edit'
@@ -55,7 +60,13 @@ render 'inline_forms/inline_forms'
   #
   # GET /examples/new
   def new
-    @object = @Klass.constantize.new
+    @object = @Klass.new
+    @update_span = params[:update]
+    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/new'}
+      }
+    end
   end
 
   # :edit presents a form to edit one specific field from an object
@@ -75,58 +86,62 @@ render 'inline_forms/inline_forms'
   # POST /examples
   #
   def create
-    object = @Klass.constantize.new
-    attributes = object.respond_to?(:field_list) ? object.field_list : [ '', :name, :text ] # sensible default
+    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)
     end
     object.save
-    @objects = @Klass.constantize.all
-    render( :action => :index )
-  end
-
-  # :update updates a specific field from an object.
-  #
-  # PUT /examples/1
-  #
-  def update
-    @object = @Klass.constantize.find(params[:id])
-    @field = params[:field]
-    @form_element = params[:form_element]
-    @values = params[:values]
-    @sub_id = params[:sub_id]
-    send("#{@form_element.to_s}_update", @object, @field, @values)
-    @object.save
-    render :inline => '<%= send("#{@form_element.to_s}_show", @object, @field, @values) %>'
+    @objects = @Klass.all
+    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.
+    #
+    # PUT /examples/1
+    #
+    def update
+      @object = @Klass.constantize.find(params[:id])
+      @field = params[:field]
+      @form_element = params[:form_element]
+      @values = params[:values]
+      @sub_id = params[:sub_id]
+      send("#{@form_element.to_s}_update", @object, @field, @values)
+      @object.save
+      render :inline => '<%= send("#{@form_element.to_s}_show", @object, @field, @values) %>'
+    end
 
-  # :destroy is not implemented
-  # TODO implement a destroy method
-  #
-  # DELETE /examples/1
-  #
-  def destroy
-    #    @@Klass.constantize = @Klass.constantize.find(params[:id])
-    #    @@Klass.constantize.destroy
-    redirect_to(@Klass.constantizes_url)
-  end
+    # :destroy is not implemented
+    # TODO implement a destroy method
+    #
+    # DELETE /examples/1
+    #
+    def destroy
+      #    @@Klass.constantize = @Klass.constantize.find(params[:id])
+      #    @@Klass.constantize.destroy
+      redirect_to(@Klass.constantizes_url)
+    end
 
-  private
-  # If it's not an XhttpRequest, redirect to the index page for this controller.
-  #
-  # Used in before_filter as a way to limit access to all actions (except :index)
-  def must_be_xhr_request #:doc:
-    redirect_to "/#{@Klass_pluralized}" if not request.xhr?
-  end
+    private
+    # If it's not an XhttpRequest, redirect to the index page for this controller.
+    #
+    # Used in before_filter as a way to limit access to all actions (except :index)
+    def must_be_xhr_request #:doc:
+      redirect_to "/#{@Klass_pluralized}" if not request.xhr?
+    end
 
-  # Get the class
-  # Used in before_filter
-  def getKlass #:doc:
-    @Klass = self.controller_name.classify.constantize
-    #request.request_uri.split(/[\/?]/)[1].classify
-    #@Klass_constantized = @Klass.constantize
-    #@Klass_underscored = @Klass.underscore
-    #@Klass_pluralized  = @Klass_underscored.pluralize
+    # Get the class
+    # Used in before_filter
+    def getKlass #:doc:
+      @Klass = self.controller_name.classify.constantize
+      #request.request_uri.split(/[\/?]/)[1].classify
+      #@Klass_constantized = @Klass.constantize
+      #@Klass_underscored = @Klass.underscore
+      #@Klass_pluralized  = @Klass_underscored.pluralize
+    end
   end
-end

data/app/helpers/inline_forms_helper.rb

@@ -1,4 +1,3 @@
-puts 'inline forms helper loaded'
 module InlineFormsHelper
   # display the forms from an array of attributes
   def inline_form_display(object, attributes, action=:show)
@@ -22,8 +21,9 @@ module InlineFormsHelper
           end
         end
         out += content_tag :tr, name_cell + value_cell
+        out += "\n"
       end
-      return content_tag :table, out, :cellspacing => 0, :cellpadding => 0
+      return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
     when :new
       attributes.each do | name, attribute, form_element, values |
         #css_class_id = form_element == :associated ? "subform_#{attribute.to_s}_#{object.id}" : "field_#{attribute.to_s}_#{object.id}"
@@ -46,7 +46,7 @@ module InlineFormsHelper
         end
         out += content_tag :tr, name_cell + value_cell
       end
-      return content_tag :table, out, :cellspacing => 0, :cellpadding => 0
+      return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
     end
   end
   # display a list of objects
@@ -54,22 +54,14 @@ module InlineFormsHelper
     t = ''
     objects.each do |object|
       t += content_tag tag do
-        inline_form_display object, object.respond_to?(:field_list) ? object.field_list : [ '', :name, :text ]
+        inline_form_display object, object.respond_to?(:inline_forms_field_list) ? object.inline_forms_field_list : [ '', :name, :text ]
       end
     end
-    return t
+    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_remote( text,
-      :url => {
-        :action => :new,
-        :controller => @Klass_pluralized,
-        :field => attribute,
-        :form_element => form_element,
-        :update_span => update_span },
-      :method => :get,
-      :update => update_span )
+  def inline_form_new_record(attribute, form_element, text='neeeeew', update_span='inline_form_list')
+    link_to text, new_valid_table_path(:update => update_span), :remote => true
   end
 
   # dropdown
@@ -195,7 +187,7 @@ module InlineFormsHelper
     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_remote( @associated_record.title,
+      out << link_to( @associated_record.title,
         :url => { :action => 'edit',
           :id => object.id,
           :field => attribute,
@@ -203,7 +195,8 @@ module InlineFormsHelper
           :form_element => this_method.reverse.sub(/.*_/,'').reverse,
           :values => values },
         :method => :get,
-        :update => "field_#{attribute.singularize}_#{@sub_id.to_s}" )
+        :update => "field_#{attribute.singularize}_#{@sub_id.to_s}",
+        :remote => true )
       out << '</li>'
     else
       # if it's a new record (sub_id == 0) then update the whole <ul> and redraw all list-elements
@@ -213,7 +206,7 @@ module InlineFormsHelper
         object.send(attribute.pluralize).each do |m|
           out << "<span id='field_#{attribute.singularize}_#{m.id.to_s}'>"
           out << '<li>'
-          out << link_to_remote( m.title,
+          out << link_to( m.title,
             :url => { :action => 'edit',
               :id => object.id,
               :field => attribute,
@@ -221,14 +214,15 @@ module InlineFormsHelper
               :form_element => this_method.sub(/_[a-z]+$/,''),
               :values => values },
             :method => :get,
-            :update => "field_#{attribute.singularize}_#{m.id.to_s}" )
+            :update => "field_#{attribute.singularize}_#{m.id.to_s}",
+          :remote => true )
           out << '</li>'
           out << '</span>'
         end
       end
       # add a 'new' link for creating a new record
       out << '<li>'
-      out << link_to_remote( 'new',
+      out << link_to( 'new',
         :url => { :action => 'edit',
           :id => object.id,
           :field => attribute,
@@ -236,7 +230,8 @@ module InlineFormsHelper
           :form_element => this_method.sub(/_[a-z]+$/,''),
           :values => values },
         :method => :get,
-        :update => "list_#{attribute}_#{object.id.to_s}" )
+        :update => "list_#{attribute}_#{object.id.to_s}",
+      :remote => true )
       out << '</li>'
       out << '</ul>' if @sub_id.nil?
     end
@@ -294,23 +289,22 @@ module InlineFormsHelper
   private
 
   # link_to_inline_edit
-  # Directly call Erb::Util.h because we sometimes call this from the controller!
-  # same with link_to_remote. We are using the @template stuff.
   def link_to_inline_edit(object, attribute, attribute_value, values)
-   #needed for h() and link_to_remote()
     attribute_value = h(attribute_value)
     spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
-    attribute_value << "&nbsp;" * spaces
+    attribute_value << "&nbsp;".html_safe * spaces
     if @Klass == 'Index'
-    link_to_remote attribute_value,
+    link_to raw(attribute_value),
       :url => "/#{@Klass_pluralized}/edit/#{object.id}?field=#{attribute.to_s}&form_element=#{calling_method.sub(/_[a-z]+$/,'')}&values=#{values}",
       :update => 'field_' + attribute.to_s + '_' + object.id.to_s,
-      :method => :get
+      :method => :get,
+      :remote => true
     else
-    link_to_remote attribute_value,
+    link_to raw(attribute_value),
       :url => "/#{@Klass_pluralized}/#{object.id}/edit?field=#{attribute.to_s}&form_element=#{calling_method.sub(/_[a-z]+$/,'')}&values=#{values}",
       :update => 'field_' + attribute.to_s + '_' + object.id.to_s,
-      :method => :get
+      :method => :get,
+      :remote => true
 
     end
   end

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

@@ -0,0 +1,4 @@
+<li class="inline_form_new_item">
+  <%= inline_form_new_record @field, @form_element  %>
+</li>
+<%= inline_form_display_list(@objects) %>

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

@@ -0,0 +1,10 @@
+<% form_tag  valid_tables_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) %>
+  </div>
+  <%= link_to "nee", valid_tables_path(:update => @update_span), :remote => true,
+    :class  => "edit_form_cancel"  %>
+  <%= submit_tag "ok", :class => "edit_form_submit"-%>
+  <div style="clear: both;"></div>
+<% end -%>

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

@@ -1,16 +1,17 @@
-<% form_remote_tag :multipart => true,
-  :url => "/#{@Klass_pluralized}?field=#{@attribute.to_s}&form_element=#{@form_element}&values=#{@values}&sub_id=#{@sub_id}",
+<% form_tag :multipart => true,
+  :url => "/#{@Klass.to_s.pluralize}?field=#{@attribute.to_s}&form_element=#{@form_element}&values=#{@values}&sub_id=#{@sub_id}",
   :update => @update_span || 'inline_form_list',
   :html => { :class  => "edit_form" } do -%>
   <div class="edit_form_field">
-    <%= inline_form_display(@object, @object.respond_to?(:field_list) ? @object.field_list : [ '', :name, :text ], :new) %>
+    <%= inline_form_display(@object, @object.respond_to?(:inline_forms_field_list) ? @object.inline_forms_field_list : [ '', :name, :text ], :new) %>
   </div>
-  <%= link_to_remote "nee",
-#  :url => "/#{@Klass_pluralized}/index?field=#{@attribute.to_s}&form_element=#{@form_element}&values=#{@values}&sub_id=#{@sub_id}",
+  <%= link_to "nee",
+    #  :url => "/#{@Klass_pluralized}/index?field=#{@attribute.to_s}&form_element=#{@form_element}&values=#{@values}&sub_id=#{@sub_id}",
   :url => "/#{@Klass_pluralized}?layout=false",
     :html => { :class  => "edit_form_cancel" },
     :update => 'inline_form_list',
-    :method => :get -%>
+    :method => :get,
+    :remote => true -%>
   <%= submit_tag "ok", :class => "edit_form_submit"-%>
   <div style="clear: both;"></div>
 <% end -%>

data/app/views/layouts/inline_forms.rhtml

@@ -1,7 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title><%= h(yield(:title) || "xyxyxyx") %></title>
+    <%= csrf_meta_tag %>
     <%= stylesheet_link_tag 'inline_form_elements' %>
     <%= javascript_include_tag :defaults %>
-    <%#= calendar_date_select_includes "red" %>
-<h1><%= @Klass.to_s %></h1>
-<ul id="inline_form_list">
-<%= yield %>
-</ul>
+    <%= yield(:head) %>
+  </head>
+<%#= calendar_date_select_includes "red" %>
+  <body>
+    <h1><%= @Klass.to_s %></h1>
+    <ul id="inline_form_list">
+      <%= yield %>
+    </ul>
+  </body>
+</html>

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.2.4"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-01-29}
+  s.date = %q{2011-01-30}
   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 = [
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
     "app/helpers/inline_forms_helper.rb",
     "app/models/geo_code_curacao.rb",
     "app/models/inline_form.rb",
+    "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/edit.html.erb",
     "app/views/inline_forms/index.html.erb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 -04:00
+date: 2011-01-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,8 @@ files:
 - app/helpers/inline_forms_helper.rb
 - app/models/geo_code_curacao.rb
 - app/models/inline_form.rb
+- 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/edit.html.erb
 - app/views/inline_forms/index.html.erb