RubyGems - inline_forms - Versions diffs - 0.7.4 → 0.8.0 - Mend

inline_forms 0.7.4 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

data/README.rdoc +12 -1
data/VERSION +1 -1
data/app/controllers/inline_forms_controller.rb +19 -24
data/app/helpers/form_elements/associated.rb +87 -85
data/app/helpers/form_elements/check_box.rb +13 -14
data/app/helpers/form_elements/checklist.rb +32 -31
data/app/helpers/form_elements/date.rb +18 -18
data/app/helpers/form_elements/dropdown.rb +17 -16
data/app/helpers/form_elements/dropdown_with_integers.rb +18 -24
data/app/helpers/form_elements/dropdown_with_values.rb +14 -21
data/app/helpers/form_elements/geo_code_curacao.rb +14 -15
data/app/helpers/form_elements/image.rb +13 -12
data/app/helpers/form_elements/scale_with_integers.rb +20 -24
data/app/helpers/form_elements/scale_with_values.rb +21 -0
data/app/helpers/form_elements/text_area.rb +12 -12
data/app/helpers/form_elements/text_field.rb +12 -12
data/app/helpers/inline_forms_helper.rb +80 -44
data/app/views/inline_forms/_edit.html.erb +5 -8
data/app/views/inline_forms/_index.html.erb +5 -4
data/app/views/inline_forms/_new.html.erb +3 -3
data/app/views/inline_forms/_subform.html.erb +1 -1
data/app/views/inline_forms/index.html.erb +4 -3
data/app/views/layouts/inline_forms.rhtml +1 -1
data/inline_forms.gemspec +3 -3
data/lib/generators/inline_forms/inline_forms_generator.rb +16 -16
data/lib/generators/inline_forms/templates/model.erb +5 -1
data/lib/inline_forms.rb +43 -38
metadata +6 -6
data/app/helpers/form_elements/range.rb +0 -15

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

@@ -1,20 +1,17 @@
 <% form_tag send(@Klass.to_s.underscore + '_path', :update => @update_span ,
-  #|| @form_element == "associated" ? @sub_id && @sub_id.to_i > 0 ? "field_#{@field.to_s.singularize}_#{@sub_id}" : "list_#{@field}_#{@object.id.to_s}" : "field_#{@field}_#{@object.id.to_s}",
-  :field => @field,
+  :attribute => @attribute,
   :form_element => @form_element,
-  :values => @values,
   :sub_id => @sub_id ),
   :method => :put, # this is going to the update method!
-:multipart => true,
+  :multipart => true,
   :class  => "edit_form",
   :remote => true do -%>
   <div class="edit_form_field">
-    <%= send("#{@form_element.to_s}_edit", @object, @field, @values) %>
+    <%= send("#{@form_element.to_s}_edit", @object, @attribute) %>
   </div>
-  <%= link_to( send( @Klass.to_s.underscore + '_path', :update => @update_span || "field_#{@field}_#{@object.id.to_s}",
-      :field => @field,
+  <%= link_to( send( @Klass.to_s.underscore + '_path', :update => @update_span || "field_#{@attribute}_#{@object.id.to_s}",
+      :attribute => @attribute,
       :form_element => @form_element,
-      :values => @values,
       :sub_id => @sub_id ),
     :method => :get, # this is going to the show method!
     :class  => "edit_form_cancel",

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

@@ -1,5 +1,6 @@
-<li class="inline_form_new_item">
-  <%= inline_form_new_record @field, @form_element  %>
+<li class="inline_forms_new_record">
+  <%= inline_forms_new_record_link %>
 </li>
-<%= inline_form_display_list(@objects) %>
-<%#= will_paginate @objects %>
+<%= inline_forms_list(@objects) %>
+<%= will_paginate @objects %>
+<%= page_entries_info @objects %>

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

@@ -1,9 +1,9 @@
-<% form_tag  send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span || 'inline_form_list' ),
+<% form_tag  send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span || 'inline_forms_list' ),
   :multipart => true, :remote => true, :class  => "edit_form"  do -%>
   <div class="edit_form_field">
-    <%= inline_form_display_new(@object, @object.respond_to?(:inline_forms_field_list) ? @object.inline_forms_field_list : [ :name, 'name', :text ] ) %>
+    <%= inline_forms_new_record @object %>
   </div>
-  <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path',:update => @update_span || 'inline_form_list'), :remote => true,
+  <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path',:update => @update_span || 'inline_forms_list'), :remote => true,
     :class  => "edit_form_cancel" ) do  %>
     <input type="button" name="cancel" value="cancel" />
 <% end %>

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

@@ -1,5 +1,5 @@
 <table cellpadding="0" cellspacing="0" class="subform">
-  <% @associated_record.inline_forms_field_list.each do | @subform_field, @subform_description, @subform_element, @values | %>
+  <% @associated_record.inline_forms_field_list.each do | @subform_field, (@subform_description, @subform_element, @values)  | %>
     <tr>
       <td valign="top">
         <div class="subform_field-name">

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

@@ -1,5 +1,6 @@
-<li class="inline_form_new_item">
-  <%= inline_form_new_record @field, @form_element  %>
+<li class="inline_forms_new_record_link">
+  <%= inline_forms_new_record_link %>
 </li>
-<%= inline_form_display_list(@objects) %>
+<%= inline_forms_list(@objects) %>
 <%= will_paginate @objects %>
+<%= page_entries_info @objects %>

data/app/views/layouts/inline_forms.rhtml CHANGED Viewed

@@ -11,7 +11,7 @@
 <%#= calendar_date_select_includes "red" %>
   <body>
  <%= render "/inline_forms_tabs" %>
-    <ul id="inline_form_list">
+    <ul id="inline_forms_list">
       <%= yield %>
     </ul>
   </body>

data/inline_forms.gemspec CHANGED Viewed

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.7.4"
+  s.version = "0.8.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-03-09}
+  s.date = %q{2011-03-13}
   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 = [
@@ -34,8 +34,8 @@ Gem::Specification.new do |s|
     "app/helpers/form_elements/dropdown_with_values.rb",
     "app/helpers/form_elements/geo_code_curacao.rb",
     "app/helpers/form_elements/image.rb",
-    "app/helpers/form_elements/range.rb",
     "app/helpers/form_elements/scale_with_integers.rb",
+    "app/helpers/form_elements/scale_with_values.rb",
     "app/helpers/form_elements/text_area.rb",
     "app/helpers/form_elements/text_field.rb",
     "app/helpers/inline_forms_helper.rb",

data/lib/generators/inline_forms/inline_forms_generator.rb CHANGED Viewed

@@ -11,8 +11,8 @@ module InlineForms
   #  rails g example_generator Modelname attribute:type attribute:type ...
   # an array with attributes and types is created for use in the generator.
   #
-  # Rails::Generators::GeneratedAttribute creates, among others, a field_type.
-  # This field_type maps column types to form field helpers like text_field.
+  # Rails::Generators::GeneratedAttribute creates, among others, a attribute_type.
+  # This attribute_type maps column types to form attribute helpers like text_field.
   # We override it here to make our own.
   #
   class InlineFormsGenerator < Rails::Generators::NamedBase
@@ -32,13 +32,13 @@ module InlineForms
         SPECIAL_COLUMN_TYPES.merge(DEFAULT_COLUMN_TYPES).merge(RELATIONS).merge(SPECIAL_RELATIONS)[type] || :unknown
       end
-      # Override the field_type to include our special column types.
+      # Override the attribute_type to include our special column types.
       #
       # If a type is not in the Special Column Type hash, then the default
-      # column type hash is used, and if that fails, the field_type
+      # column type hash is used, and if that fails, the attribute_type
       # will be :unknown. Make sure to check your models for the :unknown.
       #
-      def field_type
+      def attribute_type
         SPECIAL_COLUMN_TYPES.merge(RELATIONS).has_key?(type) ? type : DEFAULT_FORM_ELEMENTS[type] || :unknown
       end
@@ -51,7 +51,7 @@ module InlineForms
       end
       def has_many?
-        field_type == :associated
+        attribute_type == :associated
       end
@@ -71,7 +71,7 @@ module InlineForms
       @habtm                    = "\n"
       @has_attached_files       = "\n"
       @presentation             = "\n"
-      @inline_forms_field_list  = String.new
+      @inline_forms_attribute_list  = String.new
       for attribute in attributes
         if attribute.column_type  == :belongs_to # :drop_down, :references and :belongs_to all end up with the column_type :belongs_to
@@ -98,20 +98,20 @@ module InlineForms
                             "\n"
         end
         unless attribute.name == '_presentation' || attribute.relation?
-          attribute.field_type == :unknown ? commenter = '#' : commenter = ' '
-          @inline_forms_field_list << commenter +
+          attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '
+          @inline_forms_attribute_list << commenter +
                                       '     [ :' +
                                       attribute.name +
-                                      ', "' + attribute.name +
-                                      '", :' + attribute.field_type.to_s +
+                                      ' , "' + attribute.name +
+                                      '", :' + attribute.attribute_type.to_s +
                                       " ], \n"
         end
       end
-      unless @inline_forms_field_list.empty?
-        @inline_forms_field_list =  "\n" +
-                                    "  def inline_forms_field_list\n" +
+      unless @inline_forms_attribute_list.empty?
+        @inline_forms_attribute_list =  "\n" +
+                                    "  def inline_forms_attribute_list\n" +
                                     "    [\n" +
-                                    @inline_forms_field_list +
+                                    @inline_forms_attribute_list +
                                     "    ]\n" +
                                     "  end\n" +
                                     "\n"
@@ -138,7 +138,7 @@ module InlineForms
           @columns << '        t.datetime  :' + attribute.name + "_updated_at\n"
         else
           unless attribute.name == '_presentation' || attribute.special_relation?
-            attribute.field_type == :unknown ? commenter = '#' : commenter = ' '
+            attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '
             @columns << commenter +
                         '     t.' +
                         attribute.column_type.to_s +

data/lib/generators/inline_forms/templates/model.erb CHANGED Viewed

@@ -1,9 +1,13 @@
 class <%= name %> < ActiveRecord::Base
+  cattr_reader :per_page
+  @@per_page = 10
 <%= @belongs_to if @belongs_to.length > 1 -%>
 <%= @has_many if @has_many.length > 1 -%>
 <%= @has_one if @has_one.length > 1 -%>
 <%= @habtm if @habtm.length > 1 -%>
 <%= @has_attached_files if @has_attached_files.length > 1 -%>
 <%= @presentation  if @presentation.length > 1 -%>
-<%= @inline_forms_field_list -%>
+<%= @inline_forms_attribute_list -%>
 end

data/lib/inline_forms.rb CHANGED Viewed

@@ -1,8 +1,9 @@
 puts 'loading inline_forms...'
 module InlineForms
   # ActiveRecord::Migration comes with a set of column types.
-  # They are listed here so they can be uses alongside our Special Column Types.
+  # They are listed here so they can be used alongside our Special Column Types.
   #
   # These types will override the Special Column Types, so don't declare
   # types with these names as Special Column Types!
@@ -13,7 +14,7 @@ module InlineForms
   #   class InlineFormsCreateExamples < ActiveRecord::Migration
   #     def self.up
   #       create_table :examples do |t|
-  #         t.string :name
+  #         t.string  :name
   #         t.integer :price
   #         t.timestamps
   #       end
@@ -24,20 +25,21 @@ module InlineForms
   #   end
   #
   DEFAULT_COLUMN_TYPES = {
-    :string => :string,
-    :text => :text,
-    :integer => :integer,
-    :float => :float,
-    :decimal => :decimal,
-    :datetime => :datetime,
-    :timestamp => :timestamp,
-    :time => :time,
-    :date => :date,
-    :binary => :binary,
-    :boolean => :boolean,
-#    :references => :belongs_to,
-#    :belongs_to => :belongs_to,
+    :string     => :string,
+    :text       => :text,
+    :integer    => :integer,
+    :float      => :float,
+    :decimal    => :decimal,
+    :datetime   => :datetime,
+    :timestamp  => :timestamp,
+    :time       => :time,
+    :date       => :date,
+    :binary     => :binary,
+    :boolean    => :boolean,
+  # :references => :belongs_to,
+  # :belongs_to => :belongs_to,
   }
   # For each Default Column Type, we need to specify a Form Element for use in form creation.
   #
   # Example:
@@ -45,28 +47,29 @@ module InlineForms
   # will result in the following model:
   #
   #    class Example < ActiveRecord::Base
-  #      def inline_forms_field_list
-  #        [
-  #          [ :name, "name", :text_field ],
-  #          [ :price, "price", :text_field ],
-  #        ]
+  #      def inline_forms_attribute_list
+  #        {
+  #          :name  => [ "name", :text_field ],
+  #          :price => [ "price", :text_field ],
+  #        }
   #      end
   #    end
   # as you see, both :string and :integer are mapped to a :text_field
   #
   DEFAULT_FORM_ELEMENTS = {
-    :string => :text_field,
-    :text => :text_area,
-    :integer => :text_field,
-    :float => :text_field,
-    :decimal => :text_field,
-    :datetime => :datetime_select,
-    :timestamp => :datetime_select,
-    :time => :time_select,
-    :date => :date_select,
-    :binary => :text_field,
-    :boolean => :check_box,
+    :string     => :text_field,
+    :text       => :text_area,
+    :integer    => :text_field,
+    :float      => :text_field,
+    :decimal    => :text_field,
+    :datetime   => :datetime_select,
+    :timestamp  => :datetime_select,
+    :time       => :time_select,
+    :date       => :date_select,
+    :binary     => :text_field,
+    :boolean    => :check_box,
   }
   # This Hash will be used to map our Special Column Types to
   # ActiveRecord::Migration Column Types.
   #
@@ -80,35 +83,37 @@ module InlineForms
   #   t.belongs_to :country
   # to the migration. (In fact AR will add t.integer :country_id). And
   # it will add
-  #   [ :country, "country", :dropdown ],
-  # to the inline_forms_field_list in the model.
+  #   :country => [ "country", :dropdown ],
+  # to the inline_forms_attribute_list in the model.
   #
   SPECIAL_COLUMN_TYPES = {}
   # 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?
-  # * Let's say we have a customer that has_many numbers.
-  # * Let's say that a number belongs_to a customer.
+  # * Let's say we have a customer that has_many phone_numbers.
+  # * Let's say that a phone_number belongs_to a customer.
   # * Let's say that every number has_one type_of_number (like 'private','gsm' etc.)
   # * Let's say a type_of_number belongs_to a number.
   #
   # Wait a minute... thats sounds right... but it ain't!
   #
-  # In fact, a type_of_number has_many numbers and a number belongs_to a type_of_number!
+  # In fact, a type_of_number has_many phone_numbers and a phone_number belongs_to a type_of_number!
   #
   # In a form, it's quite logical to use a dropdown for type_of_number. So, in the generator, use
   #  type_of_number:dropdown
   # This creates the correct migration (t.integer :type_of_number_id) and the correct model.
-  # (It adds 'belongs_to :type_of_number' and adds a dropdown in the inline_forms_field_list)
+  # (It adds 'belongs_to :type_of_number' and adds a dropdown in the inline_forms_attribute_list)
   #
   # But, you also want to have a client_id in the migration, and a 'belongs_to :client' in the model.
   # In such cases, you need to use :belongs_to, like this:
-  #  rails g inline_forms Example number:string type_of_number:dropdown client:belongs_to
+  #  rails g inline_forms Example phone_number:string type_of_number:dropdown client:belongs_to
   #
   RELATIONS = {
     :belongs_to => :belongs_to,
     :references => :belongs_to,
   }
   # The stuff in this hash will add a line to the model, but little else.
   SPECIAL_RELATIONS = {
     :has_many                 => :has_many,

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  hash: 11
+  hash: 63
   prerelease: false
   segments:
   - 0
-  - 7
-  - 4
-  version: 0.7.4
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-03-09 00:00:00 -04:00
+date: 2011-03-13 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -105,8 +105,8 @@ files:
 - app/helpers/form_elements/dropdown_with_values.rb
 - app/helpers/form_elements/geo_code_curacao.rb
 - app/helpers/form_elements/image.rb
-- app/helpers/form_elements/range.rb
 - app/helpers/form_elements/scale_with_integers.rb
+- app/helpers/form_elements/scale_with_values.rb
 - app/helpers/form_elements/text_area.rb
 - app/helpers/form_elements/text_field.rb
 - app/helpers/inline_forms_helper.rb

data/app/helpers/form_elements/range.rb DELETED Viewed

@@ -1,15 +0,0 @@
-module InlineFormsHelper
-    InlineForms::SPECIAL_COLUMN_TYPES[:range]=:integer
-  # range
-  def range_show(object, attribute, values)
-    link_to_inline_edit object, attribute, object.send(attribute), nil
-  end
-  def range_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!
-    collection_select( ('_' + object.class.to_s.downcase).to_sym, attribute.to_sym, values, 'to_i', 'to_s', :selected => object.send(attribute))
-  end
-  def range_update(object, attribute, values)
-    object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
-  end
-end