formtastic 2.0.2 → 2.1.0.beta1

data/spec/support/test_environment.rb

@@ -9,7 +9,6 @@ RSpec.configure do |config|
 end
 
 require "action_controller/railtie"
-require "active_resource/railtie"
 require 'active_model'
 
 # Create a simple rails application for use in testing the viewhelper

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
+  hash: 62196465
+  prerelease: 6
   segments: 
   - 2
+  - 1
   - 0
-  - 2
-  version: 2.0.2
+  - beta
+  - 1
+  version: 2.1.0.beta1
 platform: ruby
 authors: 
 - Justin French
@@ -15,11 +17,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 +11:00
+date: 2012-01-15 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: actionpack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -41,11 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 47
         segments: 
         - 2
-        - 5
-        version: "2.5"
+        - 8
+        - 0
+        version: 2.8.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -139,6 +142,64 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: ammeter
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
+        version: 0.2.2
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: appraisal
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
 description: A Rails form builder plugin/gem with semantically rich and accessible markup
 email: 
 - justin@indent.com.au
@@ -153,6 +214,7 @@ files:
 - .rspec
 - .travis.yml
 - .yardopts
+- Appraisals
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
@@ -163,10 +225,21 @@ files:
 - app/assets/stylesheets/formtastic_ie6.css
 - app/assets/stylesheets/formtastic_ie7.css
 - formtastic.gemspec
+- gemfiles/rails-3.0.gemfile
+- gemfiles/rails-3.1.gemfile
+- gemfiles/rails-3.2.gemfile
 - lib/formtastic.rb
+- lib/formtastic/actions.rb
+- lib/formtastic/actions/base.rb
+- lib/formtastic/actions/button_action.rb
+- lib/formtastic/actions/buttonish.rb
+- lib/formtastic/actions/input_action.rb
+- lib/formtastic/actions/link_action.rb
 - lib/formtastic/engine.rb
 - lib/formtastic/form_builder.rb
 - lib/formtastic/helpers.rb
+- lib/formtastic/helpers/action_helper.rb
+- lib/formtastic/helpers/actions_helper.rb
 - lib/formtastic/helpers/buttons_helper.rb
 - lib/formtastic/helpers/errors_helper.rb
 - lib/formtastic/helpers/fieldset_wrapper.rb
@@ -175,7 +248,6 @@ files:
 - lib/formtastic/helpers/input_helper.rb
 - lib/formtastic/helpers/inputs_helper.rb
 - lib/formtastic/helpers/reflection.rb
-- lib/formtastic/helpers/semantic_form_helper.rb
 - lib/formtastic/html_attributes.rb
 - lib/formtastic/i18n.rb
 - lib/formtastic/inputs.rb
@@ -191,7 +263,9 @@ files:
 - lib/formtastic/inputs/base/html.rb
 - lib/formtastic/inputs/base/labelling.rb
 - lib/formtastic/inputs/base/naming.rb
+- lib/formtastic/inputs/base/numeric.rb
 - lib/formtastic/inputs/base/options.rb
+- lib/formtastic/inputs/base/placeholder.rb
 - lib/formtastic/inputs/base/stringish.rb
 - lib/formtastic/inputs/base/timeish.rb
 - lib/formtastic/inputs/base/validations.rb
@@ -205,7 +279,6 @@ files:
 - lib/formtastic/inputs/file_input.rb
 - lib/formtastic/inputs/hidden_input.rb
 - lib/formtastic/inputs/number_input.rb
-- lib/formtastic/inputs/numeric_input.rb
 - lib/formtastic/inputs/password_input.rb
 - lib/formtastic/inputs/phone_input.rb
 - lib/formtastic/inputs/radio_input.rb
@@ -218,10 +291,10 @@ files:
 - lib/formtastic/inputs/time_zone_input.rb
 - lib/formtastic/inputs/url_input.rb
 - lib/formtastic/localized_string.rb
-- lib/formtastic/railtie.rb
-- lib/formtastic/semantic_form_builder.rb
+- lib/formtastic/localizer.rb
 - lib/formtastic/util.rb
 - lib/formtastic/version.rb
+- lib/generators/formtastic/form/form_generator.rb
 - lib/generators/formtastic/install/install_generator.rb
 - lib/generators/templates/_form.html.erb
 - lib/generators/templates/_form.html.haml
@@ -232,10 +305,17 @@ files:
 - sample/basic_inputs.html
 - sample/config.ru
 - sample/index.html
+- spec/actions/button_action_spec.rb
+- spec/actions/generic_action_spec.rb
+- spec/actions/input_action_spec.rb
+- spec/actions/link_action_spec.rb
 - spec/builder/custom_builder_spec.rb
 - spec/builder/error_proc_spec.rb
-- spec/builder/errors_spec.rb
 - spec/builder/semantic_fields_for_spec.rb
+- spec/generators/formtastic/form/form_generator_spec.rb
+- spec/generators/formtastic/install/install_generator_spec.rb
+- spec/helpers/action_helper_spec.rb
+- spec/helpers/actions_helper_spec.rb
 - spec/helpers/buttons_helper_spec.rb
 - spec/helpers/commit_button_helper_spec.rb
 - spec/helpers/form_helper_spec.rb
@@ -256,7 +336,6 @@ files:
 - spec/inputs/include_blank_spec.rb
 - spec/inputs/label_spec.rb
 - spec/inputs/number_input_spec.rb
-- spec/inputs/numeric_input_spec.rb
 - spec/inputs/password_input_spec.rb
 - spec/inputs/phone_input_spec.rb
 - spec/inputs/placeholder_spec.rb
@@ -269,6 +348,7 @@ files:
 - spec/inputs/time_input_spec.rb
 - spec/inputs/time_zone_input_spec.rb
 - spec/inputs/url_input_spec.rb
+- spec/inputs/with_options_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/custom_macros.rb
@@ -310,10 +390,17 @@ signing_key:
 specification_version: 3
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup
 test_files: 
+- spec/actions/button_action_spec.rb
+- spec/actions/generic_action_spec.rb
+- spec/actions/input_action_spec.rb
+- spec/actions/link_action_spec.rb
 - spec/builder/custom_builder_spec.rb
 - spec/builder/error_proc_spec.rb
-- spec/builder/errors_spec.rb
 - spec/builder/semantic_fields_for_spec.rb
+- spec/generators/formtastic/form/form_generator_spec.rb
+- spec/generators/formtastic/install/install_generator_spec.rb
+- spec/helpers/action_helper_spec.rb
+- spec/helpers/actions_helper_spec.rb
 - spec/helpers/buttons_helper_spec.rb
 - spec/helpers/commit_button_helper_spec.rb
 - spec/helpers/form_helper_spec.rb
@@ -334,7 +421,6 @@ test_files:
 - spec/inputs/include_blank_spec.rb
 - spec/inputs/label_spec.rb
 - spec/inputs/number_input_spec.rb
-- spec/inputs/numeric_input_spec.rb
 - spec/inputs/password_input_spec.rb
 - spec/inputs/phone_input_spec.rb
 - spec/inputs/placeholder_spec.rb
@@ -347,6 +433,7 @@ test_files:
 - spec/inputs/time_input_spec.rb
 - spec/inputs/time_zone_input_spec.rb
 - spec/inputs/url_input_spec.rb
+- spec/inputs/with_options_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/custom_macros.rb

data/lib/formtastic/helpers/semantic_form_helper.rb

@@ -1,11 +0,0 @@
-module Formtastic
-  # Quick hack/shim for anything expecting the old SemanticFormHelper module.
-  # TODO remove from 2.0 with a helpful upgrade path/warning.
-  # @private
-  module SemanticFormHelper
-    include Formtastic::Helpers::FormHelper
-    @@builder = Formtastic::Helpers::FormHelper.builder
-    @@default_form_class = Formtastic::Helpers::FormHelper.default_form_class
-    mattr_accessor :builder, :default_form_class
-  end
-end

data/lib/formtastic/inputs/numeric_input.rb

@@ -1,21 +0,0 @@
-module Formtastic
-  module Inputs
-    # Alias for NumberInput for backwards compatibility with 1.x.
-    # 
-    # @example:
-    #   f.input :age, :as => :numeric
-    #
-    # @deprecated Use :as => :number instead
-    #
-    # @todo Remove on or after 2.1
-    class NumericInput < NumberInput
-      
-      def initialize(builder, template, object, object_name, method, options)
-        ActiveSupport::Deprecation.warn(':as => :numeric has been deprecated in favor of :as => :number and will be removed on or after version 2.1', caller)
-        super
-      end
-      
-    end
-  end
-end
-

data/lib/formtastic/railtie.rb

@@ -1,12 +0,0 @@
-# encoding: utf-8
-
-module Formtastic
-  # @private
-  class Railtie < Rails::Railtie
-    initializer 'formtastic.initialize' do
-      ActiveSupport.on_load(:action_view) do
-        include Formtastic::Helpers::FormHelper
-      end
-    end
-  end
-end

data/lib/formtastic/semantic_form_builder.rb

@@ -1,11 +0,0 @@
-module Formtastic
-  # Quick hack/shim so that any code expecting the old SemanticFormBuilder class still works.
-  # TODO remove from 2.0 with a helpful upgrade path/warning.
-  # @private
-  class SemanticFormBuilder < Formtastic::FormBuilder
-    def initialize(*args)
-      ActiveSupport::Deprecation.warn('Formtastic::SemanticFormBuilder has been deprecated in favor of Formtastic::FormBuilder.', caller)
-      super
-    end
-  end
-end

data/spec/builder/errors_spec.rb

@@ -1,203 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe 'Formtastic::FormBuilder#errors_on' do
-
-  include FormtasticSpecHelper
-
-  before do
-    @output_buffer = ''
-    mock_everything
-    @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
-    @errors = mock('errors')
-    @new_post.stub!(:errors).and_return(@errors)
-  end
-
-  describe 'when there are errors' do
-    before do
-      @errors.stub!(:[]).with(:title).and_return(@title_errors)
-    end
-
-    after do
-      Formtastic::FormBuilder.default_inline_error_class = 'inline-errors'
-      Formtastic::FormBuilder.default_error_list_class = 'errors'
-    end
-
-    it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence' do
-      Formtastic::FormBuilder.inline_errors = :sentence
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title
-      end)
-      output_buffer.should have_tag('p.inline-errors', @title_errors.to_sentence)
-    end
-
-    it 'should render a paragraph with a overridden default class' do
-      Formtastic::FormBuilder.inline_errors = :sentence
-      Formtastic::FormBuilder.default_inline_error_class = 'better-errors'
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title)
-      end)
-      output_buffer.should have_tag('p.better-errors', @title_errors.to_sentence)
-    end
-
-    it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence with a customized error class' do
-      Formtastic::FormBuilder.inline_errors = :sentence
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :error_class => 'better-errors')
-      end)
-      output_buffer.should have_tag('p.better-errors', @title_errors.to_sentence)
-    end
-
-    it 'should render an unordered list with the class errors when inline_errors config is :list' do
-      Formtastic::FormBuilder.inline_errors = :list
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title)
-      end)
-      output_buffer.should have_tag('ul.errors')
-      @title_errors.each do |error|
-        output_buffer.should have_tag('ul.errors li', error)
-      end
-    end
-
-    it 'should render an unordered list with the class overridden default class' do
-      Formtastic::FormBuilder.inline_errors = :list
-      Formtastic::FormBuilder.default_error_list_class = "better-errors"
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title
-      end)
-      output_buffer.should have_tag('ul.better-errors')
-      @title_errors.each do |error|
-        output_buffer.should have_tag('ul.better-errors li', error)
-      end
-    end
-
-    it 'should render an unordered list with the class errors when inline_errors config is :list with a customized error class' do
-      Formtastic::FormBuilder.inline_errors = :list
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title, :error_class => "better-errors"
-      end)
-      output_buffer.should have_tag('ul.better-errors')
-      @title_errors.each do |error|
-        output_buffer.should have_tag('ul.better-errors li', error)
-      end
-    end
-
-    it 'should render a paragraph with the first error when inline_errors config is :first' do
-      Formtastic::FormBuilder.inline_errors = :first
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title
-      end)
-      output_buffer.should have_tag('p.inline-errors', @title_errors.first)
-      
-    end
-
-    it 'should render a paragraph with the first error when inline_errors config is :first with a customized error class' do
-      Formtastic::FormBuilder.inline_errors = :first
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title, :error_class => "better-errors"
-      end)
-      output_buffer.should have_tag('p.better-errors', @title_errors.first)
-    end
-
-    it 'should return nil when inline_errors config is :none' do
-      Formtastic::FormBuilder.inline_errors = :none
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title
-      end)
-      output_buffer.should_not have_tag('p.inine-errors')
-      output_buffer.should_not have_tag('ul.errors')
-    end
-    
-    it 'should allow calling deprecated errors_on and inline_errors_for helpers' do
-      Formtastic::FormBuilder.inline_errors = :sentence
-      with_deprecation_silenced do
-        concat(semantic_form_for(@new_post) do |builder|
-          builder.errors_on :title
-          builder.inline_errors_for :title
-        end)
-      end
-    end
-
-  end
-
-  describe 'when there are no errors (nil)' do
-    before do
-      @errors.stub!(:[]).with(:title).and_return(nil)
-    end
-
-    it 'should return nil when inline_errors config is :sentence, :list or :none' do
-      with_deprecation_silenced do
-        [:sentence, :list, :none].each do |config|
-          with_config :inline_errors, config do
-            semantic_form_for(@new_post) do |builder|
-              builder.errors_on(:title).should be_nil
-            end
-          end
-        end
-      end
-    end
-  end
-
-  describe 'when there are no errors (empty array)' do
-    before do
-      @errors.stub!(:[]).with(:title).and_return([])
-    end
-
-    it 'should return nil when inline_errors config is :sentence, :list or :none' do
-      with_deprecation_silenced do
-        [:sentence, :list, :none].each do |config|
-          Formtastic::FormBuilder.inline_errors = config
-          semantic_form_for(@new_post) do |builder|
-            builder.errors_on(:title).should be_nil
-          end
-        end
-      end
-    end
-  end
-
-  describe 'when file type columns have errors' do
-    it "should list errors added on metadata fields" do
-      @errors.stub!(:[]).with(:document_file_name).and_return(['must be provided'])
-      @errors.stub!(:[]).with(:document_file_size).and_return(['must be less than 4mb'])
-      @errors.stub!(:[]).with(:document_content_type).and_return(['must be an image'])
-      @errors.stub!(:[]).with(:document).and_return(nil)
-
-      with_config :inline_errors, :sentence do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:document))
-        end)
-      end 
-      output_buffer.should have_tag("li.error")
-      output_buffer.should have_tag('p.inline-errors', (['must be an image','must be provided', 'must be less than 4mb']).to_sentence)
-    end
-  end
-
-  describe 'when there are errors on the association and column' do
-
-    it "should list all unique errors" do
-      ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to)})
-
-      @errors.stub!(:[]).with(:author).and_return(['must not be blank'])
-      @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
-
-      with_config :inline_errors, :list do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:author))
-        end)
-      end
-      output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
-      output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
-    end
-
-  end
-
-  describe "when there are errors on a has_many association" do
-    it "should include the association ids error messages" do
-      semantic_form_for(@new_post) do |builder|
-        builder.send(:error_keys, :sub_posts, {}).should include(:sub_post_ids)
-      end
-    end
-  end
-
-end
-