formtastic 2.0.0.rc1 → 2.0.0.rc2

data/CHANGELOG

@@ -1,3 +1,7 @@
+2.0.0.rc2
+
+* Fixed that the checkbox was mistakenly placed after the label text in BooleanInput, not before it as per 1.x
+
 2.0.0.rc1
 
 * Removed the "inline_order" configuration (redefine input_wrapping instead)

data/README.textile

@@ -97,13 +97,13 @@ Simply add Formtastic to your Gemfile and bundle it up:
   gem 'formtastic', '~> 1.2.3'
 </pre>
 
-If you want to try out our work towards Formtastic 2.0 (Rails >= 3 only), bundle in Formtastic directly from Github with the @:git@ option instead:
+If you want to try out our work towards Formtastic 2.0 (Rails 3.x only):
 
 <pre>
-  gem 'formtastic', :git => 'http://github.com/justinfrench/formtastic', :branch => 'master'
+  gem 'formtastic', '2.0.0.rc1'
 </pre>
 
-Optionally, run the generator to copy a stylesheet (Rails 3.0.x only) and a configuration initializer into your application:
+Run the installation generator to copy a stylesheet (Rails 3.0.x only) and a configuration initializer into your application:
 
 <pre>
   $ rails generate formtastic:install 
@@ -536,52 +536,6 @@ h2. Configuration
 Run @rails generate formtastic:install@ to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/lib/generators/templates/formtastic.rb
 
 
-h2. Form Generator
-
-There's a Formtastic form code generator to make your transition to Formtastic easier. All you have to do is to *specify an existing model name*, and optionally specify view template framework (ERB/HAML), and you are good to go. *Note:* This won't overwrite any of your exsting files without confirmation.
-
-h3. Basic usage
-
-<pre>
-  $ rails generate formtastic:form ModelName
-      exists  app/views/posts
-      create  app/views/posts/_form.html.erb
-</pre>
-
-The ERB code is saved to a partial file, but it will not overwrite existing files without a prompt.
-
-h3. Copying the ERB code to the clipboard instead with @--copy@
-
-<pre>
-  $ rails generate formtastic:form Post --copy
-</pre>
-
-h3. Specifying HAML instead of ERB with @--haml@
-
-<pre>
-  $ rails generate formtastic:form Post --haml
-      exists  app/views/posts
-      create  app/views/posts/_form.html.haml
-</pre>
-
-h3. Specifying controller namespace with @--controller@
-
-<pre>
-  $ rails generate formtastic:form Post --controller admin/posts
-      exists  app/views/admin/posts
-      create  app/views/admin/posts/_form.html.erb
-</pre>
-
-h3. Specifying which attributes need an input
-
-<pre>
-  $ rails generate formtastic:form Post title:string body:text publication_state:select
-      exists  app/views/posts
-      create  app/views/posts/_form.html.erb
-</pre>
-
-
-
 h2. Modified & Custom Inputs
 
 If you want to change the behaviour of an input, you can subclass it in your app. For example, to tweak @StringInput@, create a new file @app/inputs/string_input.rb@:

data/formtastic.gemspec

@@ -5,7 +5,7 @@ require "formtastic/version"
 Gem::Specification.new do |s|
   s.name        = %q{formtastic}
   s.version     = Formtastic::VERSION
-  s.date        = %q{2011-06-09}
+  s.date        = %q{2011-06-13}
   s.platform    = Gem::Platform::RUBY
   s.authors     = [%q{Justin French}]
   s.email       = [%q{justin@indent.com.au}]

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

@@ -1,6 +1,90 @@
 module Formtastic
   module Inputs
     module Base
+      # Timeish inputs (`:date`, `:datetime`, `:time`) are similar to the Rails date and time 
+      # helpers (`date_select`, `datetime_select`, `time_select`), rendering a series of `<select>`
+      # tags for each fragment (year, month, day, hour, minute, seconds). The fragments are then 
+      # re-combined to a date by ActiveRecord through multi-parameter assignment.
+      #
+      # The mark-up produced by Rails is simple but far from ideal, with no way to label the 
+      # individual fragments for accessibility, no fieldset to group the related fields, and no
+      # legend describing the group. Formtastic addresses this within the standard `<li>` wrapper 
+      # with a `<fieldset>` with a `<legend>` as a label, followed by an ordered list (`<ol>`) of 
+      # list items (`<li>`), one for each fragment (year, month, ...). Each `<li>` fragment contains
+      # a `<label>` (eg "Year") for the fragment, and a `<select>` containing `<option>`s (eg a 
+      # range of years).
+      #
+      # In the supplied formtastic.css file, the resulting mark-up is styled to appear a lot like a
+      # standard Rails date time select by:
+      #
+      # * styling the legend to look like the other labels (to the left hand side of the selects)
+      # * floating the `<li>` fragments against each other as a single line
+      # * hiding the `<label>` of each fragment with `display:none`
+      #
+      # @example `:date` input with full form context and sample HTMl output
+      #
+      #   <%= semantic_form_for(@post) do |f| %>
+      #     <%= f.inputs do %>
+      #       ...
+      #       <%= f.input :publish_at, :as => :date %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   <form...>
+      #     <fieldset class="inputs">
+      #       <ol>
+      #         <li class="date">
+      #           <fieldset class="fragments">
+      #             <ol class="fragments-group">
+      #               <li class="fragment">
+      #                 <label for="post_publish_at_1i">Year</label>
+      #                 <select id="post_publish_at_1i" name="post[publish_at_1i]">...</select>
+      #               </li>
+      #               <li class="fragment">
+      #                 <label for="post_publish_at_2i">Month</label>
+      #                 <select id="post_publish_at_2i" name="post[publish_at_2i]">...</select>
+      #               </li>
+      #               <li class="fragment">
+      #                 <label for="post_publish_at_3i">Day</label>
+      #                 <select id="post_publish_at_3i" name="post[publish_at_3i]">...</select>
+      #               </li>
+      #             </ol>
+      #           </fieldset>
+      #         </li>
+      #       </ol>
+      #     </fieldset>
+      #   </form>
+      #       
+      #
+      # @example `:time` input
+      #   <%= f.input :publish_at, :as => :time %>
+      #
+      # @example `:datetime` input
+      #   <%= f.input :publish_at, :as => :datetime %>
+      #
+      # @example Change the labels for each fragment
+      #   <%= f.input :publish_at, :as => :date, :labels => { :year => "Y", :month => "M", :day => "D" }  %>
+      #
+      # @example Skip a fragment (defaults to 1, skips all following fragments)
+      #   <%= f.input :publish_at, :as => :datetime, :discard_minute => true  %>
+      #   <%= f.input :publish_at, :as => :datetime, :discard_hour => true  %>
+      #   <%= f.input :publish_at, :as => :datetime, :discard_day => true  %>
+      #   <%= f.input :publish_at, :as => :datetime, :discard_month => true  %>
+      #   <%= f.input :publish_at, :as => :datetime, :discard_year => true  %>
+      #
+      # @example Change the order
+      #   <%= f.input :publish_at, :as => :date, :order => [:month, :day, :year]  %>
+      #
+      # @example Include seconds with times (excluded by default)
+      #   <%= f.input :publish_at, :as => :time, :include_seconds => true %>
+      #
+      # @example Specify if there should be a blank option at the start of each select or not
+      #   <%= f.input :publish_at, :as => :time, :include_blank=> true %>
+      #   <%= f.input :publish_at, :as => :time, :include_blank=> false %>
+      #
+      # @todo Document i18n
+      # @todo Check what other Rails options are supported (`start_year`, `end_year`, `use_month_numbers`, `use_short_month`, `add_month_numbers`, `prompt`), write tests for them, and otherwise support them
+      # @todo Could we take the rendering from Rails' helpers and inject better HTML in and around it rather than re-inventing the whee?
       module Timeish
         
         def to_html

data/lib/formtastic/inputs/boolean_input.rb

@@ -64,7 +64,7 @@ module Formtastic
       end
 
       def label_text_with_embedded_checkbox
-        label_text << " " << check_box_html
+        check_box_html << "" << label_text
       end
 
       def check_box_html

data/lib/formtastic/inputs/date_input.rb

@@ -1,5 +1,7 @@
 module Formtastic
   module Inputs
+    # Outputs a series of select boxes for the fragments that make up a date (year, month, day).
+    #
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class DateInput 
       include Base

data/lib/formtastic/inputs/datetime_input.rb

@@ -1,5 +1,8 @@
 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::Timeish Timeish module for documetation of date, time and datetime input options.
     class DatetimeInput 
       include Base

data/lib/formtastic/inputs/select_input.rb

@@ -175,7 +175,7 @@ module Formtastic
       end
       
       def input_options
-        {:include_blank => include_blank?}.merge(super)
+        super.merge({:include_blank => include_blank?, :prompt => nil})
       end
       
       def input_html_options

data/lib/formtastic/inputs/time_input.rb

@@ -1,5 +1,7 @@
 module Formtastic
   module Inputs
+    # Outputs a series of select boxes for the fragments that make up a time (hour, minute, second).
+    #
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class TimeInput 
       include Base

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

data/spec/inputs/select_input_spec.rb

@@ -418,7 +418,7 @@ describe 'select input' do
     end
 
     it 'should have a select with prompt' do
-      output_buffer.should have_tag("form li select option[@value='']", /choose author/)
+      output_buffer.should have_tag("form li select option[@value='']", /choose author/, :count => 1)
     end
 
     it 'should not have a blank select option' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  hash: 977940590
+  hash: 977940591
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - rc1
-  version: 2.0.0.rc1
+  - rc2
+  version: 2.0.0.rc2
 platform: ruby
 authors: 
 - Justin French
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 +10:00
+date: 2011-06-13 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency