formtastic 2.1.1 → 2.2.0.rc

data/lib/formtastic/inputs/base/wrapping.rb

@@ -14,29 +14,34 @@ module Formtastic
         end
         
         def wrapper_html_options
-          opts = (options[:wrapper_html] || {}).dup
-          opts[:class] =
-            case opts[:class]
-            when Array
-              opts[:class].dup
-            when nil
-              []
-            else
-              [opts[:class].to_s]
-            end
-          opts[:class] << as
-          opts[:class] << "input"
-          opts[:class] << "error" if errors?
-          opts[:class] << "optional" if optional?
-          opts[:class] << "required" if required?
-          opts[:class] << "autofocus" if autofocus?
-          opts[:class] = opts[:class].join(' ')
-          
-          opts[:id] ||= wrapper_dom_id
-        
+          opts = wrapper_html_options_raw
+          opts[:class] = wrapper_classes
+          opts[:id] ||= wrapper_dom_id 
           opts
         end
         
+        def wrapper_html_options_raw
+          (options[:wrapper_html] || {}).dup
+        end
+        
+        def wrapper_classes_raw
+          classes = wrapper_html_options_raw[:class] || []
+          return classes.dup if classes.is_a?(Array)
+          return [classes]
+        end
+        
+        def wrapper_classes
+          classes = wrapper_classes_raw
+          classes << as
+          classes << "input"
+          classes << "error" if errors?
+          classes << "optional" if optional?
+          classes << "required" if required?
+          classes << "autofocus" if autofocus?
+
+          classes.join(' ')
+        end
+        
         def wrapper_dom_id
           @wrapper_dom_id ||= "#{dom_id.to_s.gsub((association_primary_key || method).to_s, sanitized_method_name.to_s)}_input"
         end

data/lib/formtastic/inputs/boolean_input.rb

@@ -97,9 +97,32 @@ module Formtastic
       end
 
       def checked?
-        object && ActionView::Helpers::InstanceTag.check_box_checked?(object.send(method), checked_value)
+        if defined? ActionView::Helpers::InstanceTag
+          object && ActionView::Helpers::InstanceTag.check_box_checked?(object.send(method), checked_value)
+        else
+          object && boolean_checked?(object.send(method), checked_value) 
+        end
       end
+      
+      private 
 
+      def boolean_checked?(value, checked_value)
+        case value
+        when TrueClass, FalseClass
+          value
+        when NilClass
+          false
+        when Integer
+          value != 0
+        when String
+          value == checked_value
+        when Array
+          value.include?(checked_value)
+        else
+          value.to_i != 0
+        end
+      end
+      
     end
   end
 end

data/lib/formtastic/inputs/date_input.rb

@@ -1,34 +1,10 @@
 module Formtastic
   module Inputs
-    # Outputs a series of select boxes for the fragments that make up a date (year, month, day).
-    #
-    # @see Formtastic::Inputs::Base::Timeish Timeish module for documentation of date, time and datetime input options.
-    class DateInput 
-      include Base
-      include Base::Timeish
-      
-      # We don't want hour and minute fragments on a date input
-      def time_fragments
-        []
+    class DateInput < DateSelectInput
+      def to_html
+        ::ActiveSupport::Deprecation.warn("DateInput (:as => :date) has been renamed to DateSelectInput (:as => :date_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
+        super
       end
-      
-      def hidden_date_fragments
-        default_date_fragments - date_fragments
-      end
-
-      def hidden_fragments
-        hidden_date_fragments.map do |fragment|
-          template.hidden_field_tag(hidden_field_name(fragment), fragment_value(fragment), :id => fragment_id(fragment), :disabled => input_html_options[:disabled] )
-        end.join.html_safe
-      end
-
-      def fragment_value(fragment)
-        if fragment == :year
-          Time.now.year
-        else
-          '1'
-        end
-      end      
     end
   end
-end
+end

data/lib/formtastic/inputs/date_picker_input.rb

@@ -0,0 +1,93 @@
+module Formtastic
+  module Inputs
+    
+    # Outputs a simple `<label>` with a HTML5 `<input type="date">` wrapped in the standard
+    # `<li>` wrapper. This is an alternative to `:date_select` for `:date`, `:time`, `:datetime` 
+    # database columns. You can use this input with `:as => :date_picker`.
+    #
+    # *Please note:* Formtastic only provides suitable markup for a date picker, but does not supply
+    # any additional CSS or Javascript to render calendar-style date pickers. Browsers that support
+    # this input type (such as Mobile Webkit and Opera on the desktop) will render a native widget.
+    # Browsers that don't will default to a plain text field`<input type="text">` and can be 
+    # poly-filled with some Javascript and a UI library of your choice.
+    #
+    # @example Full form context and output
+    #
+    #   <%= semantic_form_for(@post) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :publish_at, :as => :date_picker %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="string">
+    #           <label for="post_publish_at">First name</label>
+    #           <input type="date" id="post_publish_at" name="post[publish_at]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @example Setting the size (defaults to 10 for YYYY-MM-DD)
+    #   <%= f.input :publish_at, :as => :date_picker, :size => 20 %>
+    #   <%= f.input :publish_at, :as => :date_picker, :input_html => { :size => 20 } %>
+    #
+    # @example Setting the maxlength (defaults to 10 for YYYY-MM-DD)
+    #   <%= f.input :publish_at, :as => :date_picker, :maxlength => 20 %>
+    #   <%= f.input :publish_at, :as => :date_picker, :input_html => { :maxlength => 20 } %>
+    #
+    # @example Setting the value (defaults to YYYY-MM-DD for Date and Time objects, otherwise renders string)
+    #   <%= f.input :publish_at, :as => :date_picker, :input_html => { :value => "1970-01-01" } %>
+    #
+    # @example Setting the step attribute (defaults to 1)
+    #   <%= f.input :publish_at, :as => :date_picker, :step => 7 %>
+    #   <%= f.input :publish_at, :as => :date_picker, :input_html => { :step => 7 } %>
+    #
+    # @example Setting the step attribute with a macro
+    #   <%= f.input :publish_at, :as => :date_picker, :step => :day %>
+    #   <%= f.input :publish_at, :as => :date_picker, :step => :week %>
+    #   <%= f.input :publish_at, :as => :date_picker, :step => :seven_days %>
+    #   <%= f.input :publish_at, :as => :date_picker, :step => :fortnight %>
+    #   <%= f.input :publish_at, :as => :date_picker, :step => :two_weeks %>
+    #   <%= f.input :publish_at, :as => :date_picker, :step => :four_weeks %>
+    #   <%= f.input :publish_at, :as => :date_picker, :step => :thirty_days %>
+    #
+    # @example Setting the min attribute
+    #   <%= f.input :publish_at, :as => :date_picker, :min => "2012-01-01" %>
+    #   <%= f.input :publish_at, :as => :date_picker, :input_html => { :min => "2012-01-01" } %>
+    #
+    # @example Setting the max attribute
+    #   <%= f.input :publish_at, :as => :date_picker, :max => "2012-12-31" %>
+    #   <%= f.input :publish_at, :as => :date_picker, :input_html => { :max => "2012-12-31" } %>
+    #
+    # @example Setting the placeholder attribute
+    #   <%= f.input :publish_at, :as => :date_picker, :placeholder => 20 %>
+    #   <%= f.input :publish_at, :as => :date_picker, :input_html => { :placeholder => "YYYY-MM-DD" } %>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
+    class DatePickerInput
+      include Base
+      include Base::Stringish
+      include Base::DatetimePickerish
+      
+      def html_input_type
+        "date"
+      end
+      
+      def default_size
+        10
+      end
+      
+      def value
+        return options[:input_html][:value] if options[:input_html] && options[:input_html].key?(:value)
+        val = object.send(method)
+        return Date.new(val.year, val.month, val.day).to_s if val.is_a?(Time)
+        return val if val.nil?
+        val.to_s
+      end
+      
+    end
+  end
+end

data/lib/formtastic/inputs/date_select_input.rb

@@ -0,0 +1,34 @@
+module Formtastic
+  module Inputs
+    # Outputs a series of select boxes for the fragments that make up a date (year, month, day).
+    #
+    # @see Formtastic::Inputs::Base::Timeish Timeish module for documentation of date, time and datetime input options.
+    class DateSelectInput 
+      include Base
+      include Base::Timeish
+      
+      # We don't want hour and minute fragments on a date input
+      def time_fragments
+        []
+      end
+      
+      def hidden_date_fragments
+        default_date_fragments - date_fragments
+      end
+
+      def hidden_fragments
+        hidden_date_fragments.map do |fragment|
+          template.hidden_field_tag(hidden_field_name(fragment), fragment_value(fragment), :id => fragment_id(fragment), :disabled => input_html_options[:disabled] )
+        end.join.html_safe
+      end
+
+      def fragment_value(fragment)
+        if fragment == :year
+          Time.now.year
+        else
+          '1'
+        end
+      end      
+    end
+  end
+end

data/lib/formtastic/inputs/datetime_input.rb

@@ -1,12 +1,10 @@
 module Formtastic
   module Inputs
-
-    # Outputs a series of select boxes for the fragments that make up a date and time (year, month, day, hour, minute, second).
-    #
-    # @see Formtastic::Inputs::Base::Timeish Timeish module for documentation of date, time and datetime input options.
-    class DatetimeInput 
-      include Base
-      include Base::Timeish
+    class DatetimeInput < DatetimeSelectInput
+      def to_html
+        ::ActiveSupport::Deprecation.warn("DatetimeInput (:as => :datetime) has been renamed to DatetimeSelectInput (:as => :datetime_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
+        super
+      end
     end
   end
-end
+end

data/lib/formtastic/inputs/datetime_picker_input.rb

@@ -0,0 +1,100 @@
+module Formtastic
+  module Inputs
+    
+    # Outputs a simple `<label>` with a HTML5 `<input type="datetime-local">` (or 
+    # `<input type="datetime">`) wrapped in the standard `<li>` wrapper. This is an alternative to 
+    # `:date_select` for `:date`, `:time`, `:datetime` database columns. You can use this input with
+    # `:as => :datetime_picker`.
+    #
+    # *Please note:* Formtastic only provides suitable markup for a date picker, but does not supply
+    # any additional CSS or Javascript to render calendar-style date pickers. Browsers that support
+    # this input type (such as Mobile Webkit and Opera on the desktop) will render a native widget.
+    # Browsers that don't will default to a plain text field`<input type="text">` and can be 
+    # poly-filled with some Javascript and a UI library of your choice.
+    #
+    # @example Full form context and output
+    #
+    #   <%= semantic_form_for(@post) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :publish_at, :as => :datetime_picker %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="string">
+    #           <label for="post_publish_at">First name</label>
+    #           <input type="date" id="post_publish_at" name="post[publish_at]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @example Setting the size (defaults to 16 for YYYY-MM-DD HH:MM)
+    #   <%= f.input :publish_at, :as => :datetime_picker, :size => 20 %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :input_html => { :size => 20 } %>
+    #
+    # @example Setting the maxlength (defaults to 16 for YYYY-MM-DD HH:MM)
+    #   <%= f.input :publish_at, :as => :datetime_picker, :maxlength => 20 %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :input_html => { :maxlength => 20 } %>
+    #
+    # @example Setting the value (defaults to YYYY-MM-DD HH:MM for Date and Time objects, otherwise renders string)
+    #   <%= f.input :publish_at, :as => :datetime_picker, :input_html => { :value => "1970-01-01 00:00" } %>
+    #
+    # @example Setting the step attribute (defaults to 1)
+    #   <%= f.input :publish_at, :as => :datetime_picker, :step => 60 %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :input_html => { :step => 60 } %>
+    #
+    # @example Setting the step attribute with a macro
+    #   <%= f.input :publish_at, :as => :datetime_picker, :step => :second %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :step => :minute %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :step => :quarter_hour %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :step => :fifteen_minutes %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :step => :half_hour %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :step => :thirty_minutes %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :step => :hour %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :step => :sixty_minutes %>
+    #
+    # @example Setting the min attribute
+    #   <%= f.input :publish_at, :as => :datetime_picker, :min => "2012-01-01 09:00" %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :input_html => { :min => "2012-01-01 09:00" } %>
+    #
+    # @example Setting the max attribute
+    #   <%= f.input :publish_at, :as => :datetime_picker, :max => "2012-12-31 16:00" %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :input_html => { :max => "2012-12-31 16:00" } %>
+    #
+    # @example Setting the placeholder attribute
+    #   <%= f.input :publish_at, :as => :datetime_picker, :placeholder => "YYYY-MM-DD HH:MM" %>
+    #   <%= f.input :publish_at, :as => :datetime_picker, :input_html => { :placeholder => "YYYY-MM-DD HH:MM" } %>
+    #
+    # @example Using `datetime` (UTC) or `datetime-local` with `:local` (defaults to true, `datetime-local` input)
+    #   <%= f.input :publish_at, :as => :datetime_picker, :local => false %>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
+    class DatetimePickerInput
+      include Base
+      include Base::Stringish
+      include Base::DatetimePickerish
+      
+      def html_input_type
+        options[:local] = true unless options.key?(:local)
+        options[:local] ? "datetime-local" : "datetime"
+      end
+      
+      def default_size
+        16
+      end
+      
+      def value
+        return options[:input_html][:value] if options[:input_html] && options[:input_html].key?(:value)
+        val = object.send(method)
+        return val.strftime("%Y-%m-%d %H:%M") if val.is_a?(Time)
+        return "#{val.year}-#{val.month}-#{val.day} 00:00" if val.is_a?(Date)
+        return val if val.nil?
+        val.to_s
+      end
+      
+    end
+  end
+end

data/lib/formtastic/inputs/datetime_select_input.rb

@@ -0,0 +1,12 @@
+module Formtastic
+  module Inputs
+
+    # Outputs a series of select boxes for the fragments that make up a date and time (year, month, day, hour, minute, second).
+    #
+    # @see Formtastic::Inputs::Base::Timeish Timeish module for documentation of date, time and datetime input options.
+    class DatetimeSelectInput 
+      include Base
+      include Base::Timeish
+    end
+  end
+end

data/lib/formtastic/inputs/hidden_input.rb

@@ -34,7 +34,7 @@ module Formtastic
       # Override to include :value set directly from options hash. The :value set in :input_html 
       # hash will be preferred over :value set directly in the options.
       #
-      # @todo this is inconsistent with all other inputs, deprecate and remove
+      # @deprecated :value option
       def input_html_options
         options.slice(:value).merge(super).merge(:required => nil).merge(:autofocus => nil)
       end

data/lib/formtastic/inputs/radio_input.rb

@@ -20,7 +20,7 @@ module Formtastic
     #
     # * a `:string` input (where you want to force the user to choose from a few specific strings rather than entering anything)
     # * a `:boolean` checkbox input (where the user could choose yes or no, rather than checking a box)
-    # * a `:date`, `:time` or `:datetime` input (where the user could choose from a small set of pre-determined dates)
+    # * a `:date_select`, `:time_select` or `:datetime_select` input (where the user could choose from a small set of pre-determined dates)
     # * a `:number` input (where the user could choose from a small set of pre-defined numbers)
     # * a `:time_zone` input (where you want to provide your own small set of choices instead of relying on Rails)
     # * a `:country` input (where you want to provide a small set of choices, no need for a plugin really)

data/lib/formtastic/inputs/select_input.rb

@@ -17,7 +17,7 @@ module Formtastic
     #
     # * a `:string` input (where you want to force the user to choose from a few specific strings rather than entering anything)
     # * a `:boolean` checkbox input (where the user could choose yes or no, rather than checking a box)
-    # * a `:date`, `:time` or `:datetime` input (where the user could choose from pre-selected dates)
+    # * a `:date_select`, `:time_select` or `:datetime_select` input (where the user could choose from pre-selected dates)
     # * a `:number` input (where the user could choose from a set of pre-defined numbers)
     # * a `:time_zone` input (where you want to provide your own set of choices instead of relying on Rails)
     # * a `:country` input (no need for a plugin really)
@@ -132,9 +132,6 @@ module Formtastic
     #   <%= f.input :author, :as => :select, :prompt => "Please select an author" %>
     #
     #
-    # @example Group options an `<optgroup>` with the `:group_by` and `:group_label` options (`belongs_to` associations only)
-    #   <%= f.input :author, :as => :select, :group_by => :continent %>
-    #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     # @see Formtastic::Inputs::CheckBoxesInput CheckBoxesInput as an alternative for `has_many` and `has_and_belongs_to_many` associations
     # @see Formtastic::Inputs::RadioInput RadioInput as an alternative for `belongs_to` associations
@@ -195,7 +192,7 @@ module Formtastic
       end
 
       def input_html_options
-        extra_input_html_options.merge(super)
+        extra_input_html_options.merge(super.reject {|k,v| k==:name && v.nil?} )
       end
       
       def extra_input_html_options

data/lib/formtastic/inputs/time_input.rb

@@ -1,34 +1,10 @@
 module Formtastic
   module Inputs
-    # Outputs a series of select boxes for the fragments that make up a time (hour, minute, second).
-    # Unless `:ignore_date` is true, it will render hidden inputs for the year, month and day as 
-    # well, defaulting to `Time.current` if the form object doesn't have a value, much like Rails' 
-    # own `time_select`.
-    #
-    # @see Formtastic::Inputs::Base::Timeish Timeish module for documentation of date, time and datetime input options.
-    class TimeInput 
-      include Base
-      include Base::Timeish
-      
-      # we don't want year / month / day fragments if :ignore_date => true
-      def fragments
-        time_fragments
+    class TimeInput < TimeSelectInput
+      def to_html
+        ::ActiveSupport::Deprecation.warn("TimeInput (:as => :time) has been renamed to TimeSelectInput (:as => :time_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
+        super
       end
-      
-      def fragment_value(fragment)
-        value ? value.send(fragment) : ""
-      end
-      
-      def hidden_fragments
-        if !options[:ignore_date]
-          date_fragments.map do |fragment|
-            template.hidden_field_tag(hidden_field_name(fragment), fragment_value(fragment), :id => fragment_id(fragment), :disabled => input_html_options[:disabled] )
-          end.join.html_safe
-        else
-          super
-        end
-      end
-      
     end
   end
 end