inline_forms 0.5.3 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.6.0

data/app/controllers/inline_forms_controller.rb

@@ -117,7 +117,7 @@ class InlineFormsController < ApplicationController
     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_id = @object.send(@field.to_s.singularize + "_ids").index(@sub_id.to_i)
         @associated_record = @object.send(@field)[@associated_record_id]
       end
     end

data/app/helpers/form_elements/associated.rb

@@ -1,5 +1,5 @@
 module InlineFormsHelper
-    InlineForms::MIGRATION_TYPE_CONVERSION_LIST[:associated]=:references
+    InlineForms::SPECIAL_MIGRATION_TYPES[:associated]=:references
   # associated
   def associated_show(object, attribute, values)
     #show a list of records
@@ -7,31 +7,31 @@ 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( @associated_record.title,
+      out << link_to( @associated_record.presentation,
         send('edit_' + @Klass.to_s.underscore + '_path', object,
           :field => attribute,
           :sub_id => @sub_id,
           :form_element => this_method.reverse.sub(/.*_/,'').reverse,
           :values => values,
-          :update => "field_#{attribute.singularize}_#{@sub_id.to_s}" ),
+          :update => "field_#{attribute.to_s.singularize}_#{@sub_id.to_s}" ),
         :method => :get,
         :remote => true )
       out << '</li>'
     else
       # if it's a new record (sub_id == 0) then update the whole <ul> and redraw all list-elements
       out << "<ul class='associated #{attribute}' id='list_#{attribute}_#{object.id.to_s}'>" if @sub_id.nil?
-      if not object.send(attribute.pluralize).empty?
+      if not object.send(attribute.to_s.pluralize).empty?
         # if there are things to show, show them
-        object.send(attribute.pluralize).each do |m|
-          out << "<span id='field_#{attribute.singularize}_#{m.id.to_s}'>"
+        object.send(attribute.to_s.pluralize).each do |m|
+          out << "<span id='field_#{attribute.to_s.singularize}_#{m.id.to_s}'>"
           out << '<li>'
-          out << link_to( m.title, send('edit_' + @Klass.to_s.underscore + '_path',
+          out << link_to( m.presentation, send('edit_' + @Klass.to_s.underscore + '_path',
               object,
               :field => attribute,
               :sub_id => m.id,
               :form_element => this_method.sub(/_[a-z]+$/,''),
               :values => values,
-              :update => "field_#{attribute.singularize}_#{m.id.to_s}" ),
+              :update => "field_#{attribute.to_s.singularize}_#{m.id.to_s}" ),
             :method => :get,
             :remote => true )
           out << '</li>'
@@ -58,13 +58,13 @@ module InlineFormsHelper
     # @sub_id is the id of the associated record
     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_id = object.send(attribute.to_s.singularize + "_ids").index(@sub_id.to_i)
       @associated_record = object.send(attribute)[@associated_record_id]
-      @update_span = "field_#{attribute.singularize}_#{@sub_id.to_s}"
+      @update_span = "field_#{attribute.to_s.singularize}_#{@sub_id.to_s}"
     else
       # but if @sub_id = 0, then we are dealing with a new associated record
       # in that case, we .new a record, and the update_span is the whole <ul>
-      @associated_record = attribute.singularize.capitalize.constantize.new
+      @associated_record = attribute.to_s.singularize.capitalize.constantize.new
       @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
     end
     render :partial => "inline_forms/subform"
@@ -73,9 +73,9 @@ module InlineFormsHelper
     return if object.id.nil?
     if @sub_id.to_i > 0
       # get the existing associated record
-      @associated_record_id = object.send(attribute.singularize + "_ids").index(@sub_id.to_i)
+      @associated_record_id = object.send(attribute.to_s.singularize + "_ids").index(@sub_id.to_i)
       @associated_record = object.send(attribute)[@associated_record_id]
-      @update_span = "field_" + attribute.singularize + '_' + @sub_id.to_s
+      @update_span = "field_" + attribute.to_s.singularize + '_' + @sub_id.to_s
     else
       # create a new associated record
       @associated_record = object.send(attribute.to_sym).new

data/app/helpers/form_elements/check_box.rb

@@ -1,5 +1,5 @@
 module InlineFormsHelper
-    InlineForms::MIGRATION_TYPE_CONVERSION_LIST[:check_box]=:boolean
+    InlineForms::SPECIAL_MIGRATION_TYPES[:check_box]=:boolean
   # boolean, bit unaptly named check_box
   def check_box_show(object, attribute, values)
     values ||= { 'false' => 'no', 'true' => 'yes' }

data/app/helpers/form_elements/checklist.rb

@@ -1,5 +1,5 @@
 module InlineFormsHelper
-    InlineForms::MIGRATION_TYPE_CONVERSION_LIST[:checklist]=:references
+    InlineForms::SPECIAL_MIGRATION_TYPES[:checklist]=:references
   # checklist
   def checklist_show(object, attribute, values)
     out = '<ul class="checklist">'

data/app/helpers/form_elements/date.rb

@@ -1,5 +1,5 @@
 module InlineFormsHelper
-    InlineForms::MIGRATION_TYPE_CONVERSION_LIST[:date_select]=:date
+    InlineForms::SPECIAL_MIGRATION_TYPES[:date_select]=:date
 
   # date
   def date_show(object, attribute, values)

data/app/helpers/form_elements/dropdown.rb

@@ -1,5 +1,5 @@
 module InlineFormsHelper
-  InlineForms::MIGRATION_TYPE_CONVERSION_LIST[:dropdown]=:integer
+  InlineForms::SPECIAL_MIGRATION_TYPES[:dropdown]=:integer
   # dropdown
   def dropdown_show(object, attribute, values)
     attribute_value = object.send(attribute).presentation rescue  nil

data/app/helpers/form_elements/dropdown_with_values.rb

@@ -1,5 +1,5 @@
 module InlineFormsHelper
-    InlineForms::MIGRATION_TYPE_CONVERSION_LIST[:dropdown_with_values]=:integer
+    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

data/app/helpers/form_elements/geo_code_curacao.rb

@@ -1,5 +1,5 @@
 module InlineFormsHelper
-    InlineForms::MIGRATION_TYPE_CONVERSION_LIST[:geo_code_curacao]=:string
+    InlineForms::SPECIAL_MIGRATION_TYPES[:geo_code_curacao]=:string
   # geo_code_curacao
   def geo_code_curacao_show(object, attribute, values)
     attribute_value = object.send(attribute).presentation rescue nil

data/app/helpers/form_elements/range.rb

@@ -1,5 +1,5 @@
 module InlineFormsHelper
-    InlineForms::MIGRATION_TYPE_CONVERSION_LIST[:range]=:integer
+    InlineForms::SPECIAL_MIGRATION_TYPES[:range]=:integer
   # range
   def range_show(object, attribute, values)
     link_to_inline_edit object, attribute, object.send(attribute), nil

data/app/helpers/form_elements/text_area.rb

@@ -1,5 +1,5 @@
 module InlineFormsHelper
-    InlineForms::MIGRATION_TYPE_CONVERSION_LIST[:text_area]=:text
+    InlineForms::SPECIAL_MIGRATION_TYPES[:text_area]=:text
   # text_area
   def text_area_show(object, attribute, values)
     link_to_inline_edit object, attribute, object.send(attribute), nil

data/app/helpers/form_elements/text_field.rb

@@ -1,5 +1,5 @@
 module InlineFormsHelper
-  InlineForms::MIGRATION_TYPE_CONVERSION_LIST[:text_field]=:string
+  InlineForms::SPECIAL_MIGRATION_TYPES[:text_field]=:string
   # text
   def text_field_show(object, attribute, values)
     link_to_inline_edit object, attribute, object.send(attribute), nil

data/app/helpers/inline_forms_helper.rb

@@ -74,7 +74,7 @@ module InlineFormsHelper
     t = ''
     objects.each do |object|
       t += content_tag tag do
-        inline_form 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_field' ]
       end
     end
     return raw(t)

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

@@ -1,5 +1,5 @@
 <% 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}",
+  #|| @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,
   :form_element => @form_element,
   :values => @values,

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.5.3"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-02-08}
+  s.date = %q{2011-02-10}
   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 = [
@@ -47,9 +47,9 @@ Gem::Specification.new do |s|
     "inline_forms.gemspec",
     "lib/generators/inline_forms/USAGE",
     "lib/generators/inline_forms/inline_forms_generator.rb",
-    "lib/generators/inline_forms/templates/controller.rb",
-    "lib/generators/inline_forms/templates/migration.rb",
-    "lib/generators/inline_forms/templates/model.rb",
+    "lib/generators/inline_forms/templates/controller.erb",
+    "lib/generators/inline_forms/templates/migration.erb",
+    "lib/generators/inline_forms/templates/model.erb",
     "lib/inline_forms.rb",
     "test/helper.rb",
     "test/test_inline_forms.rb"

data/lib/generators/inline_forms/inline_forms_generator.rb

@@ -2,44 +2,56 @@ module InlineForms
   class InlineFormsGenerator < Rails::Generators::NamedBase
 
     Rails::Generators::GeneratedAttribute.class_eval do
+      # attributes are in the form name:type (f.i. price:integer)
+      # we want to extend the types to our list of types
+      # but some of the old types are still needed
+      # f.i. price:integer turns into a text_field
+      #
       def migration_type
-        # convert our form_elements to real types for migration
+        # convert any type into a migration type
         # each helper adds to this list
         # be aware that the standard list overwrites the customized list if we merge like this!
-        MIGRATION_TYPE_CONVERSION_LIST.merge(STANDARD_MIGRATION_COLUMN_TYPES)[type] || :unknown
+        SPECIAL_MIGRATION_TYPES.merge(DEFAULT_MIGRATION_TYPES).merge(RELATION_TYPES).merge(SPECIAL_RELATION_TYPES)[type] || :unknown
       end
 
       def field_type
         # convert standard types to one of ours
-        if MIGRATION_TYPE_CONVERSION_LIST.has_key?(type)
-          then type
-        else
-          case type
-          when :integer, :float, :decimal then :text_field
-          when :time                      then :time_select
-          when :datetime, :timestamp      then :datetime_select
-          when :date                      then :date_select
-          when :text                      then :text_area
-          when :boolean                   then :check_box
-          else
-            :unknown
-          end
-        end
+        SPECIAL_MIGRATION_TYPES.merge(RELATION_TYPES).merge(SPECIAL_RELATION_TYPES).has_key?(type) ? type : DEFAULT_FIELD_TYPES[type] || :unknown
       end
 
-    end
+      def migration_name
+        # convert some to _id
+        ( relation? || field_type == :dropdown) ? name + '_id' : name
+      end
+
+      def belongs_to?
+        relation? || field_type == :dropdown
+      end
+      
+      def has_many?
+        field_type == :associated
+      end
 
+      def relation?
+        RELATION_TYPES.has_key?(field_type)
+      end
+
+      def special_relation?
+        SPECIAL_RELATION_TYPES.has_key?(field_type)
+      end
+
+    end
     argument :attributes, :type => :array,  :banner => "[name:form_element]..."
 
     source_root File.expand_path('../templates', __FILE__)
 
     def generate_model
       #copy_file "stylesheet.css", "public/stylesheets/#{file_name}.css"
-      template "model.rb", "app/models/#{model_file_name}.rb"
+      template "model.erb", "app/models/#{model_file_name}.rb"
     end
 
     def generate_controller
-      template "controller.rb", "app/controllers/#{controller_file_name}.rb"
+      template "controller.erb", "app/controllers/#{controller_file_name}.rb"
     end
 
     def generate_route
@@ -47,7 +59,7 @@ module InlineForms
     end
 
     def generate_migration
-      template "migration.rb", "db/migrate/#{time_stamp}_inline_forms_create_#{table_name}.rb"
+      template "migration.erb", "db/migrate/#{time_stamp}_inline_forms_create_#{table_name}.rb"
     end
 
     private

data/lib/generators/inline_forms/templates/{migration.rb → migration.erb}

@@ -2,7 +2,8 @@ class InlineFormsCreate<%= table_name.camelize %> < ActiveRecord::Migration
   def self.up
     create_table :<%= table_name %> do |t|
   <% for attribute in attributes -%>
-      t.<%= attribute.migration_type %> :<%= attribute.name %>
+<%= '#' if attribute.migration_type == :unknown || attribute.special_relation? -%>
+      t.<%= attribute.migration_type %> :<%= attribute.migration_name %>
   <% end -%>
       t.timestamps
     end

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

@@ -0,0 +1,22 @@
+class <%= name %> < ActiveRecord::Base
+
+<% for attribute in attributes -%>
+  <%= 'belongs_to :' + attribute.name if attribute.belongs_to? %>
+<% end %>
+<% for attribute in attributes -%>
+  <%= 'has_many :' + attribute.name if attribute.has_many? %>
+<% end %>
+
+  def presentation
+    'please define presentation!'
+  end
+
+  def inline_forms_field_list
+    [
+  <% for attribute in attributes -%>
+<%= '#'  if attribute.relation? -%>
+    <%= '[ :' + attribute.name + ', "' + attribute.name + '", :' + attribute.field_type.to_s + ' ], ' %>
+  <% end -%>
+  ]
+  end
+end

data/lib/inline_forms.rb

@@ -1,8 +1,8 @@
 puts 'loading inline_forms...'
 
 module InlineForms
-  # put the standard types in the list. new form_elements in app/helpers/form_elelemnts add to this.
-  STANDARD_MIGRATION_COLUMN_TYPES = {
+  # convert type to migration_type
+  DEFAULT_MIGRATION_TYPES = {
     :string => :string,
     :text => :text,
     :integer => :integer,
@@ -15,7 +15,30 @@ module InlineForms
     :binary => :binary,
     :boolean => :boolean,
   }
-  MIGRATION_TYPE_CONVERSION_LIST = {}
+  # convert type to field_type
+  DEFAULT_FIELD_TYPES = {
+    :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,
+
+  }
+  # define this so the helpers can add to it
+  SPECIAL_MIGRATION_TYPES = {}
+  # experimental
+  RELATION_TYPES = {
+    :belongs_to => :integer,
+  }
+  SPECIAL_RELATION_TYPES = {
+    :associated => :associated,
+  }
   
   class InlineFormsEngine < Rails::Engine
     initializer 'inline_forms.helper' do |app|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -04:00
+date: 2011-02-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,9 +118,9 @@ files:
 - inline_forms.gemspec
 - lib/generators/inline_forms/USAGE
 - lib/generators/inline_forms/inline_forms_generator.rb
-- lib/generators/inline_forms/templates/controller.rb
-- lib/generators/inline_forms/templates/migration.rb
-- lib/generators/inline_forms/templates/model.rb
+- lib/generators/inline_forms/templates/controller.erb
+- lib/generators/inline_forms/templates/migration.erb
+- lib/generators/inline_forms/templates/model.erb
 - lib/inline_forms.rb
 - test/helper.rb
 - test/test_inline_forms.rb

data/lib/generators/inline_forms/templates/model.rb

@@ -1,14 +0,0 @@
-class <%= name %> < ActiveRecord::Base
-
-  def presentation
-    #define your presentation here
-  end
-
-  def inline_forms_field_list
-  [
-  <% for attribute in attributes %>
-     [ :<%= attribute.migration_type %>, '<%= attribute.name %>', :<%= attribute.field_type %> ],
-  <% end %>
-  ]
-end
-end