formtastic 0.2.5 → 0.9.0

data/README.textile

@@ -79,32 +79,31 @@ RDoc documentation _should_ be automatically generated after each commit and mad
 
 h2. Installation
 
-You can and should get it as a gem:
+The gem is hosted on gemcutter, so if you haven't already, add it as a gem source:
 
 <pre>
-  gem install justinfrench-formtastic
+  sudo gem sources -a http://gemcutter.org/
 </pre>
 
-And then add it as a dependency in your environment.rb file:
+Then install the Formtastic gem:q
 
 <pre>
-  config.gem "justinfrench-formtastic", 
-    :lib     => 'formtastic', 
-    :source  => 'http://gems.github.com'
+  sudo gem install formtastic
 </pre>
 
-If you want, run the generator to copy the following files into your app:
+Optionally, run @./script/generate formtastic@ to copy the following files into your app:
 
 * config/initializers/formtastic.rb (a commented out Formtastic config initializer)
 * public/stylesheets/formtastic.css
 * public/stylesheets/formtastic_changes.css
 
+A proof-of-concept stylesheet is provided which you can include in your layout.  Customization is best achieved by overriding these styles in an additional stylesheet so that the Formtastic styles can be updated without clobbering your changes.  If you want to use these stylesheets, add both to your layout:
+
 <pre>
-  ./script/generate formtastic
+  <%= stylesheet_link_tag "formtastic" %>
+  <%= stylesheet_link_tag "formtastic_changes" %>
 </pre>
 
-See also "What about Stylesheets?"
-
 
 h2. Usage
 
@@ -260,6 +259,7 @@ h2. Internationalization (I18n)
 
 Formtastic got some neat I18n-features. ActiveRecord object names and attributes are, by default, taken from calling @object.human_name and @object.human_attribute_name(attr) respectively. There are a few words specific to Formtastic that can be translated. See lib/locale/en.yml for more information.
 
+
 h3. Label/Hint-localization
 
 Formtastic supports localized *labels* and *hints* using the I18n API for more advanced usage. Your forms can now be DRYer and more flexible than ever, and still fully localized. This is how:
@@ -397,75 +397,20 @@ For more flexible forms; Formtastic find translations using a bottom-up approach
 
 *Note:* For @title@: ATTRIBUTE is a KEY chosen by you, e.g. in step 4 example above: @:post_details@.
 
+
 h2. ValidationReflection plugin
 
 If you have the "ValidationReflection":http://github.com/redinger/validation_reflection plugin installed, you won't have to specify the :required option (it checks the validations on the model instead).
 
-h2. Configuration
 
-If you wish, put something like this in config/initializers/formtastic_config.rb:
+h2. Configuration
 
-<pre>
-  # Set the default text field size when input is a string. Default is 50
-  Formtastic::SemanticFormBuilder.default_text_field_size = 30
+Run @./script/generate formtastic@ 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/generators/formtastic/templates/formtastic.rb
 
-  # Should all fields be considered "required" by default
-  # Defaults to true, see ValidationReflection notes below
-  Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
-  
-  # Set the string that will be appended to the labels/fieldsets which are required
-  # It accepts string or procs and the default is a localized version of
-  # '<abbr title="required">*</abbr>'. In other words, if you configure formtastic.required
-  # in your locale, it will replace the abbr title properly. But if you don't want to use
-  # abbr tag, you can simply give a string as below
-  Formtastic::SemanticFormBuilder.required_string = "(required)"
-  
-  # Set the string that will be appended to the labels/fieldsets which are optional
-  # Defaults to an empty string ("") and also accepts procs (see required_string above)
-  Formtastic::SemanticFormBuilder.optional_string = "(optional)"
-
-  # Set the way inline errors will be displayed.
-  # Defaults to :sentence, valid options are :sentence, :list and :none
-  Formtastic::SemanticFormBuilder.inline_errors = :list
-
-  # Set the method to call on label text to transform or format it for human-friendly
-  # reading when formtastic is user without object. Defaults to :humanize.
-  Formtastic::SemanticFormBuilder.label_str_method = :titleize
-
-  # Set the array of methods to try calling on parent objects in :select and :radio inputs
-  # for the text inside each @<option>@ tag or alongside each radio @<input>@.  The first method
-  # that is found on the object will be used.
-  # Defaults to ["to_label", "display_name", "full_name", "name", "title", "username", "login", "value", "to_s"]
-  Formtastic::SemanticFormBuilder.collection_label_methods = ["title_and_author", "display_name", "login", "to_s"]
-
-  # Formtastic by default renders inside li tags the input, hints and then
-  # errors messages. Sometimes you want the hints to be rendered first than
-  # the input, in the following order: hints, input and errors. You can
-  # customize it doing just as below:
-  Formtastic::SemanticFormBuilder.inline_order = [:hints, :input, :errors]
-  
-  # Set the default "priority countries" to suit your user base when using :as => :country
-  Formtastic::SemanticFormBuilder.priority_countries = ["Australia", "New Zealand"]
-  
-  # Specifies if labels/hints for input fields automatically be looked up using I18n.
-  # Default value: false. Overridden for specific fields by setting value to true,
-  # i.e. :label => true, or :hint => true (or opposite depending on initialized value)
-  # Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
-  
-  # If you want to subclass SemanticFormBuilder to add/change the behavior to suit your needs, you
-  # can specify the builder class.
-  # Formtastic::SemanticFormHelper.builder = MyCustomBuilder
-</pre>
 
 h2. Status
 
-*THINGS ARE GOING TO CHANGE A BIT BEFORE WE HIT 1.0.*
-
-It's a work in progress and a bit rough around the edges still, but I hope you try it and offer some suggestions and improvements anyway.
-
-On the plus side, it has a comprehensive spec suite and contributions from at least ten independent developers.
-
-"Wishlist":http://wiki.github.com/justinfrench/formtastic/wishlist on the wiki is serving as pretty good documentation for the roadmap to 1.0 and beyond right now, but I'll work on getting a real tracking system or something happening soon.
+Formtastic has been in active development for about a year.  We've just recently jumped to an 0.9 version number, signalling that we consider this a 1.0 release candidate, and that the API won't change significantly for the 1.x series.
 
 
 h2. Dependencies
@@ -482,30 +427,13 @@ h2. Compatibility
 I'm only testing Formtastic with the latest Rails 2.2.x stable release, and it should be fine under Rails 2.3 as well (including nested forms).  Patches are welcome to allow backwards compatibility, but I don't have the energy!
 
 
-
-h2. What about Stylesheets?
-
-A proof-of-concept (very much a work-in-progress) stylesheet is provided which you can include in your layout.  Customization is best achieved by overriding these styles in an additional stylesheet so that the Formtastic styles can be updated without clobbering your changes.
-
-1. Use the generator to copy the formtastic.css and formtastic_changes.css into your public directory
-
-<pre>
-./script/generate formtastic_stylesheets
-</pre>
-
-2. Add both formtastic.css and formtastic_changes.css to your layout:
-
-<pre>
-<%= stylesheet_link_tag "formtastic" %>
-<%= stylesheet_link_tag "formtastic_changes" %>
-</pre>
-
 h2. Got TextMate?
 
 Well...there's a TextMate-bundle in town, dedicated to make usage of Formtastic in the TextMate editor even more of a breeze:
 
 "Formtastic.tmbundle":http://github.com/grimen/formtastic_tmbundle
 
+
 h2. Contributors
 
 Formtastic is maintained by "Justin French":http://justinfrench.com and "José Valim":http://github.com/josevalim, but it wouldn't be as awesome as it is today if it weren't for the wonderful contributions of these fine, fine coders.

data/Rakefile

@@ -11,8 +11,31 @@ begin
   EMAIL = "justin@indent.com.au"
   SUMMARY = "A Rails form builder plugin/gem with semantically rich and accessible markup"
   HOMEPAGE = "http://github.com/justinfrench/formtastic/tree/master"
+  INSTALL_MESSAGE = %q{
+  ========================================================================
+
+  Thanks for installing Formtastic!
+    
+  You can now (optionally) run the generater to copy some stylesheets and
+  a config initializer into your application:
+  
+    ./script/generate formtastic
+    
+  The following files will be added:
+  
+    RAILS_ROOT/public/stylesheets/formtastic.css
+    RAILS_ROOT/public/stylesheets/formtastic_changes.css
+    RAILS_ROOT/config/initializers/formtastic.rb
+  
+  Find out more and get involved:
+
+    http://github.com/justinfrench/formtastic
+    http://groups.google.com.au/group/formtastic
+  
+  ========================================================================
+  }
   
-  gem 'technicalpickles-jeweler', '>= 1.0.0'
+  gem 'jeweler', '>= 1.0.0'
   require 'jeweler'
   
   Jeweler::Tasks.new do |s|
@@ -22,6 +45,7 @@ begin
     s.homepage = HOMEPAGE
     s.description = SUMMARY
     s.author = AUTHOR
+    s.post_install_message = INSTALL_MESSAGE
     
     s.require_path = 'lib'
     s.autorequire = GEM

data/generators/formtastic/formtastic_generator.rb

@@ -1,4 +1,4 @@
-class FormtasticConfigGenerator < Rails::Generator::Base
+class FormtasticGenerator < Rails::Generator::Base
   
   def initialize(*runtime_args)
     super

data/generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb

@@ -0,0 +1,16 @@
+class FormtasticStylesheetsGenerator < Rails::Generator::Base
+  
+  def initialize(*runtime_args)
+    puts %q{
+===================================================
+Please run `./script/generate formtastic` instead.
+===================================================
+  }
+  end
+  
+  def manifest
+    record do |m|
+    end
+  end
+  
+end

data/lib/formtastic.rb

@@ -87,6 +87,7 @@ module Formtastic #:nodoc:
 
       html_class = [ options[:as], (options[:required] ? :required : :optional) ]
       html_class << 'error' if @object && @object.respond_to?(:errors) && !@object.errors[method.to_sym].blank?
+      html_class << method.to_s
 
       wrapper_html = options.delete(:wrapper_html) || {}
       wrapper_html[:id]  ||= generate_html_id(method)

data/spec/formtastic_spec.rb

@@ -986,6 +986,7 @@ describe 'Formtastic' do
               output_buffer.should have_tag("form li.string")
               output_buffer.should have_tag("form li.required")
               output_buffer.should have_tag("form li.another_class")
+              output_buffer.should have_tag("form li.title")
             end
 
             it 'should allow classes to be an array' do
@@ -995,6 +996,7 @@ describe 'Formtastic' do
               output_buffer.should have_tag("form li.string")
               output_buffer.should have_tag("form li.my_class")
               output_buffer.should have_tag("form li.another_class")
+              output_buffer.should have_tag("form li.title")
             end
           end
 
@@ -1005,6 +1007,7 @@ describe 'Formtastic' do
               end
               output_buffer.should have_tag("form li#post_title_input")
               output_buffer.should have_tag("form li.string")
+              output_buffer.should have_tag("form li.title")
             end
           end
 
@@ -2697,6 +2700,12 @@ describe 'Formtastic' do
         end
 
         describe 'when a :for option is provided' do
+          
+          before do
+            @new_post.stub!(:respond_to?).and_return(true, true)
+            @new_post.stub!(:author).and_return(@bob)
+          end
+          
           it 'should render nested inputs' do
             @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
@@ -2706,9 +2715,49 @@ describe 'Formtastic' do
               end
             end
 
-            output_buffer.should have_tag("form fieldset.inputs #post_author_login")
+            output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
             output_buffer.should_not have_tag("form fieldset.inputs #author_login")
+
           end
+          
+          describe "as a symbol representing the association name" do
+            
+            it 'should nest the inputs with an _attributes suffix on the association name' do
+              semantic_form_for(@new_post) do |post|
+                post.inputs :for => :author do |author|
+                  concat(author.input(:login))
+                end
+              end
+              output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
+            end
+            
+          end
+          
+          describe 'as an array containing the a symbole for the association name and the associated object' do
+            
+            it 'should nest the inputs with an _attributes suffix on the association name' do
+              semantic_form_for(@new_post) do |post|
+                post.inputs :for => [:author, @new_post.author] do |author|
+                  concat(author.input(:login))
+                end
+              end
+              output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
+            end
+            
+          end
+            
+          describe 'as an associated object' do
+            
+            it 'should not nest the inputs with an _attributes suffix' do
+              semantic_form_for(@new_post) do |post|
+                post.inputs :for => @new_post.author do |author|
+                  concat(author.input(:login))
+                end
+              end
+              output_buffer.should have_tag("form input[@name='post[author][login]']")
+            end
+            
+          end 
 
           it 'should raise an error if :for and block with no argument is given' do
             semantic_form_for(@new_post) do |builder|
@@ -2730,7 +2779,7 @@ describe 'Formtastic' do
               end
             end
 
-            output_buffer.should have_tag('form fieldset ol li #post_author_10_login')
+            output_buffer.should have_tag('form fieldset ol li #post_author_attributes_10_login')
           end
 
           it 'should not add builder as a fieldset attribute tag' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.9.0
 platform: ruby
 authors: 
 - Justin French
@@ -9,7 +9,7 @@ autorequire: formtastic
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 +11:00
+date: 2009-10-21 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - generators/formtastic/templates/formtastic.css
 - generators/formtastic/templates/formtastic.rb
 - generators/formtastic/templates/formtastic_changes.css
+- generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb
 - lib/formtastic.rb
 - lib/justin_french/formtastic.rb
 - lib/locale/en.yml
@@ -43,7 +44,7 @@ has_rdoc: true
 homepage: http://github.com/justinfrench/formtastic/tree/master
 licenses: []
 
-post_install_message: 
+post_install_message: "\n  ========================================================================\n\n  Thanks for installing Formtastic!\n    \n  You can now (optionally) run the generater to copy some stylesheets and\n  a config initializer into your application:\n  \n    ./script/generate formtastic\n    \n  The following files will be added:\n  \n    RAILS_ROOT/public/stylesheets/formtastic.css\n    RAILS_ROOT/public/stylesheets/formtastic_changes.css\n    RAILS_ROOT/config/initializers/formtastic.rb\n  \n  Find out more and get involved:\n\n    http://github.com/justinfrench/formtastic\n    http://groups.google.com.au/group/formtastic\n  \n  ========================================================================\n  "
 rdoc_options: 
 - --charset=UTF-8
 require_paths: