simple_form_bootstrap3 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd1beacf5c4641db392cdbac70092159f1446b59
-  data.tar.gz: de9ab571777ffc18d12340b68a0caeee7083a036
+  metadata.gz: c401b3b54b4828f8e3168c069a2e6823d2fc9924
+  data.tar.gz: ab36733744b7a1a89347a52671a1cf4ec28c40cd
 SHA512:
-  metadata.gz: 7ad3763abc2b5c9cfe51c3668b0f0245a37e63299ad342b899f11cfb2f7e01de3a36d8b547854a93d5ae1c6f977f4d9421846f10ed8614ecf86a94eb2196ec99
-  data.tar.gz: d6851fd4df9d46420b749d46bd6358e0df7d0de5ceaf91d48d5e87530280308d56aa6d09c79b2e6db09bf156aee2db875f2d9134bd80b8d3eba1d072e3968a3f
+  metadata.gz: ccd6caee6760bc92a44c2f38bfdae48e9939b9a597bdec14d8a670b51bb96464f0a90c7c60406ae9d6c146ac8715e6688c6e5a6d74488d8f908e85f5da285c03
+  data.tar.gz: 9f7ded251c5c6b1b0b5459b7332a2b4ef544d5f986d822f3f7fc8559c997a36c138a009cdd6f835a98c7b715b44d396a6f5ed7d5093d842777f1698b264e59d2

data/README.md

@@ -17,11 +17,54 @@ And then execute:
 Or install it yourself as:
 
     $ gem install simple_form_bootstrap3
+    
+See https://github.com/twbs/bootstrap-sass to configure bootstrap gem.
 
+Add to application.css:
+
+    *= require bootstrap-datepicker
+    *= require bootstrap-datetimepicker
+
+Add to application.js:
+
+    //= require bootstrap-datepicker
+    //= require bootstrap-datetimepicker
+
+## Usage (examples with haml)
+
+    # horizontal form
+    = horizontal_form_for @user do |f|
+        = f.input :name
+        = f.input :password
+        = f.checkbox :remember_me
+        = f.buttons do
+            = f.button :submit
+    
+    # default form
+    = default_form_for @user do |f|
+        = f.input :name
+        = f.checkbox :admin
+        = f.button :submit
+    
+    # inline form
+    = inline_form_for @user do |f|
+        = f.input :name
+        = f.checkbox :remember_me
+        = f.password
+        = f.button :submit
+    
+    # compact form will use placeholder and no labels
+    = compact_form_for @user do |f|
+        = f.input :name
+    
 ## Links
 
 Thanks for Sebastien MALOT`s [datepicker](https://github.com/smalot/bootstrap-datepicker) and
-[datetimepicker](https://github.com/smalot/bootstrap-datetimepicker)
+[datetimepicker](https://github.com/smalot/bootstrap-datetimepicker).
+
+## TODO
+
+Add inline-group wrapper.
 
 ## Maintainers and Authors
 

data/lib/simple_form/inputs/date_picker_input.rb

@@ -11,11 +11,18 @@ module SimpleForm
       private
 
       def input_html_options
-        options[:value] = Time.zone.parse(options[:value]) if options[:value].is_a? String
+        if options.key? :value
+          value = options[:value]
+        elsif object.respond_to?(attribute_name)
+          value = object.send(attribute_name)
+        else
+          value = ''
+        end
+
+        value = Time.zone.parse(value) if value.is_a?(String)
+        value = value.strftime("%Y-%m-%d") if value.respond_to?(:strftime)
 
-        { class: 'form-control',
-          readonly: true,
-          value: (options[:value].presence || object.send(attribute_name)).strftime("%Y-%m-%d") }
+        { class: 'form-control', readonly: true, value: value.presence || '' }
       end
 
       def span_calendar

data/lib/simple_form/inputs/date_time_picker_input.rb

@@ -11,11 +11,18 @@ module SimpleForm
       private
 
       def input_html_options
-        options[:value] = Time.zone.parse(options[:value]) if options[:value].is_a? String
+        if options.key? :value
+          value = options[:value]
+        elsif object.respond_to?(attribute_name)
+          value = object.send(attribute_name)
+        else
+          value = ''
+        end
+
+        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',
-          readonly: true,
-          value: (options[:value].presence || object.send(attribute_name)).strftime("%Y-%m-%d %H:%M") }
+        { class: 'form-control', readonly: true, value: value.presence || '' }
       end
 
       def span_calendar

data/lib/simple_form_bootstrap3/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormBootstrap3
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_bootstrap3
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Yuriy Kolodovskyy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass