formatted_form 1.0.2 → 1.1.0

data/Rakefile

@@ -3,11 +3,10 @@ require 'rake'
 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/twg/formatted_form"
   gem.license = "MIT"
-  gem.summary = "A Rails form builder to simplify you forms"
+  gem.summary = "A Rails form builder to simplify your forms"
   gem.description = ''
   gem.email = "jack@theworkinggroup.ca"
   gem.authors = ["Jack Neto"]

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

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

@@ -2,12 +2,13 @@
 
   .value
     = field
-    = label_text
+    = builder.label(method, label_text)
+    
     - if required
       %span.required *
 
     - if error_messages.present?
-      != error_messages
+      .errors= error_messages
 
     - if description.present?
       .description= description

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

@@ -1,6 +1,6 @@
 .form_element{:class => "#{field_name}"}
   .label
-    = label_text
+    = builder.label(method, label_text)
     - if required
       %span.required *
 
@@ -8,8 +8,10 @@
     = before_text
     = field
     = after_text
-    - if error_messages.present?
-      = error_messages
     
     - if description.present?
-      .description= description
+      .description= description
+      
+    - if error_messages.present?
+      .errors= error_messages
+    

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

@@ -8,10 +8,10 @@
     - choices.each do |choice|
       .option
         = choice[:field]
-        = choice[:label]
+        %label{:for => choice[:label_for]}= choice[:label]
 
     - if error_messages.present?
-      != error_messages
+      .errors= error_messages
 
     - if description.present?
       .description= description

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

@@ -0,0 +1,3 @@
+.form_element{:class => "#{field_name}"}
+  = field
+  = after_text

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

@@ -0,0 +1,18 @@
+.clearfix{:class => ('error' if error_messages.present?)}
+
+  .input
+    %ul.inputs-list
+      %li
+        %label
+          = field
+          %span
+            = label_text
+            - if required
+              %span.required *
+            
+        - if error_messages.present?
+          %span.help-inline= error_messages
+        - if description.present?
+          %span.help-block= description
+      
+      

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

@@ -0,0 +1,10 @@
+.clearfix{:class => ('error' if error_messages.present?)}
+  
+  = builder.label(method, label_text)
+  
+  .input
+    = field
+    - if error_messages.present?
+      %span.help-inline= error_messages
+    - if description.present?
+      %span.help-block= description

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

@@ -0,0 +1,24 @@
+.clearfix{:class => ('error' if error_messages.present?)}
+
+  %label
+    = label_text
+    - if required
+      %span.required *
+
+  .input
+    %ul.inputs-list
+      - choices.each do |choice|
+        %li
+          %label{:for => choice[:label_for]}
+            = choice[:field]
+            %span= choice[:label]
+
+
+
+    - if description.present?
+      %span.help-block= description
+
+    - if error_messages.present?
+      %span.help-inline= error_messages
+    
+

data/app/views/twitter_bootstrap/_submit.html.haml

@@ -0,0 +1,3 @@
+.actions
+  = field
+  = after_text

data/formatted_form.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formatted_form}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Neto"]
-  s.date = %q{2011-04-20}
+  s.date = %q{2011-10-16}
   s.description = %q{}
   s.email = %q{jack@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -24,10 +24,17 @@ Gem::Specification.new do |s|
     "app/views/formatted_form/_check_box.html.haml",
     "app/views/formatted_form/_default_field.html.haml",
     "app/views/formatted_form/_radio_button.html.haml",
+    "app/views/formatted_form/_submit.html.haml",
+    "app/views/twitter_bootstrap/_check_box.html.haml",
+    "app/views/twitter_bootstrap/_default_field.html.haml",
+    "app/views/twitter_bootstrap/_radio_button.html.haml",
+    "app/views/twitter_bootstrap/_submit.html.haml",
     "formatted_form.gemspec",
     "lib/formatted_form.rb",
     "lib/formatted_form/builder.rb",
+    "lib/formatted_form/configuration.rb",
     "lib/formatted_form/engine.rb",
+    "lib/formatted_form/helper.rb",
     "lib/generators/formatted_form/javascripts/javascripts_generator.rb",
     "lib/generators/formatted_form/stylesheets/stylesheets_generator.rb",
     "templates/javascripts/formatted_form.js",
@@ -36,8 +43,8 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/twg/formatted_form}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{A Rails form builder to simplify you forms}
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{A Rails form builder to simplify your forms}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/formatted_form/builder.rb

@@ -33,19 +33,23 @@ module FormattedForm
             end
             {
               :field => super(method, choice[1], options),
-              :label => label_for("#{method}_#{choice[1].to_s.gsub(' ', '_').underscore}", :label => choice[0])
+              :label => choice[0],
+              :label_for => "#{object_name}_#{method}_#{choice[1].to_s.gsub(' ', '_').underscore}"
             }
           end
         else
           choices = [{
             :field => super(method, tag_value),
-            :label => label_for("#{method}_#{tag_value.to_s.gsub(' ', '_').underscore}", :label => tag_value)
+            :label => tag_value,
+            :label_for => "#{object_name}_#{method}_#{tag_value.to_s.gsub(' ', '_').underscore}"
           }]
       end
       
-      @template.render(:partial => "formatted_form/radio_button", :locals  => {
+      @template.render(:partial => "#{FormattedForm.config.template}/radio_button", :locals  => {
+        :builder => self,
+        :method => method,
         :field_name => 'radio_button',
-        :label_text => label_for(method, options),
+        :label_text => label_text(method, options.delete(:label)),
         :choices => choices,
         :required => options.delete(:required),
         :before_text => @template.raw(options.delete(:before_text)),
@@ -58,24 +62,53 @@ module FormattedForm
 
     # f.submit 'Log In', :change_to_text => 'Logging you in ...'
     def submit(value, options={}, &block)
-      cancel_link = @template.capture(&block) if block_given?
-      cancel_link ||= options[:cancel_url] ? ' or ' + options.delete(:cancel_url) : ''
-      change_to_text = options.delete(:change_to_text)
+      after_text = @template.capture(&block) if block_given?
+      
+      
+     
+      case FormattedForm.config.template 
+      when :formatted_form
+         # Set the script to change the text
+        if change_to_text = options.delete(:change_to_text)
+          options[:onclick] ||= ''
+          options[:onclick] = "$(this).closest('.form_element').hide();$(this).closest('.form_element').after($('<div class=form_element><div class=value>#{change_to_text}</div></div>'))"
+        end
+        
+      when :twitter_bootstrap
+         # Add specific bootstrap class
+        options[:class] ||= ''
+        options[:class] += ' btn primary'
 
-      out = @template.content_tag(:div, :class => "form_element submit#{' change_to_text' if change_to_text}") do
-        if options.delete(:image)
-          content = super(value, options.merge(:style=>'visibility:hidden;position: absolute'))
-          content << @template.link_to(@template.content_tag(:span, value), "#", :class => 'submit_image')
-          content << cancel_link.html_safe
-        else
-          super(value, options) + cancel_link.html_safe
+         # Set the script to change the text
+        if change_to_text = options.delete(:change_to_text)
+          options[:onclick] ||= ''
+          options[:onclick] = "$(this).closest('.actions').hide();$(this).closest('.actions').after($('<div class=actions>#{change_to_text}</div>'))"
         end
       end
+
+      @template.render(:partial => "#{FormattedForm.config.template}/submit", :locals  => {
+        :field_name => 'submit',
+        :field => super(value, options),
+        :after_text => after_text,
+        :change_to_text => change_to_text
+      })
+      
+      
+      # out = @template.content_tag(:div, :class => "form_element submit#{' change_to_text' if change_to_text}") do
+      #   if options.delete(:image)
+      #     content = super(value, options.merge(:style=>'visibility:hidden;position: absolute'))
+      #     content << @template.link_to(@template.content_tag(:span, value), "#", :class => 'submit_image')
+      #     content << cancel_link.html_safe
+      #   else
+      #     super(value, options) + cancel_link.html_safe
+      #   end
+      # end
+      # 
+      # if change_to_text
+      #   out << @template.content_tag(:div, change_to_text, :class => 'form_element submit_text')
+      # end
+      # out.html_safe
       
-      if change_to_text
-        out << @template.content_tag(:div, change_to_text, :class => 'form_element submit_text')
-      end
-      out.html_safe
     end
 
     # generic container for all things form
@@ -102,19 +135,20 @@ module FormattedForm
 
     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')
+        errors.is_a?(Array) ? errors.first : errors
       end
     end
 
-    def formatted_fields_for(record_or_name_or_array, *args, &block)
+    def 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)
+      super(record_or_name_or_array, *(args << options), &block)
     end
-    
+
     
   protected
     
+    # Main rendering method
     def render_field(field_name, method, options={}, &block)
       case field_name
       when 'check_box'
@@ -122,21 +156,23 @@ module FormattedForm
       else
         template = 'default_field'
       end
-      @template.render(:partial => "formatted_form/#{template}", :locals  => {
+      @template.render(:partial => "#{FormattedForm.config.template}/#{template}", :locals  => {
+        :builder => self,
+        :method => method,
         :field_name => field_name,
-        :label_text => label_for(method, options),
+        :field => @template.capture(&block),
+        :label_text => label_text(method, options.delete(:label)),
         :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  
-
+    def label_text(method, text = nil)
+      text.blank? ? method.to_s.titleize.capitalize : @template.raw(text)
+    end
+    
   end
 end

data/lib/formatted_form/configuration.rb

@@ -0,0 +1,16 @@
+module FormattedForm
+  class Configuration
+
+    # The templates used to use the views.
+    # Options are 
+    #   :formatted_form     - the default rendering template
+    #   :twitter_bootstrap  - Twitter Bootstrap templates
+    attr_accessor :template
+        
+    # Configuration defaults
+    def initialize
+      @template = :formatted_form
+    end
+    
+  end
+end

data/lib/formatted_form/engine.rb

@@ -3,8 +3,15 @@ require "rails"
 
 module FormattedForm
   class Engine < Rails::Engine
+    
     initializer 'formatted_form_helper' do |app|
-      ActionView::Base.send(:include, FormattedForm::FormattedFormHelper)
+      ActionView::Base.send(:include, FormattedForm::Helper)
+      
+      # Removing field_with_errors div araound elemetns with errors
+      if FormattedForm.config.template == :twitter_bootstrap
+        ActionView::Base.field_error_proc = proc { |input, instance| input }
+      end
     end
+    
   end
 end

data/lib/formatted_form/helper.rb

@@ -0,0 +1,10 @@
+module FormattedForm::Helper
+  
+  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

data/lib/formatted_form.rb

@@ -1,15 +1,20 @@
+require 'formatted_form/engine' if defined?(Rails)
+require 'formatted_form/builder'
+require 'formatted_form/helper'
+require 'formatted_form/configuration'
+
 module FormattedForm
-  require 'formatted_form/engine' if defined?(Rails)
-  require 'formatted_form/builder'
-  
-  module FormattedFormHelper
-    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)
+  class << self
+
+    def configure
+      yield configuration
     end
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+    alias :config :configuration
+
   end
-  
 end
 

data/templates/stylesheets/formatted_form.sass

@@ -4,7 +4,7 @@ form.formatted
   background: #eee
   border: solid #ddd 2px
   color: #000
-  width: 400px
+  width: 50%
   padding: 10px 20px
   -webkit-box-shadow: 0 1px 4px rgba(0,0,0,0.3)
   -moz-box-shadow: 0 1px 4px rgba(0,0,0,0.3)
@@ -29,6 +29,7 @@ form.formatted
       .errors
         font: 9px/12px Trebuchet MS, serif
         color: #BE1E2D
+        clear: both
       .description
         clear: both
         font: italic 10px/12px Trebuchet MS, serif
@@ -58,13 +59,16 @@ form.formatted
         letter-spacing: 0.1em
       input
         margin-right: 5px
-      .fieldWithErrors
+      .field_with_errors
         float: left
 
   .form_element.radio_button
     .value
       .option
         float: left
+      .option + .option
+        margin-left: 10px
+        
   
   // --- Submit button ---
   .form_element.submit

metadata

@@ -1,29 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: formatted_form
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Jack Neto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-20 00:00:00 -04:00
+date: 2011-10-16 00:00:00.000000000 -04:00
 default_executable: 
 dependencies: []
-
-description: ""
+description: ''
 email: jack@theworkinggroup.ca
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -31,41 +27,45 @@ files:
 - app/views/formatted_form/_check_box.html.haml
 - app/views/formatted_form/_default_field.html.haml
 - app/views/formatted_form/_radio_button.html.haml
+- app/views/formatted_form/_submit.html.haml
+- app/views/twitter_bootstrap/_check_box.html.haml
+- app/views/twitter_bootstrap/_default_field.html.haml
+- app/views/twitter_bootstrap/_radio_button.html.haml
+- app/views/twitter_bootstrap/_submit.html.haml
 - formatted_form.gemspec
 - lib/formatted_form.rb
 - lib/formatted_form/builder.rb
+- lib/formatted_form/configuration.rb
 - lib/formatted_form/engine.rb
+- lib/formatted_form/helper.rb
 - lib/generators/formatted_form/javascripts/javascripts_generator.rb
 - lib/generators/formatted_form/stylesheets/stylesheets_generator.rb
 - templates/javascripts/formatted_form.js
 - templates/stylesheets/formatted_form.sass
 has_rdoc: true
 homepage: http://github.com/twg/formatted_form
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A Rails form builder to simplify you forms
+summary: A Rails form builder to simplify your forms
 test_files: []
-