inline_forms 0.7.3 → 0.7.4

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/app/helpers/form_elements/scale_with_integers.rb

@@ -0,0 +1,26 @@
+module InlineFormsHelper
+    InlineForms::SPECIAL_COLUMN_TYPES[:scale_with_integers]=:integer
+  # scale_with_integers generates a sacle
+  # with the given list of integers as options
+  #
+  # values must be a Range or a one-dimensional array of Integers
+  def scale_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 scale_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 scale_with_integers_update(object, attribute, values)
+    object[attribute.to_sym] = params[('_' + object.class.to_s.downcase).to_sym][attribute.to_sym]
+  end
+end
+

data/inline_forms.gemspec

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

@@ -29,7 +29,7 @@ module InlineForms
       # typo in the generator command line or you need to add a Form Element!
       #
       def column_type
-        SPECIAL_COLUMN_TYPES.merge(DEFAULT_COLUMN_TYPES).merge(RELATIONS)[type] || :unknown
+        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.
@@ -39,17 +39,17 @@ module InlineForms
       # will be :unknown. Make sure to check your models for the :unknown.
       #
       def field_type
-        SPECIAL_COLUMN_TYPES.merge(RELATIONS).has_key?(type) ? type : DEFAULT_COLUMN_TYPES[type] || :unknown
+        SPECIAL_COLUMN_TYPES.merge(RELATIONS).has_key?(type) ? type : DEFAULT_FORM_ELEMENTS[type] || :unknown
       end
       
-      def relation?
-        RELATIONS.has_key?(type) || special_relation?
-      end
-
       def special_relation?
         SPECIAL_RELATIONS.has_key?(type)
       end
 
+      def relation?
+        RELATIONS.has_key?(type) || special_relation?
+      end
+
       def has_many?
         field_type == :associated
       end
@@ -65,20 +65,29 @@ module InlineForms
     end
 
     def generate_model
-      @belongs_to         = "\n"
-      @has_many           = "\n"
-      @has_attached_files = "\n"
-      @presentation       = "\n"
-      @inline_forms_field_list = String.new
+      @belongs_to               = "\n"
+      @has_many                 = "\n"
+      @has_one                  = "\n"
+      @habtm                    = "\n"
+      @has_attached_files       = "\n"
+      @presentation             = "\n"
+      @inline_forms_field_list  = String.new
 
       for attribute in attributes
-        if attribute.column_type == :belongs_to || attribute.type == :belongs_to
-          @belongs_to << '  belongs_to :' + attribute.name + "\n"
+        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"
+        end
+        if attribute.type         == :has_one
+          @has_one << '  has_one :'               + attribute.name + "\n"
         end
-        if attribute.type == :has_many
-          @has_many << '  has_many :' + attribute.name + "\n"
+        if attribute.type         == :habtm ||
+           attribute.type         == :has_and_belongs_to_many
+          @habtm << '  has_and_belongs_to_many :' + attribute.name + "\n"
         end
-        if attribute.type == :image
+        if attribute.type         == :image
           @has_attached_files << "  has_attached_file :#{attribute.name},
                :styles => { :medium => \"300x300>\", :thumb => \"100x100>\" }\n"
         end

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

@@ -1,7 +1,9 @@
 class <%= name %> < ActiveRecord::Base
 <%= @belongs_to if @belongs_to.length > 1 -%>
-<%= @has_many if @belongs_to.length > 1 -%>
-<%= @has_attached_files if @belongs_to.length > 1 -%>
-<%= @presentation  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 -%>
 end

data/lib/inline_forms.rb

@@ -81,23 +81,42 @@ module InlineForms
   # to the migration. (In fact AR will add t.integer :country_id). And
   # it will add
   #   [ :country, "country", :dropdown ],
-  # to the model.
+  # to the inline_forms_field_list in the model.
   #
   SPECIAL_COLUMN_TYPES = {}
-  # experimental
+  # 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 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 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)
+  #
+  # 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
+  #
   RELATIONS = {
     :belongs_to => :belongs_to,
     :references => :belongs_to,
   }
-  # experimental
+  # The stuff in this hash will add a line to the model, but little else.
   SPECIAL_RELATIONS = {
-    :has_many   => :has_many,
-    :associated => :associated,
+    :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_and_belongs_to_many :clients
-#	def <=>(other)
-#		self.name <=> other.name
-#  end
 
   # Declare as a Rails::Engine, see http://www.ruby-forum.com/topic/211017#927932
   class InlineFormsEngine < Rails::Engine

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -04:00
+date: 2011-03-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - 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/text_area.rb
 - app/helpers/form_elements/text_field.rb
 - app/helpers/inline_forms_helper.rb