formtastic 2.0.0.rc3 → 2.0.0.rc4

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+env:
+  - DEFER_GC=false

data/CHANGELOG

@@ -1,3 +1,29 @@
+2.0.0.rc4
+
+* Fixed that TimeInput was not rendering hidden y/m/d inputs by default.
+* Fixed test suite under Rails 3.1.0.rc5
+* Fixed false and blank fragment labels on date/time inputs producing unsafe HTML.
+* Fixed that inputs were 'required' withput considering `:on => :create` validations
+* Fixed that collections of strings in CheckBoxesInput were ot being correctly checked be checked if they match the model
+* Fixed that the required attribute was added to the choices in a :radio or :check_boxes input, instead of just the parent input wrapper
+* Fixed semantic_fields_for when used with a hash-like model
+* Fixed that models without defined validations (even if validators_on exists) should not be considered required
+* Fixed min/max attributes when the validation uses a Proc
+* Fixed that inputs should not be considered required if :allow_blank => true is set on validates_inclusion_of
+* Fixed that inputs should not be considered required if if either :allow_blank => true, :minimum is > 0, or :within's least value is > 0 is set on validates_length_of 
+* Fixed a typo in the config template
+* Fixed semantic_fields_for to work with Rails 3 *and* 3.1's method sigs (I hope), many thanks to the simple_form guys for figuring this out
+* Changed HTML5 `step` attribute to default to "any" instead of "1"
+* Added CarrierWave support for to file input detection
+* Added a configuration 'perform_browser_validations' to opt out of HTML5 browser validations.
+* Added more support for mongo documents, including MongoMapper-specific reflection capability
+* Added IE specific stylesheets & moved those styles out of main stylesheet, include them yourself if needed
+* Added a new configuration to opt out of HTML5 required attribute
+
+2.0.0.rc3
+
+* Fixed that .label class was incorrectly applied to <label> tags inside a .choice on radio and checkbox inputs (#599)
+
 2.0.0.rc2
 
 * Fixed install instructions in readme to reflect 2.0.0.rc1

data/Gemfile

@@ -1,3 +1,5 @@
 source :rubygems
 
+gem 'rake', '< 0.9'
+
 gemspec

data/README.textile

@@ -586,7 +586,6 @@ h2. Dependencies
 
 There are none, but...
 
-* if you have the "ValidationReflection":http://github.com/redinger/validation_reflection plugin is installed, you won't have to specify the @:required@ option (it checks the validations on the model instead).
 * if you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/chrislerum/country_select (or any other country_select plugin with the same API).
 * "rspec":http://github.com/dchelimsky/rspec/, "rspec_hpricot_matchers":http://rubyforge.org/projects/rspec-hpricot/ and "rcov":http://github.com/relevance/rcov gems (plus any of their own dependencies) are required for the test suite.
 

data/RELEASE_PROCESS

@@ -1,5 +1,4 @@
 # edit version.rb
-# edit gemspec release date
 git ci formtastic.gemspec -m "new gemspec" # commit changes
 git tag X.X.X                              # tag the new version in the code base too
 gem build formtastic.gemspec               # build the gem

data/Rakefile

@@ -44,7 +44,7 @@ end
 
 RCov::VerifyTask.new(:verify_coverage) do |t|
   t.require_exact_threshold = false
-  t.threshold = 95
+  t.threshold = (RUBY_VERSION == "1.8.7" ? 95 : 0)
 end
 
 desc "Run all examples and verify coverage"

data/app/assets/stylesheets/formtastic.css

@@ -83,7 +83,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* BUTTONS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .buttons {
-  overflow:hidden; zoom:1; /* clear containing floats */
+  overflow:hidden; /* clear containing floats */
   padding-left:25%;
 }
 
@@ -96,11 +96,11 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* INPUTS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .inputs {
-  overflow:hidden; zoom:1; /* clear containing floats */
+  overflow:hidden; /* clear containing floats */
 }
 
 .formtastic .input {
-  overflow:hidden; zoom:1; /* clear containing floats */
+  overflow:hidden; /* clear containing floats */
   padding:0.5em 0; /* padding and negative margin juggling is for Firefox */
   margin-top:-0.5em;
   margin-bottom:1em;

data/app/assets/stylesheets/formtastic_ie6.css

@@ -24,4 +24,10 @@
 /* fragment (eg year, month, day) appear a few pixels too far to the left*/
 .formtastic .fragment {
   padding-left:3px;
-}
+}
+
+.formtastic .buttons,
+.formtastic .inputs,
+.formtastic .input {
+  zoom:1;
+}

data/app/assets/stylesheets/formtastic_ie7.css

@@ -14,4 +14,10 @@
   size:15px;
   margin-left:0;
   margin-right:0;
-}
+}
+
+.formtastic .buttons,
+.formtastic .inputs,
+.formtastic .input {
+  zoom:1;
+}

data/formtastic.gemspec

@@ -17,21 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.post_install_message = %q{
-  ========================================================================
-  Thanks for installing Formtastic!
-  ------------------------------------------------------------------------
-  You can now (optionally) run the generator to copy a config initializer 
-  (and some stylesheets, in Rails 3.0.x) into your application:
-    rails generate formtastic:install
-
-  Find out more and get involved:
-    http://github.com/justinfrench/formtastic
-    http://rdoc.info/github/justinfrench/formtastic/master/frames
-    http://groups.google.com.au/group/formtastic
-    http://twitter.com/formtastic
-  ========================================================================
-  }
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = ["README.textile"]
 

data/lib/formtastic/form_builder.rb

@@ -28,6 +28,8 @@ module Formtastic
     configure :default_inline_error_class, 'inline-errors'
     configure :default_error_list_class, 'errors'
     configure :default_hint_class, 'inline-hints'
+    configure :use_required_attribute, true
+    configure :perform_browser_validations, true
 
     attr_reader :template
 

data/lib/formtastic/helpers/errors_helper.rb

@@ -89,6 +89,28 @@ module Formtastic
       
 
       protected
+      
+      # @deprecated This should be removed with inline_errors_for in 2.1
+      def error_sentence(errors, options = {})
+        error_class = options[:error_class] || default_inline_error_class
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
+      end
+      
+      # @deprecated This should be removed with inline_errors_for in 2.1
+      def error_list(errors, options = {})
+        error_class = options[:error_class] || default_error_list_class
+        list_elements = []
+        errors.each do |error|
+          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
+        end
+        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
+      end
+      
+      # @deprecated This should be removed with inline_errors_for in 2.1
+      def error_first(errors, options = {})
+        error_class = options[:error_class] || default_inline_error_class
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
+      end
 
       def error_keys(method, options)
         @methods_for_error ||= {}

data/lib/formtastic/helpers/form_helper.rb

@@ -140,24 +140,10 @@ module Formtastic
       #
       # @option *args [String] :namespace
       def semantic_form_for(record_or_name_or_array, *args, &proc)
-        form_helper_wrapper(:form_for, record_or_name_or_array, *args, &proc)
-      end
-
-      # Wrapper around Rails' own `fields_for` helper to set the `:builder` option to
-      # `Formtastic::FormBuilder`.
-      #
-      # @see #semantic_form_for
-      def semantic_fields_for(record_or_name_or_array, *args, &proc)
-        form_helper_wrapper(:fields_for, record_or_name_or_array, *args, &proc)
-      end
-
-      protected
-
-      # @todo pretty sure some of this (like HTML classes and record naming are exlusive to `form_for`)
-      def form_helper_wrapper(rails_helper_method_name, record_or_name_or_array, *args, &proc)
         options = args.extract_options!
         options[:builder] ||= @@builder
         options[:html] ||= {}
+        options[:html][:novalidate] = !builder.perform_browser_validations unless options[:html].key?(:novalidate)
         @@builder.custom_namespace = options[:namespace].to_s
 
         singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
@@ -172,10 +158,26 @@ module Formtastic
         options[:html][:class] = class_names.join(" ")
 
         with_custom_field_error_proc do
-          self.send(rails_helper_method_name, record_or_name_or_array, *(args << options), &proc)
+          self.form_for(record_or_name_or_array, *(args << options), &proc)
         end
       end
 
+      # Wrapper around Rails' own `fields_for` helper to set the `:builder` option to
+      # `Formtastic::FormBuilder`.
+      #
+      # @see #semantic_form_for
+      def semantic_fields_for(record_name, record_object = nil, options = {}, &block)
+        options, record_object = record_object, nil if record_object.is_a?(Hash) && record_object.extractable_options?
+        options[:builder] ||= @@builder
+        @@builder.custom_namespace = options[:namespace].to_s # TODO needed?
+
+        with_custom_field_error_proc do
+          self.fields_for(record_name, record_object, options, &block)
+        end
+      end
+      
+      protected
+
       # Override the default ActiveRecordHelper behaviour of wrapping the input.
       # This gets taken care of semantically by adding an error class to the LI tag
       # containing the input.

data/lib/formtastic/helpers/input_helper.rb

@@ -267,6 +267,9 @@ module Formtastic
       
       protected
       
+      # First try if we can detect special things like :file. With CarrierWave the method does have
+      # an underlying column so we don't want :string to get selected.
+      #
       # For methods that have a database column, take a best guess as to what the input method
       # should be.  In most cases, it will just return the column type (eg :string), but for special
       # cases it will simplify (like the case of :integer, :float & :decimal to :number), or do
@@ -275,6 +278,12 @@ module Formtastic
       # If there is no column for the method (eg "virtual columns" with an attr_accessor), the
       # default is a :string, a similar behaviour to Rails' scaffolding.
       def default_input_type(method, options = {}) #:nodoc:
+        if @object
+          return :select  if reflection_for(method)
+
+          return :file    if is_file?(method, options)
+        end
+
         if column = column_for(method)
           # Special cases where the column type doesn't map to an input method.
           case column.type
@@ -300,12 +309,6 @@ module Formtastic
           # Try 3: Assume the input name will be the same as the column type (e.g. string_input).
           return column.type
         else
-          if @object
-            return :select  if reflection_for(method)
-
-            return :file    if is_file?(method, options)
-          end
-
           return :select    if options.key?(:collection)
           return :password  if method.to_s =~ /password/
           return :string
@@ -363,4 +366,3 @@ module Formtastic
     end
   end
 end
-      

data/lib/formtastic/helpers/inputs_helper.rb

@@ -314,9 +314,17 @@ module Formtastic
       end
       
       def fieldset_contents_from_column_list(columns)
-        columns.collect do |method| 
-          if @object && (@object.class.reflect_on_association(method.to_sym) && @object.class.reflect_on_association(method.to_sym).options[:polymorphic] == true)
-            raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
+        columns.collect do |method|
+          if @object
+            if @object.class.respond_to?(:reflect_on_association)
+              if (@object.class.reflect_on_association(method.to_sym) && @object.class.reflect_on_association(method.to_sym).options[:polymorphic] == true)
+                raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
+              end
+            elsif @object.class.respond_to?(:associations)
+              if (@object.class.associations(method.to_sym) && @object.class.associations(method.to_sym).options[:polymorphic] == true)
+                raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
+              end            
+            end            
           end
           input(method.to_sym)
         end

data/lib/formtastic/helpers/reflection.rb

@@ -5,7 +5,11 @@ module Formtastic
       # If an association method is passed in (f.input :author) try to find the
       # reflection object.
       def reflection_for(method) #:nodoc:
-        @object.class.reflect_on_association(method) if @object.class.respond_to?(:reflect_on_association)
+        if @object.class.respond_to?(:reflect_on_association)
+          @object.class.reflect_on_association(method) 
+        elsif @object.class.respond_to?(:associations) # MongoMapper uses the 'associations(method)' instead
+          @object.class.associations(method) 
+        end
       end
 
       def association_macro_for_method(method) #:nodoc:

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

@@ -87,6 +87,13 @@ module Formtastic
             object.send(duck)
           end
         end
+        
+        # Avoids an issue where `send_or_call` can be a String and duck can be something simple like
+        # `:first`, which obviously String responds to.
+        def send_or_call_or_object(duck, object)
+          return object if object.is_a?(String) # TODO what about other classes etc?
+          send_or_call(duck, object)
+        end
       
       end
     end

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

@@ -21,7 +21,7 @@ module Formtastic
         def input_html_options
           { 
             :id => dom_id,
-            :required => required?,
+            :required => required_attribute?,
             :autofocus => autofocus?
           }.merge(options[:input_html] || {})
         end

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

@@ -90,6 +90,7 @@ module Formtastic
         def to_html
           input_wrapping do
             fragments_wrapping do
+              hidden_fragments <<
               fragments_label <<
               template.content_tag(:ol,
                 fragments.map do |fragment|
@@ -147,7 +148,7 @@ module Formtastic
         
         def fragment_label_html(fragment)
           text = fragment_label(fragment)
-          text.blank? ? "" : template.content_tag(:label, text, :for => fragment_id(fragment))
+          text.blank? ? "".html_safe : template.content_tag(:label, text, :for => fragment_id(fragment))
         end
         
         def value
@@ -196,7 +197,7 @@ module Formtastic
               :class => "label"
             )
           else
-            ""
+            "".html_safe
           end
         end
         
@@ -206,6 +207,10 @@ module Formtastic
           )
         end
         
+        def hidden_fragments
+          "".html_safe
+        end
+        
       end
     end
   end

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

@@ -27,7 +27,7 @@ module Formtastic
               validator_relevant?(validator)
             end
           else
-            []
+            nil
           end
         end
 
@@ -70,8 +70,15 @@ module Formtastic
             # We can't determine an appropriate value for :greater_than with a float/decimal column
             raise IndeterminableMinimumAttributeError if validation.options[:greater_than] && column? && [:float, :decimal].include?(column.type)
 
-            return validation.options[:greater_than_or_equal_to] if validation.options[:greater_than_or_equal_to]
-            return (validation.options[:greater_than] + 1)       if validation.options[:greater_than]
+            if validation.options[:greater_than_or_equal_to]
+              return (validation.options[:greater_than_or_equal_to].call(object)) if validation.options[:greater_than_or_equal_to].kind_of?(Proc)
+              return (validation.options[:greater_than_or_equal_to])
+            end
+
+            if validation.options[:greater_than]
+              return (validation.options[:greater_than].call(object) + 1) if validation.options[:greater_than].kind_of?(Proc)
+              return (validation.options[:greater_than] + 1)
+            end
           end
         end
 
@@ -84,8 +91,15 @@ module Formtastic
             # We can't determine an appropriate value for :greater_than with a float/decimal column
             raise IndeterminableMaximumAttributeError if validation.options[:less_than] && column? && [:float, :decimal].include?(column.type)
 
-            return validation.options[:less_than_or_equal_to] if validation.options[:less_than_or_equal_to]
-            return (validation.options[:less_than] - 1)       if validation.options[:less_than]
+            if validation.options[:less_than_or_equal_to]
+              return (validation.options[:less_than_or_equal_to].call(object)) if validation.options[:less_than_or_equal_to].kind_of?(Proc)
+              return (validation.options[:less_than_or_equal_to])
+            end
+
+            if validation.options[:less_than]
+              return ((validation.options[:less_than].call(object)) - 1) if validation.options[:less_than].kind_of?(Proc)
+              return (validation.options[:less_than] - 1)
+            end
           end
         end
 
@@ -112,7 +126,7 @@ module Formtastic
         end
 
         def validations?
-          !validations.empty?
+          validations != nil
         end
 
         def required?
@@ -121,14 +135,31 @@ module Formtastic
           return false if not_required_through_negated_validation?
           if validations?
             validations.select { |validator|
-              [:presence, :inclusion, :length].include?(validator.kind) &&
-              validator.options[:allow_blank] != true
+              if validator.options.key?(:on)
+                return false if (validator.options[:on] != :save) && ((object.new_record? && validator.options[:on] != :create) || (!object.new_record? && validator.options[:on] != :update))
+              end
+              case validator.kind
+              when :presence
+                true
+              when :inclusion
+                validator.options[:allow_blank] != true
+              when :length
+                validator.options[:allow_blank] != true &&
+                validator.options[:minimum].to_i > 0 ||
+                validator.options[:within].try(:first).to_i > 0
+              else
+                false
+              end
             }.any?
           else
             return responds_to_global_required? && !!builder.all_fields_required_by_default
           end
         end
 
+        def required_attribute?
+          required? && builder.use_required_attribute
+        end
+
         def not_required_through_negated_validation?
           @not_required_through_negated_validation
         end