simple_form_bootstrap3 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5afdcffa73cffd6dfe2ac65b329e078a872da623
-  data.tar.gz: 448595ce076d075240039433902003eb983a4aac
+  metadata.gz: f26fd475c7f606bc38cd404177953a1537174c7e
+  data.tar.gz: af2e59a3ee3e87daf94c2d6246a6bc9ee8066d68
 SHA512:
-  metadata.gz: a37376a8b87ef80954a6a9d4c6e763f7d57a4596ce0d788f7f1808413a047230c3cee41e9c9c82f2a844c8379b658853942a8b665fc3e283cf9fa6eb5a3a4b4b
-  data.tar.gz: 7687021a39cd83d796e17b25af3112baea47f91b2c9acaa96c61c75da29e1aa11709649026b1d7145bfd9bd90ba3f98a7d3c41ff53b42da32e27cc0ae7ab002f
+  metadata.gz: 0425e448ee9940b67b2c3d842ae919c47e0ff027708ca28bad5d5bb396f20b5dde51bd2fde9604832f6e368ae5de342f3cb8fe98312558ce93f8151ba1ac6f83
+  data.tar.gz: 4bd5ca0bf084e76b24057f7baf3679da8c824de582ec7fc59ef1316c3cf68fa3243328944f28f52b2b5ae3e145256d1620d2a10a2aaff43a36807758444a9148

data/lib/simple_form/inputs/date_picker_input.rb

@@ -8,7 +8,9 @@ module SimpleForm
       private
 
       def input_html_options
-        if options.key? :value
+        if options.key?(:input_html) && options[:input_html].key?(:value)
+          value = options[:input_html][:value]
+        elsif options.key? :value
           value = options[:value]
         elsif object.respond_to?(attribute_name)
           value = object.send(attribute_name)
@@ -19,7 +21,13 @@ module SimpleForm
         value = Time.zone.parse(value) if value.is_a?(String)
         value = value.strftime("%Y-%m-%d") if value.respond_to?(:strftime)
 
-        { class: 'form-control text-center date datepicker', value: value.presence || '' }
+        result = { class: 'form-control text-center date datepicker', value: value.presence || '' }
+        if options.key? :input_html
+          result[:class] += ' ' + options[:input_html][:class] if options[:input_html][:class].present?
+          result.merge(options[:input_html].except(:class, :value))
+        else
+          result
+        end
       end
     end
   end

data/lib/simple_form/inputs/date_time_picker_input.rb

@@ -8,7 +8,9 @@ module SimpleForm
       private
 
       def input_html_options
-        if options.key? :value
+        if options.key?(:input_html) && options[:input_html].key?(:value)
+          value = options[:input_html][:value]
+        elsif options.key? :value
           value = options[:value]
         elsif object.respond_to?(attribute_name)
           value = object.send(attribute_name)
@@ -19,7 +21,13 @@ module SimpleForm
         value = Time.zone.parse(value) if value.is_a?(String)
         value = value.strftime("%Y-%m-%d %H:%M") if value.respond_to?(:strftime)
 
-        { class: 'form-control text-center datetime datetimepicker', value: value.presence || '' }
+        result = { class: 'form-control text-center datetime datetimepicker', value: value.presence || '' }
+        if options.key? :input_html
+          result[:class] += ' ' + options[:input_html][:class] if options[:input_html][:class].present?
+          result.merge(options[:input_html].except(:class, :value))
+        else
+          result
+        end
       end
     end
   end

data/lib/simple_form_bootstrap3/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormBootstrap3
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_bootstrap3
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Yuriy Kolodovskyy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass