bootstrap_builder 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bootstrap_builder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bootstrap_builder"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Neto", "The Working Group Inc."]
-  s.date = "2012-06-09"
+  s.date = "2012-07-03"
   s.description = ""
   s.email = "jack@twg.ca"
   s.extra_rdoc_files = [
@@ -37,8 +37,7 @@ Gem::Specification.new do |s|
     "lib/bootstrap_builder/configuration.rb",
     "lib/bootstrap_builder/engine.rb",
     "lib/bootstrap_builder/helper.rb",
-    "lib/bootstrap_builder/railtie.rb",
-    "rails-bootstrap-builder.gemspec"
+    "lib/bootstrap_builder/railtie.rb"
   ]
   s.homepage = "http://github.com/twg/bootstrap_builder"
   s.licenses = ["MIT"]

data/lib/bootstrap_builder/builder.rb

@@ -10,20 +10,31 @@ module BootstrapBuilder
       number_field
       text_area 
       file_field 
-      datetime_select 
-      date_select 
-      time_zone_select
       range_field
       search_field
     ).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) } 
+        html_options = collect_html_options(options)
+        render_field(field_name, method, options, html_options) { super(method, options) } 
+      end
+    end
+
+    %w{
+      datetime_select 
+      date_select 
+      time_select 
+      time_zone_select
+    }.each do |field_name|
+      define_method field_name do |method, options = {}, html_options = {}|
+        render_field('select', method, options, html_options) do
+          super(method, options, html_options)
+        end
       end
     end
 
     def select(method, choices, options = {}, html_options = {})
-      render_field('select', method, options) { super(method, choices, options, html_options) } 
+      render_field('select', method, options, html_options) { super(method, choices, options, html_options) } 
     end
 
     def hidden_field(method, options = {}, html_options = {})
@@ -122,11 +133,9 @@ module BootstrapBuilder
     def element(label = ' ', 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'>
+        <div class='control-group'>
+          <label class='control-label'>#{label}</label>
+          <div class='controls'>
             #{value}
           </div>
         </div>
@@ -158,7 +167,7 @@ module BootstrapBuilder
   protected
     
     # Main rendering method
-    def render_field(field_name, method, options={}, &block)
+    def render_field(field_name, method, options={}, html_options={}, &block)
       case field_name
       when 'check_box'
         template = field_name
@@ -166,14 +175,14 @@ module BootstrapBuilder
         template = 'default_field'
       end
       @template.render(:partial => "#{BootstrapBuilder.config.template_folder}/#{template}", :locals  => {
-        :builder => self,
-        :method => method,
-        :field => @template.capture(&block),
-        :label_text => label_text(method, options.delete(:label)),
-        :required => options.delete(:required),
-        :prepend => @template.raw(options.delete(:prepend)),
-        :append => @template.raw(options.delete(:append)),
-        :help_block => @template.raw(options.delete(:help_block)),
+        :builder        => self,
+        :method         => method,
+        :field          => @template.capture(&block),
+        :label_text     => label_text(method, html_options[:label]),
+        :required       => html_options[:required],
+        :prepend        => html_options[:prepend],
+        :append         => html_options[:append],
+        :help_block     => html_options[:help_block],
         :error_messages => error_messages_for(method)
       })
     end
@@ -182,5 +191,18 @@ module BootstrapBuilder
       text.nil? ? method.to_s.titleize.capitalize : @template.raw(text)
     end
     
+    def collect_html_options(options = {})
+      [
+        :prepend, 
+        :append, 
+        :label, 
+        :help_block,
+        :required
+      ].inject({}) do |h, attribute|
+        h[attribute] = @template.raw(options.delete(attribute))
+        h
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_builder
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: jack@twg.ca
@@ -41,7 +41,6 @@ files:
 - lib/bootstrap_builder/engine.rb
 - lib/bootstrap_builder/helper.rb
 - lib/bootstrap_builder/railtie.rb
-- rails-bootstrap-builder.gemspec
 homepage: http://github.com/twg/bootstrap_builder
 licenses:
 - MIT

data/rails-bootstrap-builder.gemspec

@@ -1,52 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "rails-bootstrap-builder"
-  s.version = "0.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jack Neto", "The Working Group Inc."]
-  s.date = "2012-02-04"
-  s.description = ""
-  s.email = "jack@twg.ca"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "app/.DS_Store",
-    "app/views/bootstrap_builder/_check_box.html.haml",
-    "app/views/bootstrap_builder/_default_field.html.haml",
-    "app/views/bootstrap_builder/_radio_button.html.haml",
-    "app/views/bootstrap_builder/_submit.html.haml",
-    "lib/bootstrap_builder.rb",
-    "lib/bootstrap_builder/.DS_Store",
-    "lib/bootstrap_builder/builder.rb",
-    "lib/bootstrap_builder/configuration.rb",
-    "lib/bootstrap_builder/engine.rb",
-    "lib/bootstrap_builder/helper.rb",
-    "vendor/.DS_Store"
-  ]
-  s.homepage = "http://github.com/twg/rails-bootstrap-builder"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
-  s.summary = "A Rails form builder to the generates Twitter Bootstrap markup"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-