formtastic 2.1.0 → 4.0.0

data/lib/formtastic/inputs/time_picker_input.rb

@@ -0,0 +1,99 @@
+module Formtastic
+  module Inputs
+    
+    # Outputs a simple `<label>` with a HTML5 `<input type="time">` wrapped in the standard
+    # `<li>` wrapper. This is an alternative to `:time_select` for `:date`, `:time`, `:datetime` 
+    # database columns. You can use this input with `:as => :time_picker`.
+    #
+    # *Please note:* Formtastic only provides suitable markup for a date picker, but does not supply
+    # any additional CSS or Javascript to render calendar-style date pickers. Browsers that support
+    # this input type (such as Mobile Webkit and Opera on the desktop) will render a native widget.
+    # Browsers that don't will default to a plain text field`<input type="text">` and can be 
+    # poly-filled with some Javascript and a UI library of your choice.
+    #
+    # @example Full form context and output
+    #
+    #   <%= semantic_form_for(@post) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :publish_at, :as => :time_picker %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="string">
+    #           <label for="post_publish_at">First name</label>
+    #           <input type="date" id="post_publish_at" name="post[publish_at]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @example Setting the size (defaults to 5 for HH:MM)
+    #   <%= f.input :publish_at, :as => :time_picker, :size => 20 %>
+    #   <%= f.input :publish_at, :as => :time_picker, :input_html => { :size => 20 } %>
+    #
+    # @example Setting the maxlength (defaults to 5 for HH:MM)
+    #   <%= f.input :publish_at, :as => :time_picker, :maxlength => 20 %>
+    #   <%= f.input :publish_at, :as => :time_picker, :input_html => { :maxlength => 20 } %>
+    #
+    # @example Setting the value (defaults to HH:MM for Date and Time objects, otherwise renders string)
+    #   <%= f.input :publish_at, :as => :time_picker, :input_html => { :value => "14:14" } %>
+    #
+    # @example Setting the step attribute (defaults to 60)
+    #   <%= f.input :publish_at, :as => :time_picker, :step => 120 %>
+    #   <%= f.input :publish_at, :as => :time_picker, :input_html => { :step => 120 } %>
+    #
+    # @example Setting the step attribute with a macro
+    #   <%= f.input :publish_at, :as => :time_picker, :step => :second %>
+    #   <%= f.input :publish_at, :as => :time_picker, :step => :minute %>
+    #   <%= f.input :publish_at, :as => :time_picker, :step => :quarter_hour %>
+    #   <%= f.input :publish_at, :as => :time_picker, :step => :fifteen_minutes %>
+    #   <%= f.input :publish_at, :as => :time_picker, :step => :half_hour %>
+    #   <%= f.input :publish_at, :as => :time_picker, :step => :thirty_minutes %>
+    #   <%= f.input :publish_at, :as => :time_picker, :step => :hour %>
+    #   <%= f.input :publish_at, :as => :time_picker, :step => :sixty_minutes %>
+    #
+    # @example Setting the min attribute
+    #   <%= f.input :publish_at, :as => :time_picker, :min => "09:00" %>
+    #   <%= f.input :publish_at, :as => :time_picker, :input_html => { :min => "01:00" } %>
+    #
+    # @example Setting the max attribute
+    #   <%= f.input :publish_at, :as => :time_picker, :max => "18:00" %>
+    #   <%= f.input :publish_at, :as => :time_picker, :input_html => { :max => "18:00" } %>
+    #
+    # @example Setting the placeholder attribute
+    #   <%= f.input :publish_at, :as => :time_picker, :placeholder => "HH:MM" %>
+    #   <%= f.input :publish_at, :as => :time_picker, :input_html => { :placeholder => "HH:MM" } %>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
+    class TimePickerInput
+      include Base
+      include Base::Stringish
+      include Base::DatetimePickerish
+      
+      def html_input_type
+        "time"
+      end
+      
+      def default_size
+        5
+      end
+      
+      def value
+        return options[:input_html][:value] if options[:input_html] && options[:input_html].key?(:value)
+        val = object.send(method)
+        return "00:00" if val.is_a?(Date)
+        return val.strftime("%H:%M") if val.is_a?(Time)
+        return val if val.nil?
+        val.to_s
+      end
+      
+      def default_step
+        60
+      end
+      
+    end
+  end
+end

data/lib/formtastic/inputs/{time_input.rb → time_select_input.rb}

@@ -6,7 +6,7 @@ module Formtastic
     # own `time_select`.
     #
     # @see Formtastic::Inputs::Base::Timeish Timeish module for documentation of date, time and datetime input options.
-    class TimeInput 
+    class TimeSelectInput 
       include Base
       include Base::Timeish
       
@@ -15,8 +15,12 @@ module Formtastic
         time_fragments
       end
       
+      def value_or_default_value
+        value ? value : Time.current
+      end
+      
       def fragment_value(fragment)
-        value ? value.send(fragment) : ""
+        value_or_default_value.send(fragment)
       end
       
       def hidden_fragments

data/lib/formtastic/inputs/time_zone_input.rb

@@ -28,9 +28,19 @@ module Formtastic
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     #
-    # @todo document :priority_zones option
-    # @todo configurable default :priority_zones?
-    class TimeZoneInput 
+    # The priority_zones option:
+    #   Since this input actually uses Rails' `time_zone_select` helper, the :priority_zones
+    #   option needs to be an array of ActiveSupport::TimeZone objects.
+    #
+    #   And you can configure default value using
+    #
+    #   ```
+    #     Formtastic::FormBuilder.priority_time_zones = [timezone1, timezone2]
+    #   ```
+    #
+    #   See http://apidock.com/rails/ActionView/Helpers/FormOptionsHelper/time_zone_select for more information.
+    #
+    class TimeZoneInput
       include Base
 
       def to_html
@@ -39,10 +49,10 @@ module Formtastic
           builder.time_zone_select(method, priority_zones, input_options, input_html_options)
         end
       end
-      
+
       def priority_zones
-        options[:priority_zones] || [] # TODO config?
+        options[:priority_zones] || Formtastic::FormBuilder.priority_time_zones
       end
     end
   end
-end
+end

data/lib/formtastic/inputs.rb

@@ -4,28 +4,39 @@ module Formtastic
 
     autoload :Base
     autoload :Basic
-    autoload :BooleanInput
-    autoload :CheckBoxesInput
-    autoload :CountryInput
-    autoload :DateInput
-    autoload :DatetimeInput
-    autoload :EmailInput
-    autoload :FileInput
-    autoload :HiddenInput
-    autoload :NumberInput
-    autoload :NumericInput
-    autoload :PasswordInput
-    autoload :PhoneInput
-    autoload :RadioInput
-    autoload :RangeInput
-    autoload :SearchInput
-    autoload :SelectInput
-    autoload :StringInput
-    autoload :TextInput
-    autoload :TimeInput
-    autoload :TimeZoneInput
     autoload :Timeish
-    autoload :UrlInput
+
+    eager_autoload do
+      autoload :BooleanInput
+      autoload :CheckBoxesInput
+      autoload :ColorInput
+      autoload :CountryInput
+      autoload :DatalistInput
+      autoload :DateInput
+      autoload :DatePickerInput
+      autoload :DatetimePickerInput
+      autoload :DateSelectInput
+      autoload :DatetimeInput
+      autoload :DatetimeSelectInput
+      autoload :EmailInput
+      autoload :FileInput
+      autoload :HiddenInput
+      autoload :NumberInput
+      autoload :NumericInput
+      autoload :PasswordInput
+      autoload :PhoneInput
+      autoload :RadioInput
+      autoload :RangeInput
+      autoload :SearchInput
+      autoload :SelectInput
+      autoload :StringInput
+      autoload :TextInput
+      autoload :TimeInput
+      autoload :TimePickerInput
+      autoload :TimeSelectInput
+      autoload :TimeZoneInput
+      autoload :UrlInput
+    end
   end
 end
 

data/lib/formtastic/localized_string.rb

@@ -7,7 +7,7 @@ module Formtastic
 
     protected
 
-    def localized_string(key, value, type, options = {}) #:nodoc:
+    def localized_string(key, value, type, options = {}) # @private
       current_builder = respond_to?(:builder) ? builder : self
       localizer = Formtastic::FormBuilder.i18n_localizer.new(current_builder)
       localizer.localize(key, value, type, options)

data/lib/formtastic/localizer.rb

@@ -1,5 +1,5 @@
 module Formtastic
-  # Implementation for looking up localized values within Formtastic using I18n, if no 
+  # Implementation for looking up localized values within Formtastic using I18n, if no
   # explicit value (like the `:label` option) is set and I18n-lookups are enabled in the
   # configuration.
   #
@@ -28,50 +28,50 @@ module Formtastic
       def get(key)
         cache[key]
       end
-    
+
       def has_key?(key)
         cache.has_key?(key)
       end
-    
+
       def set(key, result)
         cache[key] = result
       end
-    
+
       def cache
         @cache ||= {}
       end
-    
+
       def clear!
         cache.clear
       end
     end
-        
+
     attr_accessor :builder
-    
+
     def self.cache
       @cache ||= Cache.new
     end
-    
+
     def initialize(current_builder)
-      self.builder = current_builder 
+      self.builder = current_builder
     end
 
-    def localize(key, value, type, options = {}) #:nodoc:
+    def localize(key, value, type, options = {}) # @private
       key = value if value.is_a?(::Symbol)
-      
+
       if value.is_a?(::String)
         escape_html_entities(value)
       else
         use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
         use_cache = i18n_cache_lookups
         cache = self.class.cache
-        
+
         if use_i18n
           model_name, nested_model_name  = normalize_model_name(builder.model_name.underscore)
 
           action_name = builder.template.params[:action].to_s rescue ''
           attribute_name = key.to_s
-          
+
           # look in the cache first
           if use_cache
             cache_key = [::I18n.locale, action_name, model_name, nested_model_name, attribute_name, key, value, type, options]
@@ -86,7 +86,7 @@ module Formtastic
             i18n_path.gsub!('%{model}', model_name)
             i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
             i18n_path.gsub!('%{attribute}', attribute_name)
-            i18n_path.gsub!('..', '.')
+            i18n_path.tr!('..', '.')
             i18n_path.to_sym
           end
           defaults << ''
@@ -101,9 +101,9 @@ module Formtastic
             # This is effectively what Rails label helper does for i18n lookup
             options[:scope] = [:helpers, type]
             options[:default] = defaults
-            i18n_value = ::I18n.t(default_key, options)
+            i18n_value = ::I18n.t(default_key, **options)
           end
-          
+
           # save the result to the cache
           result = (i18n_value.is_a?(::String) && i18n_value.present?) ? escape_html_entities(i18n_value) : nil
           cache.set(cache_key, result) if use_cache
@@ -115,14 +115,14 @@ module Formtastic
     protected
 
     def normalize_model_name(name)
-      if !name =~ /\[/ && builder.respond_to?(:parent_builder) && builder.parent_builder.object_name
-        # Rails 3.1 nested builder case
-        [builder.parent_builder.object_name.to_s, name]
-      elsif name =~ /(.+)\[(.+)\]/
-        # Rails 3 (and 3.1?) nested builder case with :post rather than @post
+      if name =~ /(.+)\[(.+)\]/
+        # Nested builder case with :post rather than @post
+        # TODO: check if this is no longer required with a minimum of Rails 4.1
         [$1, $2]
+      elsif builder.respond_to?(:options) && builder.options.key?(:as)
+        [builder.options[:as].to_s]
       elsif builder.respond_to?(:options) && builder.options.key?(:parent_builder)
-        # Rails 3.0 nested builder work-around case, where :parent_builder is provided by f.semantic_form_for
+        # Rails 3.0+ nested builder work-around case, where :parent_builder is provided by f.semantic_form_for
         [builder.options[:parent_builder].object_name.to_s, name]
       else
         # Non-nested case
@@ -130,7 +130,7 @@ module Formtastic
       end
     end
 
-    def escape_html_entities(string) #:nodoc:
+    def escape_html_entities(string) # @private
       if (builder.escape_html_entities_in_hints_and_labels) ||
          (self.respond_to?(:escape_html_entities_in_hints_and_labels) && escape_html_entities_in_hints_and_labels)
         string = builder.template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true # Accept html_safe flag as indicator to skip escaping
@@ -141,7 +141,7 @@ module Formtastic
     def i18n_lookups_by_default
       builder.i18n_lookups_by_default
     end
-    
+
     def i18n_cache_lookups
       builder.i18n_cache_lookups
     end

data/lib/formtastic/namespaced_class_finder.rb

@@ -0,0 +1,99 @@
+module Formtastic
+  # This class implements class resolution in a namespace chain. It
+  # is used both by Formtastic::Helpers::InputHelper and
+  # Formtastic::Helpers::ActionHelper to look up action and input classes.
+  #
+  # @example Implementing own class finder
+  #   # You can implement own class finder that for example prefixes the class name or uses custom module.
+  #   class MyInputClassFinder < Formtastic::NamespacedClassFinder
+  #     def initialize(namespaces)
+  #       super [MyNamespace] + namespaces # first lookup in MyNamespace then the defaults
+  #     end
+  #
+  #     private
+  #
+  #     def class_name(as)
+  #       "My#{super}Input" # for example MyStringInput
+  #     end
+  #   end
+  #
+  #   # in config/initializers/formtastic.rb
+  #   Formtastic::FormBuilder.input_class_finder = MyInputClassFinder
+  #
+
+  class NamespacedClassFinder
+    attr_reader :namespaces # @private
+
+    # @private
+    class NotFoundError < NameError
+    end
+
+    def self.use_const_defined?
+      defined?(Rails) && ::Rails.application && ::Rails.application.config.respond_to?(:eager_load) && ::Rails.application.config.eager_load
+    end
+
+    # @param namespaces [Array<Module>]
+    def initialize(namespaces)
+      @namespaces = namespaces.flatten
+      @cache = {}
+    end
+
+    # Looks up the given reference in the configured namespaces.
+    #
+    # Two finder methods are provided, one for development tries to
+    # reference the constant directly, triggering Rails' autoloading
+    # const_missing machinery; the second one instead for production
+    # checks with .const_defined before referencing the constant.
+    #
+    def find(as)
+      @cache[as] ||= resolve(as)
+    end
+
+    def resolve(as)
+      class_name = class_name(as)
+
+      finder(class_name) or raise NotFoundError, "class #{class_name}"
+    end
+
+    # Converts symbol to class name
+    # Overridden in subclasses to create `StringInput` and `ButtonAction`
+    # @example
+    #   class_name(:string) == "String"
+
+    def class_name(as)
+      as.to_s.camelize
+    end
+
+    private
+
+    if use_const_defined?
+      def finder(class_name) # @private
+        find_with_const_defined(class_name)
+      end
+    else
+      def finder(class_name) # @private
+        find_by_trying(class_name)
+      end
+    end
+
+    # Looks up the given class name in the configured namespaces in order,
+    # returning the first one that has the class name constant defined.
+    def find_with_const_defined(class_name)
+      @namespaces.find do |namespace|
+        if namespace.const_defined?(class_name)
+          break namespace.const_get(class_name)
+        end
+      end
+    end
+
+    # Use auto-loading in development environment
+    def find_by_trying(class_name)
+      @namespaces.find do |namespace|
+        begin
+          break namespace.const_get(class_name)
+        rescue NameError
+        end
+      end
+    end
+  end
+end

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.1.0"
+  VERSION = "4.0.0"
 end

data/lib/formtastic.rb

@@ -4,30 +4,40 @@ require 'formtastic/engine' if defined?(::Rails)
 module Formtastic
   extend ActiveSupport::Autoload
 
-  autoload :FormBuilder
   autoload :Helpers
   autoload :HtmlAttributes
-  autoload :I18n
-  autoload :Inputs
-  autoload :Actions
   autoload :LocalizedString
   autoload :Localizer
-  autoload :Util
-  
-  # @private
+  autoload :NamespacedClassFinder
+  autoload :InputClassFinder
+  autoload :ActionClassFinder
+  autoload :Deprecation
+
+  eager_autoload do
+    autoload :I18n
+    autoload :FormBuilder
+    autoload :Inputs
+    autoload :Actions
+  end
+
+  # @public
   class UnknownInputError < NameError
   end
-  
+
   # @private
   class UnknownActionError < NameError
   end
-  
+
   # @private
   class PolymorphicInputWithoutCollectionError < ArgumentError
   end
-  
+
   # @private
   class UnsupportedMethodForAction < ArgumentError
   end
 
+  # @private
+  class UnsupportedEnumCollection < NameError
+  end
+
 end

data/lib/generators/formtastic/form/form_generator.rb

@@ -4,14 +4,20 @@ module Formtastic
   # files without confirmation.
   #
   # @example
+  # !!!shell
   #   $ rails generate formtastic:form Post
   # @example Copy the partial code to the pasteboard rather than generating a partial
+  # !!!shell
   #   $ rails generate formtastic:form Post --copy
-  # @example Return HAML output instead of default template engine
-  #   $ rails generate formtastic:form Post --haml
+  # @example Return HAML or Slim output instead of default ERB
+  # !!!shell
+  #   $ rails generate formtastic:form Post --template-engine haml
+  #   $ rails generate formtastic:form Post --template-engine slim
   # @example Generate a form for specific model attributes
+  # !!!shell
   #   $ rails generate formtastic:form Post title:string body:text
   # @example Generate a form for a specific controller
+  # !!!shell
   #   $ rails generate formtastic:form Post --controller admin/posts
   class FormGenerator < Rails::Generators::NamedBase
     desc "Generates a Formtastic form partial based on an existing model."
@@ -69,7 +75,7 @@ module Formtastic
     # Skips Active Record Timestamps.
     def content_columns
       model.content_columns.select do |column|
-        !Formtastic::Helpers::InputsHelper::SKIPPED_COLUMNS.include? column.name.to_sym
+        !Formtastic::FormBuilder.skipped_columns.include? column.name.to_sym
       end
     end
 
@@ -102,4 +108,4 @@ module Formtastic
     end
 
   end
-end
+end

data/lib/generators/formtastic/input/input_generator.rb

@@ -0,0 +1,46 @@
+module Formtastic
+
+  # Modify existing inputs, subclass them, or create your own from scratch.
+  # @example
+  # !!!shell
+  #   $ rails generate formtastic:input HatSize
+
+  # @example Define input name using underscore convention
+  # !!!shell
+  #   $ rails generate formtastic:input hat_size
+
+  # @example Override an existing input behavior
+  # !!!shell
+  #   $ rails generate formtastic:input string --extend
+
+  # @example Extend an existing input behavior
+  # !!!shell
+  #   $ rails generate formtastic:input FlexibleText --extend string
+  class InputGenerator < Rails::Generators::NamedBase
+
+    argument :name, :type => :string, :required => true, :banner => 'FILE_NAME'
+
+    source_root File.expand_path('../../../templates', __FILE__)
+
+    class_option :extend
+
+    def create
+      normalize_file_name
+      define_extension_sentence
+      template "input.rb", "app/inputs/#{name.underscore}_input.rb"
+    end
+
+    protected
+
+    def normalize_file_name
+      name.chomp!("Input")  if name.ends_with?("Input")
+      name.chomp!("_input") if name.ends_with?("_input")
+      name.chomp!("input")  if name.ends_with?("input")
+    end
+
+    def define_extension_sentence
+      @extension_sentence = "< Formtastic::Inputs::#{name.camelize}Input" if options[:extend] == "extend"
+      @extension_sentence ||= "< Formtastic::Inputs::#{options[:extend].camelize}Input" if options[:extend]
+    end
+  end
+end

data/lib/generators/formtastic/install/install_generator.rb

@@ -1,32 +1,18 @@
 # encoding: utf-8
 
 module Formtastic
-  # Copies formtastic.css to public/stylesheets/ (Rails 3.0.x only) and a config initializer
-  # to config/initializers/formtastic.rb (all Rails versions).
+  # Copies a config initializer to config/initializers/formtastic.rb
   #
   # @example
+  # !!!shell
   #   $ rails generate formtastic:install
-  #
-  # @todo Test with Rails 3.0
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path('../../../templates', __FILE__)
     class_option :template_engine
 
-    if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1
-      # Rails 3.1 has the asset pipeline, no need to copy CSS files any more
-      desc "Copies a config initializer to config/initializers/formtastic.rb"
-      def copy_files
-        copy_file 'formtastic.rb', 'config/initializers/formtastic.rb'
-      end
-    else
-      # Rails 3.0 doesn't have an asset pipeline, so we copy in CSS too
-      desc "Copies some CSS files to public/stylesheets/ and a config initializer to config/initializers/formtastic.rb"
-      def copy_files
-        template 'formtastic.rb', 'config/initializers/formtastic.rb'
-        template '../../../app/assets/stylesheets/formtastic.css',     'public/stylesheets/formtastic.css'
-        template '../../../app/assets/stylesheets/formtastic_ie6.css', 'public/stylesheets/formtastic_ie6.css'
-        template '../../../app/assets/stylesheets/formtastic_ie7.css', 'public/stylesheets/formtastic_ie7.css'
-      end
+    desc "Copies a config initializer to config/initializers/formtastic.rb"
+    def copy_files
+      copy_file 'formtastic.rb', 'config/initializers/formtastic.rb'
     end
 
     def copy_scaffold_template

data/lib/generators/templates/_form.html.slim

@@ -4,5 +4,5 @@
     = f.input :<%= attribute.name %>
   <%- end -%>
 
-  = f.buttons do
-    = f.commit_button
+  = f.actions do
+    = f.action :submit, as: :input