inline_forms 0.2.6 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.3.0

data/app/controllers/inline_forms_controller.rb

@@ -12,13 +12,8 @@ class InlineFormsController < ApplicationController
   # === How it works
   # The getKlass before_filter extracts the class and puts it in @Klass
   # === Limited Access
-  # the must_be_xhr_request before_filter is supposed to only perform the specific actions
-  # 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
   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.
   # Each field (attribute) is edited seperately (so you don't edit an entire object!)
   # The link to 'new' allows you to create a new record.
@@ -34,26 +29,25 @@ class InlineFormsController < ApplicationController
       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'
   #
   # GET /examples/1?field=name&form_element=text
   #
-  def show
-    @object = @Klass.constantize.find(params[:id])
-    @field = params[:field]
-    @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.singularize + "_ids").index(@sub_id.to_i)
-        @associated_record = @object.send(@field)[@associated_record_id]
-      end
-    end
-    render :inline => '<%= send("#{@form_element}_show", @object, @field, @values) %>'
-  end
+#  def show
+#    @object = @Klass.constantize.find(params[:id])
+#    @field = params[:field]
+#    @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.singularize + "_ids").index(@sub_id.to_i)
+#        @associated_record = @object.send(@field)[@associated_record_id]
+#      end
+#    end
+#    render :inline => '<%= send("#{@form_element}_show", @object, @field, @values) %>'
+#  end
 
   # :new prepares a new object, updates the entire list of objects and replaces it with a new
   # empty form. After pressing OK or Cancel, the list of objects is retrieved in the same way as :index
@@ -74,11 +68,17 @@ class InlineFormsController < ApplicationController
   # GET /examples/1/edit
   #
   def edit
-    @object = @Klass.constantize.find(params[:id])
+    @object = @Klass.find(params[:id])
     @field = params[:field]
     @form_element = params[:form_element]
     @values = params[:values]
     @sub_id = params[:sub_id]
+    @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/edit'}
+      }
+    end
   end
 
   # :create creates the object made with :new. It then presents the list of objects.
@@ -101,47 +101,53 @@ class InlineFormsController < ApplicationController
       }
     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) %>'
+  # :update updates a specific field from an object.
+  #
+  # PUT /examples/1
+  #
+  def update
+    @object = @Klass.find(params[:id])
+    @field = params[:field]
+    @form_element = params[:form_element]
+    @values = params[:values]
+    @sub_id = params[:sub_id]
+    @update_span = params[:update]
+    send("#{@form_element.to_s}_update", @object, @field, @values)
+    @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) %>' }
+      }
     end
+      
+  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
-    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
   end
+end

data/app/helpers/inline_forms_helper.rb

@@ -61,7 +61,7 @@ module InlineFormsHelper
   end
   # link for new item
   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
+    link_to text, send('new_' + @Klass.to_s.underscore + '_path', :update => update_span), :remote => true
   end
 
   # dropdown
@@ -215,7 +215,7 @@ module InlineFormsHelper
               :values => values },
             :method => :get,
             :update => "field_#{attribute.singularize}_#{m.id.to_s}",
-          :remote => true )
+            :remote => true )
           out << '</li>'
           out << '</span>'
         end
@@ -231,7 +231,7 @@ module InlineFormsHelper
           :values => values },
         :method => :get,
         :update => "list_#{attribute}_#{object.id.to_s}",
-      :remote => true )
+        :remote => true )
       out << '</li>'
       out << '</ul>' if @sub_id.nil?
     end
@@ -239,7 +239,7 @@ module InlineFormsHelper
   end
   def associated_edit(object, attribute, values)
     # @sub_id is the id of the assoicated record
-   if @sub_id.to_i > 0
+    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]
@@ -293,20 +293,13 @@ module InlineFormsHelper
     attribute_value = h(attribute_value)
     spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
     attribute_value << "&nbsp;".html_safe * spaces
-    if @Klass == 'Index'
-    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,
-      :remote => true
-    else
-    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,
+    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
-
-    end
   end
 end
 

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

@@ -0,0 +1,23 @@
+<% form_tag send(@Klass.to_s.underscore + '_path', :update => @update_span ,
+  #|| @form_element == "associated" ? @sub_id && @sub_id.to_i > 0 ? "field_#{@field.singularize}_#{@sub_id}" : "list_#{@field}_#{@object.id.to_s}" : "field_#{@field}_#{@object.id.to_s}",
+  :field => @field,
+  :form_element => @form_element,
+  :values => @values,
+  :sub_id => @sub_id ),
+  :method => :put,
+:multipart => true,
+  :class  => "edit_form",
+  :remote => true do -%>
+  <div class="edit_form_field">
+    <%= send("#{@form_element.to_s}_edit", @object, @field, @values) %>
+  </div>
+  <%= link_to "nee", send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span || "field_#{@field}_#{@object.id.to_s}",
+    :field => @field,
+    :form_element => @form_element,
+    :values => @values,
+    :sub_id => @sub_id ),
+    :method => :get,
+    :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,9 +1,9 @@
-<% form_tag  valid_tables_path( :update => @update_span || 'inline_form_list' ), 
+<% 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) %>
   </div>
-  <%= link_to "nee", valid_tables_path(:update => @update_span), :remote => true,
+  <%= link_to "nee", send(@Klass.to_s.underscore.pluralize + '_path',:update => @update_span), :remote => true,
     :class  => "edit_form_cancel"  %>
   <%= submit_tag "ok", :class => "edit_form_submit"-%>
   <div style="clear: both;"></div>

data/inline_forms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.2.6"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
@@ -28,12 +28,11 @@ 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/_edit.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/edit.html.erb",
     "app/views/inline_forms/index.html.erb",
-    "app/views/inline_forms/new.html.erb",
     "app/views/layouts/inline_forms.rhtml",
     "inline_forms.gemspec",
     "lib/inline_forms.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 6
-  version: 0.2.6
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ace Suares
@@ -99,12 +99,11 @@ files:
 - app/helpers/inline_forms_helper.rb
 - app/models/geo_code_curacao.rb
 - app/models/inline_form.rb
+- app/views/inline_forms/_edit.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/edit.html.erb
 - app/views/inline_forms/index.html.erb
-- app/views/inline_forms/new.html.erb
 - app/views/layouts/inline_forms.rhtml
 - inline_forms.gemspec
 - lib/inline_forms.rb

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

@@ -1,17 +0,0 @@
-<% form_remote_tag :update => @update_span || @form_element == "associated" ? @sub_id && @sub_id.to_i > 0 ? "field_#{@field.singularize}_#{@sub_id}" : "list_#{@field}_#{@object.id.to_s}" : "field_#{@field}_#{@object.id.to_s}",
- :url => "/#{@Klass_pluralized}/#{params[:id]}?field=#{@field}&form_element=#{@form_element}&values=#{@values}&sub_id=#{@sub_id}",
-  :method => :put,
-  :multipart => true,
-  :html => { :class  => "edit_form" } do -%>
-  <div class="edit_form_field">
-    <%= send("#{@form_element.to_s}_edit", @object, @field, @values) %>
-  </div>
-  <%= link_to_remote "nee",
-    :url => "/#{@Klass_pluralized}/#{params[:id]}?field=#{@field}&form_element=#{@form_element}&values=#{@values}&sub_id=#{@sub_id}",
-    :method => :get,
-    :html => { :class  => "edit_form_cancel" },
-    :update => @update_span || "field_#{@field}_#{@object.id.to_s}" -%>
-  <%= submit_tag "ok", :class => "edit_form_submit"-%>
-  <div style="clear: both;"></div>
-<% end -%>
-

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

@@ -1,18 +0,0 @@
-<% 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?(:inline_forms_field_list) ? @object.inline_forms_field_list : [ '', :name, :text ], :new) %>
-  </div>
-  <%= 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,
-    :remote => true -%>
-  <%= submit_tag "ok", :class => "edit_form_submit"-%>
-  <div style="clear: both;"></div>
-<% end -%>
-