formtastic 0.9.2 → 0.9.3

data/spec/inputs_spec.rb

@@ -174,9 +174,12 @@ describe 'SemanticFormBuilder#inputs' do
       describe 'and is a string' do
         before do
           @legend_text = "Advanced options"
-          @legend_text_using_title = "Advanced options 2"
+          @legend_text_using_name = "Advanced options 2"
+          @legend_text_using_title = "Advanced options 3"
           semantic_form_for(@new_post) do |builder|
-            builder.inputs :name => @legend_text do
+            builder.inputs @legend_text do
+            end
+            builder.inputs :name => @legend_text_using_name do
             end
             builder.inputs :title => @legend_text_using_title do
             end
@@ -184,34 +187,40 @@ describe 'SemanticFormBuilder#inputs' do
         end
 
         it 'should render a fieldset with a legend inside the form' do
-          output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
-          output_buffer.should have_tag("form fieldset legend", /#{@legend_text_using_title}/)
+          output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
+          output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
+          output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_title}$/)
         end
       end
       
       describe 'and is a symbol' do
         before do
           @localized_legend_text = "Localized advanced options"
-          @localized_legend_text_using_title = "Localized advanced options 2"
-          I18n.backend.store_translations :en, :formtastic => {
+          @localized_legend_text_using_name = "Localized advanced options 2"
+          @localized_legend_text_using_title = "Localized advanced options 3"
+          ::I18n.backend.store_translations :en, :formtastic => {
               :titles => {
                   :post => {
                       :advanced_options => @localized_legend_text,
-                      :advanced_options_2 => @localized_legend_text_using_title
+                      :advanced_options_using_name => @localized_legend_text_using_name,
+                      :advanced_options_using_title => @localized_legend_text_using_title
                     }
                 }
             }
           semantic_form_for(@new_post) do |builder|
-            builder.inputs :name => :advanced_options do
+            builder.inputs :advanced_options do
+            end
+            builder.inputs :name => :advanced_options_using_name do
             end
-            builder.inputs :title => :advanced_options_2 do
+            builder.inputs :title => :advanced_options_using_title do
             end
           end
         end
 
         it 'should render a fieldset with a localized legend inside the form' do
-          output_buffer.should have_tag("form fieldset legend", /#{@localized_legend_text}/)
-          output_buffer.should have_tag("form fieldset legend", /#{@localized_legend_text_using_title}/)
+          output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
+          output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
+          output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_title}$/)
         end
       end
     end
@@ -238,9 +247,8 @@ describe 'SemanticFormBuilder#inputs' do
   describe 'without a block' do
 
     before do
-      ::Post.stub!(:reflections).and_return({:author   => mock('reflection', :options => {}, :macro => :belongs_to),
+      ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to),
                                            :comments => mock('reflection', :options => {}, :macro => :has_many) })
-      ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
       ::Author.stub!(:find).and_return([@fred, @bob])
 
       @new_post.stub!(:title)
@@ -352,12 +360,15 @@ describe 'SemanticFormBuilder#inputs' do
     describe 'with column names and an options hash as args' do
       before do
         semantic_form_for(@new_post) do |builder|
-          concat(builder.inputs(:title, :body, :name => "Legendary Legend Text", :id => "my-id"))
+          @legend_text_using_option = "Legendary Legend Text"
+          @legend_text_using_arg = "Legendary Legend Text 2"
+          concat(builder.inputs(:title, :body, :name => @legend_text_using_option, :id => "my-id"))
+          concat(builder.inputs(@legend_text_using_arg, :title, :body, :id => "my-id-2"))
         end
       end
 
       it 'should render a form with a fieldset containing two list items' do
-        output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 4)
       end
 
       it 'should pass the options down to the fieldset' do
@@ -365,7 +376,8 @@ describe 'SemanticFormBuilder#inputs' do
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.should have_tag('form > fieldset#my-id.inputs > legend', /Legendary Legend Text/)
+        output_buffer.should have_tag('form > fieldset#my-id.inputs > legend', /^#{@legend_text_using_option}$/)
+        output_buffer.should have_tag('form > fieldset#my-id-2.inputs > legend', /^#{@legend_text_using_arg}$/)
       end
     end
 

data/spec/label_spec.rb

@@ -16,12 +16,6 @@ describe 'SemanticFormBuilder#label' do
     end
   end
 
-  it 'should be printed as span' do
-    semantic_form_for(@new_post) do |builder|
-      builder.label(:login, nil, { :required => true, :as_span => true }).should have_tag('span.label abbr')
-    end
-  end
-
   describe 'when required is given' do
     it 'should append a required note' do
       semantic_form_for(@new_post) do |builder|

data/spec/semantic_fields_for_spec.rb

@@ -14,7 +14,7 @@ describe 'SemanticFormBuilder#semantic_fields_for' do
   it 'yields an instance of SemanticFormHelper.builder' do  
     semantic_form_for(@new_post) do |builder|
       builder.semantic_fields_for(:author) do |nested_builder|
-        nested_builder.class.should == Formtastic::SemanticFormHelper.builder
+        nested_builder.class.should == ::Formtastic::SemanticFormHelper.builder
       end
     end
   end

data/spec/spec_helper.rb

@@ -27,9 +27,8 @@ Spec::Runner.configure do |config|
   config.include(CustomMacros)
 end
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
 
-require 'formtastic'
 
 module FormtasticSpecHelper
   include ActionView::Helpers::FormHelper
@@ -116,6 +115,7 @@ module FormtasticSpecHelper
     ::Author.stub!(:human_name).and_return('::Author')
     ::Author.stub!(:reflect_on_validations_for).and_return([])
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
+    ::Author.stub!(:content_columns).and_return([mock('column', :name => 'login'), mock('column', :name => 'created_at')])
 
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
@@ -153,11 +153,13 @@ module FormtasticSpecHelper
       end
     end
     ::Post.stub!(:find).and_return([@freds_post])
+    ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
     
     @new_post.stub!(:title)
     @new_post.stub!(:body)
     @new_post.stub!(:published)
     @new_post.stub!(:publish_at)
+    @new_post.stub!(:created_at)
     @new_post.stub!(:secret)
     @new_post.stub!(:time_zone)
     @new_post.stub!(:category_name)

metadata

@@ -1,18 +1,67 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Justin French
-autorequire: formtastic
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 +11:00
+date: 2009-11-23 00:00:00 +11:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec_hpricot_matchers
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 description: A Rails form builder plugin/gem with semantically rich and accessible markup
 email: justin@indent.com.au
 executables: []
@@ -35,6 +84,7 @@ files:
 - generators/formtastic/templates/formtastic_changes.css
 - generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb
 - lib/formtastic.rb
+- lib/formtastic/i18n.rb
 - lib/locale/en.yml
 - rails/init.rb
 - spec/buttons_spec.rb
@@ -44,6 +94,7 @@ files:
 - spec/error_proc_spec.rb
 - spec/errors_spec.rb
 - spec/form_helper_spec.rb
+- spec/i18n_spec.rb
 - spec/include_blank_spec.rb
 - spec/input_spec.rb
 - spec/inputs/boolean_input_spec.rb
@@ -70,7 +121,7 @@ has_rdoc: true
 homepage: http://github.com/justinfrench/formtastic/tree/master
 licenses: []
 
-post_install_message: "\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    ./script/generate formtastic\n\n  Find out more and get involved:\n    http://github.com/justinfrench/formtastic\n    http://groups.google.com.au/group/formtastic\n  ========================================================================\n  "
+post_install_message: "\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    ./script/generate formtastic\n\n  To generate some semantic form markup for your exisiting models, just run:\n    ./script/generate form MODEL_NAME\n\n  Find out more and get involved:\n    http://github.com/justinfrench/formtastic\n    http://groups.google.com.au/group/formtastic\n  ========================================================================\n  "
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -102,6 +153,7 @@ test_files:
 - spec/error_proc_spec.rb
 - spec/errors_spec.rb
 - spec/form_helper_spec.rb
+- spec/i18n_spec.rb
 - spec/include_blank_spec.rb
 - spec/input_spec.rb
 - spec/inputs/boolean_input_spec.rb