twitter-bootstrap-form-builder 0.0.5 → 0.0.6

data/lib/twitter-bootstrap-form-builder/form_builder.rb

@@ -107,7 +107,7 @@ module MNE
         if opts.keys.include?(key)
           sub_opts = opts.delete(key)
 
-          return [sub_opts.merge(defaults)] if sub_opts.is_a? Hash
+          return [defaults.merge(sub_opts)] if sub_opts.is_a? Hash
           return [sub_opts, defaults] if sub_opts.is_a? String
 
           # If we were explicitly given an array, we're done.

data/lib/twitter-bootstrap-form-builder/version.rb

@@ -1,5 +1,5 @@
 module MNE
   module TwitterBootstrapFormBuilder
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Matthew Eagar