bootstrap_builder 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bootstrap_builder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bootstrap_builder"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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-10"
+  s.date = "2012-02-13"
   s.description = ""
   s.email = "jack@twg.ca"
   s.extra_rdoc_files = [
@@ -17,12 +17,10 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".DS_Store",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
-    "app/.DS_Store",
     "app/assets/images/glyphicons-halflings-white.png",
     "app/assets/images/glyphicons-halflings.png",
     "app/assets/javascripts/bootstrap.js",
@@ -35,14 +33,12 @@ Gem::Specification.new do |s|
     "app/views/bootstrap_builder/_submit.html.haml",
     "bootstrap_builder.gemspec",
     "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",
     "lib/bootstrap_builder/railtie.rb",
-    "rails-bootstrap-builder.gemspec",
-    "vendor/.DS_Store"
+    "rails-bootstrap-builder.gemspec"
   ]
   s.homepage = "http://github.com/twg/bootstrap_builder"
   s.licenses = ["MIT"]

data/lib/bootstrap_builder/builder.rb

@@ -148,7 +148,7 @@ module BootstrapBuilder
 
     def fields_for(record_or_name_or_array, *args, &block)
       options = args.extract_options!
-      options.merge!(:builder => BootstrapBuilder::Builder)
+      options[:builder] ||= BootstrapBuilder::Builder
       super(record_or_name_or_array, *(args << options), &block)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_builder
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: jack@twg.ca
@@ -20,12 +20,10 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .DS_Store
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
-- app/.DS_Store
 - app/assets/images/glyphicons-halflings-white.png
 - app/assets/images/glyphicons-halflings.png
 - app/assets/javascripts/bootstrap.js
@@ -38,14 +36,12 @@ files:
 - app/views/bootstrap_builder/_submit.html.haml
 - bootstrap_builder.gemspec
 - 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
 - lib/bootstrap_builder/railtie.rb
 - rails-bootstrap-builder.gemspec
-- vendor/.DS_Store
 homepage: http://github.com/twg/bootstrap_builder
 licenses:
 - MIT