formatted_form 1.0.0 → 1.0.1

data/Rakefile

@@ -5,7 +5,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "formatted_form"
-  gem.homepage = "http://github.com/JackNeto/formatted_form"
+  gem.homepage = "http://github.com/twg/formatted_form"
   gem.license = "MIT"
   gem.summary = "A Rails form builder to simplify you forms"
   gem.description = ''

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/app/views/formatted_form/_check_box.html.haml

@@ -0,0 +1,13 @@
+.form_element{:class => "#{field_name}"}
+
+  .value
+    = field
+    = label_text
+    - if required
+      %span.required *
+
+    - if error_messages.present?
+      != error_messages
+
+    - if description.present?
+      .description= description

data/app/views/formatted_form/_default_field.html.haml

@@ -0,0 +1,15 @@
+.form_element{:class => "#{field_name}"}
+  .label
+    = label_text
+    - if required
+      %span.required *
+
+  .value
+    = before_text
+    = field
+    = after_text
+    - if error_messages.present?
+      = error_messages
+    
+    - if description.present?
+      .description= description

data/app/views/formatted_form/_radio_button.html.haml

@@ -0,0 +1,17 @@
+.form_element{:class => "#{field_name}"}
+  .label
+    = label_text
+    - if required
+      %span.required *
+
+  .value
+    - choices.each do |choice|
+      .option
+        = choice[:field]
+        = choice[:label]
+
+    - if error_messages.present?
+      != error_messages
+
+    - if description.present?
+      .description= description

data/formatted_form.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formatted_form}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Neto"]
-  s.date = %q{2011-01-24}
+  s.date = %q{2011-02-15}
   s.description = %q{}
   s.email = %q{jack@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -21,11 +21,15 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "app/views/formatted_form/_check_box.html.haml",
+    "app/views/formatted_form/_default_field.html.haml",
+    "app/views/formatted_form/_radio_button.html.haml",
     "formatted_form.gemspec",
     "lib/formatted_form.rb",
-    "lib/formatted_form/form_helper.rb"
+    "lib/formatted_form/builder.rb",
+    "lib/formatted_form/engine.rb"
   ]
-  s.homepage = %q{http://github.com/JackNeto/formatted_form}
+  s.homepage = %q{http://github.com/twg/formatted_form}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}

data/lib/formatted_form/builder.rb

@@ -0,0 +1,149 @@
+module FormattedForm
+  class Builder < ActionView::Helpers::FormBuilder
+    
+    %w(text_field password_field text_area file_field datetime_select date_select).each do |field_name|
+      define_method field_name do |method, *args|
+        options = args.detect { |a| a.is_a?(Hash) } || {}
+        render_field(field_name, method, options) { super(method, options) } 
+      end
+    end
+
+    def select(method, choices, options = {}, html_options = {})
+      render_field('select', method, options) { super(method, choices, options, html_options) } 
+    end
+
+    def hidden_field(method, options = {}, html_options = {})
+      super(method, options)
+    end
+
+    def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
+      render_field('check_box', method, options) do
+        super(method, options, checked_value, unchecked_value)
+      end
+    end
+
+    def radio_button(method, tag_value, options = {})
+      case tag_value
+        when Array
+          choices = tag_value.collect do |choice|
+            if !choice.is_a?(Array)
+              choice = [choice, choice]
+            elsif choice.length == 1
+              choice << choice[0]
+            end
+            {
+              :field => super(method, choice[1], options),
+              :label => label_for("#{method}_#{choice[1].to_s.gsub(' ', '_').underscore}", :label => choice[0])
+            }
+          end
+        else
+          choices = [{
+            :field => super(method, tag_value),
+            :label => label_for("#{method}_#{tag_value.to_s.gsub(' ', '_').underscore}", :label => tag_value)
+          }]
+      end
+      
+      @template.render(:partial => "formatted_form/radio_button", :locals  => {
+        :field_name => 'radio_button',
+        :label_text => label_for(method, options),
+        :choices => choices,
+        :required => options.delete(:required),
+        :before_text => @template.raw(options.delete(:before_text)),
+        :after_text => @template.raw(options.delete(:after_text)),
+        :description => @template.raw(options.delete(:desc)),
+        :error_messages => error_messages_for(method)
+      })
+      
+    end
+
+    def submit(value, options={}, &block)
+      cancel_link = @template.capture(&block) if block_given?
+      cancel_link ||= options[:cancel_url] ? ' or ' + options.delete(:cancel_url) : ''
+      if options[:show_ajax_loader]
+        options[:onclick] = "$(this).parent().next().css('display', 'block');$(this).parent().hide();"
+      end
+      if options[:image_button] == true
+        submit_id = Time.now.usec
+        out = @template.content_tag(:div,
+          %{
+            #{super(value, options.merge(:style=>'visibility:hidden;position: absolute', :id => submit_id)).html_safe}
+            <a class="red_button" href="" onclick="$('##{submit_id}').closest('form').submit();return false"><span>#{value}</span></a>
+            #{cancel_link.html_safe}
+          }.html_safe, :class => 'form_element submit_element').html_safe
+  
+      else
+        out = @template.content_tag(:div, super(value, options) + cancel_link.html_safe, :class => 'form_element submit_element').html_safe
+      end
+
+      if options[:show_ajax_loader]
+        out << %{
+          <div class="form_element submit" style="display:none">
+            <div class="submit_ajax_loader">#{options[:show_ajax_loader]}</div>
+          </div>
+        }.html_safe
+      end
+      out.html_safe
+    end
+
+    # generic container for all things form
+    def element(label = '&nbsp;', value = '', type = 'text_field', &block)
+      value += @template.capture(&block) if block_given?
+      %{
+        <div class='form_element #{type}'>
+          <div class='label'>
+            #{label}
+          </div>
+          <div class='value'>
+            #{value}
+          </div>
+        </div>
+      }.html_safe
+    end
+
+    def error_messages
+      if object && !object.errors.empty?
+        message = object.errors[:base].present? ? object.errors[:base]: 'There were some problems submitting this form. Please correct all the highlighted fields and try again'
+        @template.content_tag(:div, message, :class => 'form_error')
+      end
+    end
+
+    def error_messages_for(method)
+      if (object and object.respond_to?(:errors) and errors = object.errors[method] and !errors.empty?)
+        @template.content_tag(:div, errors.is_a?(Array) ? errors.first : errors, :class => 'errors')
+      end
+    end
+
+    def formatted_fields_for(record_or_name_or_array, *args, &block)
+      options = args.extract_options!
+      options.merge!(:builder => FormattedForm::Builder)
+      fields_for(record_or_name_or_array, *(args << options), &block)
+    end
+    
+    
+  protected
+    
+    def render_field(field_name, method, options={}, &block)
+      case field_name
+      when 'check_box'
+        template = field_name
+      else
+        template = 'default_field'
+      end
+      @template.render(:partial => "formatted_form/#{template}", :locals  => {
+        :field_name => field_name,
+        :label_text => label_for(method, options),
+        :required => options.delete(:required),
+        :before_text => @template.raw(options.delete(:before_text)),
+        :after_text => @template.raw(options.delete(:after_text)),
+        :field => @template.capture(&block),
+        :description => @template.raw(options.delete(:desc)),
+        :error_messages => error_messages_for(method)
+      })
+    end
+
+    def label_for(method, options)
+      @template.label(object_name, method, @template.raw(options.delete(:label)) || method.to_s.titleize.capitalize)
+    end  
+
+  end
+end

data/lib/formatted_form/engine.rb

@@ -0,0 +1,10 @@
+require "formatted_form"
+require "rails"
+
+module FormattedForm
+  class Engine < Rails::Engine
+    initializer 'formatted_form.helper' do |app|
+      ActionView::Base.send(:include, FormattedForm::FormattedFormHelper)
+    end
+  end
+end

data/lib/formatted_form.rb

@@ -1,146 +1,15 @@
 module FormattedForm
-  require 'formatted_form/form_helper'
-  ActionView::Base.send(:include, FormattedForm::FormHelper)
-
-  class Builder < ActionView::Helpers::FormBuilder
-    %w[ date_select text_field password_field text_area file_field datetime_select ].each do |selector|
-      src = <<-end_src
-        def #{selector}(method, options = {})
-          if (options[:simple] == true)
-            super(method, options)
-          else
-            options.merge!(:size=> '') if #{%w{text_field password_field}.include?(selector)}
-            standard_field('#{selector}', method, options) { super(method, options) } 
-          end
-        end
-      end_src
-      class_eval src, __FILE__, __LINE__
-    end
-
-    def standard_field(type, method, options={}, &block)
-      description = options.delete(:desc)
-      content = options.delete(:content)
-      prev_content = options.delete(:prev_content)
-      label = label_for(method, options)
-      required = options.delete(:required)
-      check_box_details = options.delete(:check_box_details)
-      text_snippet = options.delete(:text_snippet)
-      %{
-        <div class='form_element #{type}_element'>
-          #{"<div class='text_snippet'>"+text_snippet+"</div>" if text_snippet}
-          <div class='label'>
-            #{description(description) || '&nbsp;' if type == 'check_box' }
-            #{label if type != 'check_box' }
-            #{@template.content_tag(:span, '*', :class => 'required_ind') if required }
-          </div>
-          <div class='value'>
-            #{prev_content}#{yield}#{content}
-            #{error_messages_for(method)}
-            #{description(description) if type != 'check_box'}
-            #{description(check_box_details) if type == 'check_box'}
-          </div>
-        </div>
-      }.html_safe
-    end
-
-    # generic container for all things form
-    def element(label = '&nbsp;', value = '', type = 'text_field', &block)
-      value += @template.capture(&block) if block_given?
-      %{
-        <div class='form_element #{type}_element'>
-          <div class='label'>
-            #{label}
-          </div>
-          <div class='value'>
-            #{value}
-          </div>
-        </div>
-      }.html_safe
-    end
-
-    def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
-      options[:content] = label_for(method, options)
-      options[:label] = ''
-      standard_field('check_box', method, options) { super(method, options, checked_value, unchecked_value) }     
-    end
-
-    def radio_button(method, tag_value, options = {})
-      if options && options[:choices]
-        radios = options.delete(:choices).collect{|choice| %{<div class="radio_button">}+super(method, choice[0], options) + %{<label for="#{object_name.to_s.gsub(']', '').gsub('[', '_')}_#{method}_#{choice[0]}">#{choice[1]}</label></div>}}.join.html_safe
-        standard_field('radio_button', method, options) { radios }
-      elsif options && options[:value_name]
-          standard_field('radio_button', method, options) { super(method, tag_value) + %{<label for="#{object_name}_#{method}_#{tag_value}">#{options[:value_name]}</label><div class="clearfloat"></div>}.html_safe}
-      else
-        standard_field('radio_button', method, options) { super(method, tag_value, options = {}) }
-      end
-    end
-
-    def select(method, choices, options = {}, html_options = {})
-      standard_field('select', method, options) { super(method, choices, options, html_options) } 
-    end
+  require 'formatted_form/engine' if defined?(Rails)
+  require 'formatted_form/builder'
   
-    def hidden_field(method, options = {}, html_options = {})
-      super(method, options)
-    end
-
-    def submit(value, options={}, &block)
-      cancel_link = @template.capture(&block) if block_given?
-      cancel_link ||= options[:cancel_url] ? ' or ' + options.delete(:cancel_url) : ''
-      if options[:show_ajax_loader]
-        options[:onclick] = "$(this).parent().next().css('display', 'block');$(this).parent().hide();"
-      end
-      if options[:image_button] == true
-        submit_id = Time.now.usec
-        out = @template.content_tag(:div,
-          %{
-            #{super(value, options.merge(:style=>'visibility:hidden;position: absolute', :id => submit_id)).html_safe}
-            <a class="red_button" href="" onclick="$('##{submit_id}').closest('form').submit();return false"><span>#{value}</span></a>
-            #{cancel_link.html_safe}
-          }.html_safe, :class => 'form_element submit_element').html_safe
-    
-      else
-        out = @template.content_tag(:div, super(value, options) + cancel_link.html_safe, :class => 'form_element submit_element').html_safe
-      end
-  
-      if options[:show_ajax_loader]
-        out << %{
-          <div class="form_element submit_element" style="display:none">
-            <div class="submit_ajax_loader">#{options[:show_ajax_loader]}</div>
-          </div>
-        }.html_safe
-      end
-      out.html_safe
-    end
-
-    def label_for(method, options)
-      label = options.delete(:label) || method.to_s.titleize.capitalize
-      "<label for=\"#{object_name}_#{method}\">#{label}</label>"
-    end  
-
-    def description(description)
-      "<div class='description'>#{description}</div>" unless description.nil?
-    end
-
-    def error_messages
-      if object && !object.errors.empty?
-        message = object.errors[:base].present? ? object.errors[:base]: 'There were some problems submitting this form. Please correct all the highlighted fields and try again'
-        @template.content_tag(:div, message, :class => 'form_error')
-      end
-    end
-
-    def error_messages_for(method)
-      if (object and object.respond_to?(:errors) and errors = object.errors[method])
-        "<div class='errors'>#{errors.is_a?(Array) ? errors.first : errors}</div>"
-      else
-        ''
-      end
-    end
-
-    def formatted_fields_for(record_or_name_or_array, *args, &block)
+  module FormattedFormHelper
+    def formatted_form_for(record_or_name_or_array, *args, &proc)
       options = args.extract_options!
       options.merge!(:builder => FormattedForm::Builder)
-      fields_for(record_or_name_or_array, *(args << options), &block)
+      (options[:html] ||= { }).merge!(:class => "#{options[:html][:class]} formatted")
+      form_for(record_or_name_or_array, *(args << options), &proc)
     end
   end
   
-end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jack Neto
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -05:00
+date: 2011-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -32,11 +32,15 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- app/views/formatted_form/_check_box.html.haml
+- app/views/formatted_form/_default_field.html.haml
+- app/views/formatted_form/_radio_button.html.haml
 - formatted_form.gemspec
 - lib/formatted_form.rb
-- lib/formatted_form/form_helper.rb
+- lib/formatted_form/builder.rb
+- lib/formatted_form/engine.rb
 has_rdoc: true
-homepage: http://github.com/JackNeto/formatted_form
+homepage: http://github.com/twg/formatted_form
 licenses: 
 - MIT
 post_install_message: 

data/lib/formatted_form/form_helper.rb

@@ -1,10 +0,0 @@
-module FormattedForm
-  module FormHelper
-    def formatted_form_for(record_or_name_or_array, *args, &proc)
-      options = args.extract_options!
-      options.merge!(:builder => FormattedForm::Builder)
-      (options[:html] ||= { }).merge!(:class => "#{options[:html][:class]} formatted")
-      form_for(record_or_name_or_array, *(args << options), &proc)
-    end
-  end
-end