inline_forms 0.5.2 → 0.5.3

data/LICENSE.txt

@@ -1,4 +1,4 @@
-aCopyright (c) 2011 Ace Suares
+Copyright (c) 2011 Ace Suares
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/app/controllers/inline_forms_controller.rb

@@ -109,6 +109,7 @@ class InlineFormsController < ApplicationController
   #
   # GET /examples/1?field=name&form_element=text
   #
+  
   def show
     @object = @Klass.find(params[:id])
     @field = params[:field]

data/app/helpers/inline_forms_helper.rb

@@ -1,16 +1,28 @@
 INLINE_FORMS_PATH = File.dirname(__FILE__) + "/form_elements/"
 
 Dir[INLINE_FORMS_PATH + "*.rb"].each do |form_element|
-   require form_element
+  require form_element
 end
 
 module InlineFormsHelper
-  # display the forms from an array of attributes
-  def inline_form_display(object, attributes, action=:show)
+  def inline_form(object, attributes) #, collapsed=true)
     attributes = [ attributes ] if not attributes[0].is_a?(Array) # make sure we have an array of arrays
     out = String.new #ugly as hell but that's how content_tag works...
-    case action
-    when :show
+#    if collapsed
+#      then
+#      name_cell = content_tag :td, :valign=>'top' do
+#        content_tag :div, :class=> "field_name" do
+#          h(object.presentation)
+#        end
+#      end
+#      value_cell = content_tag :td, :valign=>'top' do
+#        content_tag :div, :class=> "field_value" do
+#          link_to 'edit', send( @Klass.to_s.underscore + '_path', object, :update => 'inline_form_list'), :remote => true
+#        end
+#      end
+#      out += content_tag :tr, name_cell + value_cell
+#      out += "\n"
+#    else
       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}"
@@ -22,33 +34,37 @@ module InlineFormsHelper
         value_cell = content_tag :td, :valign=>'top' do
           content_tag :div, :class=> "field_value field_#{attribute.to_s} form_element_#{form_element.to_s}" do
             content_tag :span, :id => css_class_id do
-              send("#{form_element.to_s}_#{action}", object, attribute, values)
+              send("#{form_element.to_s}_show", object, attribute, values)
             end
           end
         end
         out += content_tag :tr, name_cell + value_cell
         out += "\n"
       end
-      return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
-    when :new
-      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}"
-          name_cell = content_tag :td, :valign=>'top' do
-            content_tag :div, :class=> "field_name field_#{attribute.to_s} form_element_#{form_element.to_s}" do
-              h(name)
-            end
+#    end
+    return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
+  end
+
+  def inline_form_display_new(object, attributes)
+    attributes = [ attributes ] if not attributes[0].is_a?(Array) # make sure we have an array of arrays
+    out = String.new #ugly as hell but that's how content_tag works...
+    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}"
+        name_cell = content_tag :td, :valign=>'top' do
+          content_tag :div, :class=> "field_name field_#{attribute.to_s} form_element_#{form_element.to_s}" do
+            h(name)
           end
-          value_cell = content_tag :td, :valign=>'top' do
-            content_tag :div, :class=> "field_value field_#{attribute.to_s} form_element_#{form_element.to_s}" do
-              content_tag :span, :id => css_class_id do
-                send("#{form_element.to_s}_edit", object, attribute, values)
-              end
+        end
+        value_cell = content_tag :td, :valign=>'top' do
+          content_tag :div, :class=> "field_value field_#{attribute.to_s} form_element_#{form_element.to_s}" do
+            content_tag :span, :id => css_class_id do
+              send("#{form_element.to_s}_edit", object, attribute, values)
             end
           end
-          out += content_tag :tr, name_cell + value_cell
         end
+        out += content_tag :tr, name_cell + value_cell
       end
     end
     return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
@@ -58,7 +74,7 @@ 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, 'name', 'text' ]
+        inline_form object, object.respond_to?(:inline_forms_field_list) ? object.inline_forms_field_list : [ :name, 'name', 'text' ]
       end
     end
     return raw(t)

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, 'name', :text ], :new) %>
+    <%= inline_form_display_new(@object, @object.respond_to?(:inline_forms_field_list) ? @object.inline_forms_field_list : [ :name, 'name', :text ] ) %>
   </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/layouts/inline_forms.rhtml

@@ -4,7 +4,7 @@
   <head>
     <title><%= h(yield(:title) || "xyxyxyx") %></title>
     <%= csrf_meta_tag %>
-    <%= stylesheet_link_tag 'inline_form_elements' %>
+    <%= stylesheet_link_tag 'inline_forms/inline_forms' %>
     <%= javascript_include_tag :defaults %>
     <%= yield(:head) %>
   </head>

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-02-05}
+  s.date = %q{2011-02-08}
   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 = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 -04:00
+date: 2011-02-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency