inline_forms 0.8.0 → 0.8.1

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/app/helpers/form_elements/{checklist.rb → check_list.rb}

@@ -1,36 +1,38 @@
-InlineForms::SPECIAL_COLUMN_TYPES[:checklist]=:references
+InlineForms::SPECIAL_COLUMN_TYPES[:check_list]=:no_migration
 
 # checklist
-def checklist_show(object, attribute)
+def check_list_show(object, attribute)
   out = '<ul class="checklist">'
   out << link_to_inline_edit(object, attribute) if object.send(attribute).empty?
   object.send(attribute).sort.each do | item |
     out << '<li>'
-    out << link_to_inline_edit(object, attribute, item.title)
+    out << link_to_inline_edit(object, attribute, item._presentation )
     out << '</li>'
   end
   out <<  '</ul>'
+  out.html_safe
 end
 
-def checklist_edit(object, attribute)
+def check_list_edit(object, attribute)
   object.send(attribute).build  if object.send(attribute).empty?
   values = object.send(attribute).first.class.name.constantize.find(:all) # TODO bring order
   out = '<div class="edit_form_checklist">'
   out << '<ul>'
   values.each do | item |
     out << '<li>'
-    out << check_box_tag( attribute + '[' + item.id.to_s + ']', 'yes', object.send(attribute.singularize + "_ids").include?(item.id) )
+    out << check_box_tag( attribute + '[' + item.id.to_s + ']', 1, object.send(attribute.singularize + "_ids").include?(item.id) )
     out << '<div class="edit_form_checklist_text">'
-    out << h(item.title)
+    out << h(item._presentation)
     out << '</div>'
     out << '<div style="clear: both;"></div>'
     out << '</li>'
   end
   out << '</ul>'
   out << '</div>'
+  out.html_safe
 end
 
-def checklist_update(object, attribute)
+def check_list_update(object, attribute)
   params[attribute] ||= {}
   object.send(attribute.singularize + '_ids=', params[attribute].keys)
 end

data/app/helpers/inline_forms_helper.rb

@@ -88,11 +88,11 @@ module InlineFormsHelper
   private
 
   # link_to_inline_edit
-  def link_to_inline_edit(object, attribute, attribute_value)
+  def link_to_inline_edit(object, attribute, attribute_value='')
     attribute_value = h(attribute_value)
     spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
     attribute_value << "&nbsp;".html_safe * spaces
-    link_to raw(attribute_value), 
+    link_to attribute_value,
             send( 'edit_' + @Klass.to_s.underscore + '_path',
                   object,
                   :attribute => attribute.to_s,

data/inline_forms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     "app/controllers/inline_forms_controller.rb",
     "app/helpers/form_elements/associated.rb",
     "app/helpers/form_elements/check_box.rb",
-    "app/helpers/form_elements/checklist.rb",
+    "app/helpers/form_elements/check_list.rb",
     "app/helpers/form_elements/date.rb",
     "app/helpers/form_elements/dropdown.rb",
     "app/helpers/form_elements/dropdown_with_integers.rb",

data/lib/generators/inline_forms/inline_forms_generator.rb

@@ -50,8 +50,17 @@ module InlineForms
         RELATIONS.has_key?(type) || special_relation?
       end
 
-      def has_many?
-        attribute_type == :associated
+      def migration?
+        not ( relation? ||
+              column_type == :no_migration ||
+              name == "_presentation" ||
+              name == "_order" )
+      end
+
+      def attribute?
+        not ( name == '_presentation' ||
+              name == '_order' ||
+              relation? )
       end
 
 
@@ -71,20 +80,25 @@ module InlineForms
       @habtm                    = "\n"
       @has_attached_files       = "\n"
       @presentation             = "\n"
+      @order                    = "\n"
       @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
           @belongs_to << '  belongs_to :'         + attribute.name + "\n"
         end
-        if attribute.type         == :has_many
-          @has_many << '  has_many :'             + attribute.name + "\n"
+        if attribute.type         == :has_many ||
+           attribute.type         == :has_many_destroy
+          @has_many << '  has_many :'             + attribute.name
+          @has_many << ', :dependent => :destroy' if attribute.type == :has_many_destroy
+          @has_many << "\n"
         end
         if attribute.type         == :has_one
           @has_one << '  has_one :'               + attribute.name + "\n"
         end
         if attribute.type         == :habtm ||
-           attribute.type         == :has_and_belongs_to_many
+           attribute.type         == :has_and_belongs_to_many ||
+           attribute.type         == :check_list
           @habtm << '  has_and_belongs_to_many :' + attribute.name + "\n"
         end
         if attribute.type         == :image
@@ -97,7 +111,13 @@ module InlineForms
                             "  end\n" +
                             "\n"
         end
-        unless attribute.name == '_presentation' || attribute.relation?
+        if attribute.name == '_order'
+          @order <<  "  def <=>(other)\n" +
+                            "    self.#{attribute.type} <=> other.#{attribute.type}\n" +
+                            "  end\n" +
+                            "\n"
+        end
+        if attribute.attribute?
           attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '
           @inline_forms_attribute_list << commenter +
                                       '     [ :' +
@@ -137,7 +157,7 @@ module InlineForms
           @columns << '        t.integer   :' + attribute.name + "_file_size\n"
           @columns << '        t.datetime  :' + attribute.name + "_updated_at\n"
         else
-          unless attribute.name == '_presentation' || attribute.special_relation?
+          if attribute.migration?
             attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '
             @columns << commenter +
                         '     t.' +

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

@@ -9,5 +9,6 @@ class <%= name %> < ActiveRecord::Base
 <%= @has_attached_files if @has_attached_files.length > 1 -%>
 <%= @presentation  if @presentation.length > 1 -%>
 <%= @inline_forms_attribute_list -%>
+<%= @order  if @order.length > 1 -%>
 
 end

data/lib/inline_forms.rb

@@ -116,11 +116,11 @@ module InlineForms
 
   # The stuff in this hash will add a line to the model, but little else.
   SPECIAL_RELATIONS = {
-    :has_many                 => :has_many,
-    :has_one                  => :has_one,
-    :has_and_belongs_to_many  => :has_and_belongs_to_many,
-    :habtm                    => :has_and_belongs_to_many,
-    :associated               => :associated,
+    :has_many                 => :no_migration,
+    :has_one                  => :no_migration,
+    :has_and_belongs_to_many  => :no_migration,
+    :habtm                    => :no_migration,
+    :habtm_destroy            => :no_migration,
   }
 
   # Declare as a Rails::Engine, see http://www.ruby-forum.com/topic/211017#927932

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Ace Suares
@@ -98,7 +98,7 @@ files:
 - app/controllers/inline_forms_controller.rb
 - app/helpers/form_elements/associated.rb
 - app/helpers/form_elements/check_box.rb
-- app/helpers/form_elements/checklist.rb
+- app/helpers/form_elements/check_list.rb
 - app/helpers/form_elements/date.rb
 - app/helpers/form_elements/dropdown.rb
 - app/helpers/form_elements/dropdown_with_integers.rb