inline_forms 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/app/controllers/inline_forms_controller.rb

@@ -1,35 +1,40 @@
+# == Generic controller for the inline_forms plugin.
+# === Usage
+# If you have an Example class, make an ExampleController
+# that is a subclass of InlineFormsController
+#  class ExampleController < InlineFormsController
+#  end
+# That's it! It'll work. But please read about the InlineForms::InlineFormsGenerator first!
+#
+# You can override the methods in your ExampleController
+#  def index
+#    @objects=@Klass.all
+#  end
+#
+#
+# @objects holds the objects (in this case Examples)
+# and @Klass will be set to Example by the getKlass before filter.
+# 
+# === How it works
+# The getKlass before_filter extracts the class and puts it in @Klass
+#
+# @Klass is used in the InlineFormsHelper
+#
 class InlineFormsController < ApplicationController
-  #unloadable # see http://dev.rubyonrails.org/ticket/6001
-  # == Generic controller for the inline_forms plugin.
-  # === Usage
-  # If you have an Example class, make an ExampleController that is a subclass of InlineFormsController
-  # <tt>class ExampleController < InlineFormsController
-  # # add before filters if you want: before_filter :authenticate_user!, :only => :token
-  # # override methods or make your own, using @Klass instead of Example.
-  # #  def index
-  # #   @objects=@Klass.all
-  # #  end
-  # === How it works
-  # The getKlass before_filter extracts the class and puts it in @Klass
-  # === Limited Access
   before_filter :getKlass
-  include InlineFormsHelper # this might also be included in you application_controller with helper :all but it's not needed
-  # :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.
+  include InlineFormsHelper
+
+  # shows a list of all objects from class @Klass, using will_paginate
   #
-  # GET /examples
+  # The link to 'new' allows you to create a new record.
   #
   def index
-    #@objects = @Klass.all
     @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC'
-
     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' }
-      }
+      format.js { render(:update) {|page| page.replace_html update_span, :partial => 'inline_forms/index' } }
     end
   end
 
@@ -98,7 +103,7 @@ class InlineFormsController < ApplicationController
     @values = params[:values]
     @sub_id = params[:sub_id]
     @update_span = params[:update]
-    @values = params[@Klass.to_s.downcase][@field.to_sym]
+    #@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)
     @object.save
     respond_to do |format|
@@ -133,6 +138,7 @@ class InlineFormsController < ApplicationController
         }
       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) %>' }
@@ -153,8 +159,7 @@ class InlineFormsController < ApplicationController
   #  end
 
   private
-  # Get the class
-  # Used in before_filter
+  # Get the class from the controller name.
   def getKlass #:doc:
     @Klass = self.controller_name.classify.constantize
   end

data/app/helpers/form_elements/date.rb

@@ -2,14 +2,19 @@ module InlineFormsHelper
     InlineForms::SPECIAL_MIGRATION_TYPES[:date_select]=:date
 
   # date
-  def date_show(object, attribute, values)
+  def date_select_show(object, attribute, values)
     link_to_inline_edit object, attribute, object.send(attribute), nil
   end
-  def date_edit(object, attribute, values)
-    calendar_date_select_tag attribute, object[attribute], :year_range => 30.years.ago..5.years.from_now, :popup => :force
+  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_update(object, attribute, values)
+  def date_select_update(object, attribute, values)
     object[attribute.to_sym] = params[attribute.to_sym]
   end
 end
-

data/app/helpers/form_elements/dropdown_with_integers.rb

@@ -0,0 +1,26 @@
+module InlineFormsHelper
+    InlineForms::SPECIAL_MIGRATION_TYPES[:dropdown_with_integers]=:integer
+  # dropdown_with_integers generates a dropdown menu
+  # with the given list of integers as options
+  #
+  # values must be a Range or a one-dimensional array of Integers
+  def dropdown_with_integers_show(object, attribute, values)
+    unless values.is_a?(Hash)
+      options = Array.new
+      values.to_a.each_index do |i|
+        options << [ i.to_s, values.to_a[i] ]
+      end
+      values = Hash[ *options.flatten ]
+    end
+    link_to_inline_edit object, attribute, values[object.send(attribute).to_s], values
+  end
+  def dropdown_with_integers_edit(object, attribute, values)
+    # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
+    values = values.sort {|a,b| a[1].to_i<=>b[1].to_i}
+    collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'first', 'last', :selected => object.send(attribute))
+  end
+  def dropdown_with_integers_update(object, attribute, values)
+    object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
+  end
+end
+

data/app/helpers/form_elements/dropdown_with_values.rb

@@ -2,10 +2,18 @@ module InlineFormsHelper
     InlineForms::SPECIAL_MIGRATION_TYPES[:dropdown_with_values]=:integer
   # dropdown_with_values
   def dropdown_with_values_show(object, attribute, values)
-    link_to_inline_edit object, attribute, values[object.send(attribute)], values
+    unless values.is_a?(Hash)
+      options = Array.new
+      values.to_a.each_index do |i|
+        options << [ i.to_s, values.to_a[i] ]
+      end
+      values = Hash[ *options.flatten ]
+    end
+    link_to_inline_edit object, attribute, values[object.send(attribute).to_s], values
   end
   def dropdown_with_values_edit(object, attribute, values)
     # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!
+    values = values.sort {|a,b| a[1]<=>b[1]}
     collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'first', 'last', :selected => object.send(attribute))
   end
   def dropdown_with_values_update(object, attribute, values)

data/app/helpers/inline_forms_helper.rb

@@ -6,10 +6,9 @@ end
 
 module InlineFormsHelper
   def inline_forms_show_record(object, attributes)
-    attributes = [ attributes ] if not attributes[0].is_a?(Array) # make sure we have an array of arrays
+    attributes = [ attributes ] unless attributes[0].is_a?(Array) # make sure we have an array of arrays
     out = String.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}"
       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

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-02-28}
+  s.date = %q{2011-03-07}
   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 = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "app/helpers/form_elements/checklist.rb",
     "app/helpers/form_elements/date.rb",
     "app/helpers/form_elements/dropdown.rb",
+    "app/helpers/form_elements/dropdown_with_integers.rb",
     "app/helpers/form_elements/dropdown_with_values.rb",
     "app/helpers/form_elements/geo_code_curacao.rb",
     "app/helpers/form_elements/image.rb",
@@ -38,7 +39,6 @@ Gem::Specification.new do |s|
     "app/helpers/form_elements/text_field.rb",
     "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",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -04:00
+date: 2011-03-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,7 @@ files:
 - app/helpers/form_elements/checklist.rb
 - app/helpers/form_elements/date.rb
 - app/helpers/form_elements/dropdown.rb
+- app/helpers/form_elements/dropdown_with_integers.rb
 - app/helpers/form_elements/dropdown_with_values.rb
 - app/helpers/form_elements/geo_code_curacao.rb
 - app/helpers/form_elements/image.rb
@@ -109,7 +110,6 @@ files:
 - app/helpers/form_elements/text_field.rb
 - 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

data/app/models/inline_form.rb

@@ -1,2 +0,0 @@
-class InlineForm < ActiveRecord::Base
-end