formtastic 0.9.2 → 0.9.3

data/README.textile

@@ -148,7 +148,7 @@ If you want to customize the label text, or render some hint text below the fiel
 
 <pre>
   <% semantic_form_for @post do |form| %>
-    <% form.inputs :name => "Basic", :id => "basic" do %>
+    <% form.inputs "Basic", :id => "basic" do %>
       <%= form.input :title %>
       <%= form.input :body %>
     <% end %>
@@ -324,11 +324,11 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
 
 *4. Localized titles (a.k.a. legends):*
 
-_Note: Slightly different because Formtastic can't guess how you group fields in a form._
+_Note: Slightly different because Formtastic can't guess how you group fields in a form. Legend text can be set with first (as in the sample below) specified value, or :name/:title options - depending on what flavor is preferred._
 
 <pre>
   <% semantic_form_for @post do |form| %>
-    <% form.inputs :title => :post_details do %>   # => :title => "Post details"
+    <% form.inputs :post_details do %>   # => :title => "Post details"
       # ...
     <% end %>
     # ...
@@ -416,6 +416,38 @@ h2. Configuration
 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
 
 
+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 you stuff. This is how you use it:
+
+*Alt. 1: Generate in terminal:*
+
+<pre>
+$ ./script/generate form Post
+# ---------------------------------------------------------
+#  GENERATED FORMTASTIC CODE
+# ---------------------------------------------------------
+
+<% form.inputs do %>
+  <%= form.input :title, :label => 'Title' %>
+  <%= form.input :body, :label => 'Body' %>
+  <%= form.input :published, :label => 'Published' %>
+<% end %>
+
+# ---------------------------------------------------------
+ Copied to clipboard - just paste it!
+</pre>
+
+*Alt. 2: Generate partial:*
+
+<pre>
+$ ./script/generate form Post --partial
+      exists  app/views/posts
+      create  app/views/posts/_form.html.erb
+</pre>
+
+To generate *HAML* markup, just add the @--haml@ as argument: @./script/generate form Post --haml@
+
 h2. Custom Inputs
 
 If you want to add your own input types to encapsulate your own logic or interface patterns, you can do so by subclassing SemanticFormBuilder and configuring Formtastic to use your custom builder class.
@@ -441,7 +473,6 @@ h2. Compatibility
 
 I'm only testing Formtastic with the latest Rails 2.4.x stable release, and it should be fine under Rails 2.3.x as well (including nested forms). Patches are welcome to allow backwards compatibility, but I don't have the energy!
 
-
 h2. Got TextMate?
 
 Well...there's a TextMate-bundle in town, dedicated to make usage of Formtastic in the "TextMate":http://macromates.com/ editor even more of a breeze:

data/Rakefile

@@ -2,8 +2,16 @@
 require 'rake'
 require 'rake/rdoctask'
 
-gem 'rspec-rails', '>= 1.0.0'
-require 'spec/rake/spectask'
+begin
+  require 'spec/rake/spectask'
+rescue LoadError
+  begin
+    gem 'rspec-rails', '>= 1.0.0'
+    require 'spec/rake/spectask'
+  rescue LoadError
+    puts "[formtastic:] RSpec - or one of it's dependencies - is not available. Install it with: sudo gem install rspec-rails"
+  end
+end
 
 begin
   GEM = "formtastic"
@@ -14,11 +22,14 @@ begin
   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
 
+  To generate some semantic form markup for your exisiting models, just run:
+    ./script/generate form MODEL_NAME
+
   Find out more and get involved:
     http://github.com/justinfrench/formtastic
     http://groups.google.com.au/group/formtastic
@@ -38,28 +49,28 @@ begin
     s.post_install_message = INSTALL_MESSAGE
     
     s.require_path = 'lib'
-    s.autorequire = GEM
     s.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{rails,lib,generators,spec}/**/*")
+    
+    # Runtime dependencies: When installing Formtastic these will be checked if they are installed.
+    # Will be offered to install these if they are not already installed.
+    s.add_dependency 'activesupport', '>= 2.3.0'
+    s.add_dependency 'actionpack', '>= 2.3.0'
+    
+    # Development dependencies. Not installed by default.
+    # Install with: sudo gem install formtastic --development
+    s.add_development_dependency 'rspec-rails', '>= 1.2.6'
+    s.add_development_dependency 'hpricot', '>= 0.6.1' # for: rspec_hpricot_matchers
+    s.add_development_dependency 'rspec_hpricot_matchers', '>= 1.0.0'
   end
+  
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "[formtastic:] Jeweler - or one of it's dependencies - is not available. Install it with: sudo gem install jeweler -s http://gemcutter.org"
 end
 
 desc 'Default: run unit specs.'
 task :default => :spec
 
-desc 'Test the formtastic plugin.'
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["-c"]
-end
-
-desc 'Test the formtastic plugin with specdoc formatting and colors'
-Spec::Rake::SpecTask.new('specdoc') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["--format specdoc", "-c"]
-end
-
 desc 'Generate documentation for the formtastic plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -69,9 +80,23 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec,Library']
+if defined?(Spec)
+  desc 'Test the formtastic plugin.'
+  Spec::Rake::SpecTask.new('spec') do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ["-c"]
+  end
+
+  desc 'Test the formtastic plugin with specdoc formatting and colors'
+  Spec::Rake::SpecTask.new('specdoc') do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ["--format specdoc", "-c"]
+  end
+
+  desc "Run all examples with RCov"
+  Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec,Library']
+  end
 end

data/generators/formtastic/templates/formtastic.css

@@ -64,6 +64,7 @@ form.formtastic fieldset ol li li label input { line-height:100%; vertical-align
 form.formtastic fieldset ol li fieldset { position:relative; }
 form.formtastic fieldset ol li fieldset legend { position:absolute; width:25%; padding-top:0.1em; }
 form.formtastic fieldset ol li fieldset legend span { position:absolute; }
+form.formtastic fieldset ol li fieldset legend.label label { position:absolute; }
 form.formtastic fieldset ol li fieldset ol { float:left; width:74%; margin:0; padding:0 0 0 25%; }
 form.formtastic fieldset ol li fieldset ol li { padding:0; border:0; }
 

data/lib/formtastic/i18n.rb

@@ -0,0 +1,27 @@
+module Formtastic
+  module I18n
+    
+    DEFAULT_SCOPE = [:formtastic].freeze
+    DEFAULT_VALUES = {
+        :required       => 'required',
+        :yes            => 'Yes',
+        :no             => 'No',
+        :create         => 'Create {{model}}',
+        :update         => 'Update {{model}}'
+      }.freeze
+    
+    class << self
+      
+      def translate(*args)
+        key = args.shift.to_sym
+        options = args.extract_options!
+        options.reverse_merge!(:default => DEFAULT_VALUES[key])
+        options[:scope] = [DEFAULT_SCOPE, options[:scope]].flatten.compact
+        ::I18n.translate(key, *(args << options))
+      end
+      alias :t :translate
+      
+    end
+    
+  end
+end