formtastic 2.0.2 → 2.1.0.beta1

data/lib/formtastic/inputs/string_input.rb

@@ -25,10 +25,12 @@ module Formtastic
     #     </fieldset>
     #   </form>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class StringInput 
       include Base
       include Base::Stringish
+      include Base::Placeholder
+      
     end
   end
 end

data/lib/formtastic/inputs/text_input.rb

@@ -9,24 +9,25 @@ module Formtastic
     #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
-    #       <%= f.input :first_name, :as => :string %>
+    #       <%= f.input :first_name, :as => :text %>
     #     <% end %>
     #   <% end %>
     #
     #   <form...>
     #     <fieldset>
     #       <ol>
-    #         <li class="string">
+    #         <li class="text">
     #           <label for="user_first_name">First name</label>
-    #           <input type="text" id="user_first_name" name="user[first_name]">
+    #           <textarea cols="30" id="user_first_name" name="user[first_name]" rows="20"></textarea>
     #         </li>
     #       </ol>
     #     </fieldset>
     #   </form>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class TextInput 
       include Base
+      include Base::Placeholder
       
       def input_html_options
         { 

data/lib/formtastic/inputs/time_input.rb

@@ -5,7 +5,7 @@ module Formtastic
     # well, defaulting to `Time.current` if the form object doesn't have a value, much like Rails' 
     # own `time_select`.
     #
-    # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
+    # @see Formtastic::Inputs::Base::Timeish Timeish module for documentation of date, time and datetime input options.
     class TimeInput 
       include Base
       include Base::Timeish
@@ -15,18 +15,14 @@ module Formtastic
         time_fragments
       end
       
-      def value_or_default_value
-        value ? value : Time.current
-      end
-      
       def fragment_value(fragment)
-        value_or_default_value.send(fragment)
+        value ? value.send(fragment) : ""
       end
       
       def hidden_fragments
         if !options[:ignore_date]
           date_fragments.map do |fragment|
-            template.hidden_field_tag("#{object_name}[#{fragment_name(fragment)}]", fragment_value(fragment), :id => fragment_id(fragment), :disabled => input_html_options[:disabled] )
+            template.hidden_field_tag(hidden_field_name(fragment), fragment_value(fragment), :id => fragment_id(fragment), :disabled => input_html_options[:disabled] )
           end.join.html_safe
         else
           super
@@ -35,4 +31,4 @@ module Formtastic
       
     end
   end
-end
+end

data/lib/formtastic/inputs/time_zone_input.rb

@@ -26,7 +26,7 @@ module Formtastic
     #     </fieldset>
     #   </form>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     #
     # @todo document :priority_zones option
     # @todo configurable default :priority_zones?

data/lib/formtastic/inputs/url_input.rb

@@ -24,10 +24,11 @@ module Formtastic
     #     </fieldset>
     #   </form>
     #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class UrlInput 
       include Base
       include Base::Stringish
+      include Base::Placeholder
       
       def to_html
         input_wrapping do

data/lib/formtastic/localized_string.rb

@@ -1,105 +1,17 @@
 module Formtastic
-  # @private
   module LocalizedString
 
-    protected
-
-    # Internal generic method for looking up localized values within Formtastic
-    # using I18n, if no explicit value is set and I18n-lookups are enabled.
-    #
-    # Enabled/Disable this by setting:
-    #
-    #   Formtastic::FormBuilder.i18n_lookups_by_default = true/false
-    #
-    # Lookup priority:
-    #
-    #   'formtastic.%{type}.%{model}.%{action}.%{attribute}'
-    #   'formtastic.%{type}.%{model}.%{attribute}'
-    #   'formtastic.%{type}.%{attribute}'
-    #
-    # Example:
-    #
-    #   'formtastic.labels.post.edit.title'
-    #   'formtastic.labels.post.title'
-    #   'formtastic.labels.title'
-    #
-    # NOTE: Generic, but only used for form input titles/labels/hints/actions (titles = legends, actions = buttons).
-    #
-    def localized_string(key, value, type, options = {}) #:nodoc:
-      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)
-
-        if use_i18n
-          model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
-
-          action_name = template.params[:action].to_s rescue ''
-          attribute_name = key.to_s
-
-          defaults = Formtastic::I18n::SCOPES.reject do |i18n_scope|
-            nested_model_name.nil? && i18n_scope.match(/nested_model/)
-          end.collect do |i18n_scope|
-            i18n_path = i18n_scope.dup
-            i18n_path.gsub!('%{action}', action_name)
-            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.to_sym
-          end
-          defaults << ''
-
-          defaults.uniq!
-
-          default_key = defaults.shift
-          i18n_value = Formtastic::I18n.t(default_key,
-            options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
-          i18n_value = i18n_value.is_a?(::String) ? i18n_value : nil
-          if i18n_value.blank? && type == :label
-            # 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)
-          end
-          (i18n_value.is_a?(::String) && i18n_value.present?) ? escape_html_entities(i18n_value) : nil
-        end
-      end
-    end
-
     def model_name
       @object.present? ? @object.class.name : @object_name.to_s.classify
     end
 
-    def normalize_model_name(name)
-      if !name =~ /\[/ && self.respond_to?(:builder) && 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
-        [$1, $2]
-      elsif self.respond_to?(:builder) && 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
-        [builder.options[:parent_builder].object_name.to_s, name]
-      else
-        # Non-nested case
-        [name]
-      end
-    end
-
-    def escape_html_entities(string) #:nodoc:
-      if (respond_to?(:builder) && 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 = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true # Acceppt html_safe flag as indicator to skip escaping
-      end
-      string
-    end
+    protected
 
-    def i18n_lookups_by_default
-      respond_to?(:builder) ? builder.i18n_lookups_by_default : i18n_lookups_by_default
+    def localized_string(key, value, type, options = {}) #:nodoc:
+      current_builder = respond_to?(:builder) ? builder : self
+      localizer = Formtastic::FormBuilder.i18n_localizer.new(current_builder)
+      localizer.localize(key, value, type, options)
     end
 
   end
-end
+end

data/lib/formtastic/localizer.rb

@@ -0,0 +1,110 @@
+module Formtastic
+  # 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.
+  #
+  # You can subclass this to implement your own Localizer, and configure Formtastic to use this
+  # localizer with:
+  #
+  #   Formtastic::FormBuilder.i18n_localizer
+  #
+  # Enabled/disable i18n lookups completely with:
+  #
+  #   Formtastic::FormBuilder.i18n_lookups_by_default = true/false
+  #
+  # Lookup priority:
+  #
+  #   'formtastic.%{type}.%{model}.%{action}.%{attribute}'
+  #   'formtastic.%{type}.%{model}.%{attribute}'
+  #   'formtastic.%{type}.%{attribute}'
+  #
+  # Example:
+  #
+  #   'formtastic.labels.post.edit.title'
+  #   'formtastic.labels.post.title'
+  #   'formtastic.labels.title'
+  class Localizer
+
+    attr_accessor :builder
+
+    def initialize(current_builder)
+      self.builder = current_builder 
+    end
+
+    def localize(key, value, type, options = {}) #:nodoc:
+      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)
+
+        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
+
+
+          defaults = Formtastic::I18n::SCOPES.reject do |i18n_scope|
+            nested_model_name.nil? && i18n_scope.match(/nested_model/)
+          end.collect do |i18n_scope|
+            i18n_path = i18n_scope.dup
+            i18n_path.gsub!('%{action}', action_name)
+            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.to_sym
+          end
+          defaults << ''
+
+          defaults.uniq!
+
+          default_key = defaults.shift
+          i18n_value = Formtastic::I18n.t(default_key,
+            options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
+          i18n_value = i18n_value.is_a?(::String) ? i18n_value : nil
+          if i18n_value.blank? && type == :label
+            # 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)
+          end
+          (i18n_value.is_a?(::String) && i18n_value.present?) ? escape_html_entities(i18n_value) : nil
+        end
+      end
+    end
+
+    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
+        [$1, $2]
+      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
+        [builder.options[:parent_builder].object_name.to_s, name]
+      else
+        # Non-nested case
+        [name]
+      end
+    end
+
+    def escape_html_entities(string) #:nodoc:
+      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
+      end
+      string
+    end
+
+    def i18n_lookups_by_default
+      builder.i18n_lookups_by_default
+    end
+
+  end
+end

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.0.2"
+  VERSION = "2.1.0.beta1"
 end

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

@@ -0,0 +1,105 @@
+# encoding: utf-8
+module Formtastic
+  # Generates a Formtastic form partial based on an existing model. It will not overwrite existing
+  # files without confirmation.
+  #
+  # @example
+  #   $ rails generate formtastic:form Post
+  # @example Copy the partial code to the pasteboard rather than generating a partial
+  #   $ rails generate formtastic:form Post --copy
+  # @example Return HAML output instead of default template engine
+  #   $ rails generate formtastic:form Post --haml
+  # @example Generate a form for specific model attributes
+  #   $ rails generate formtastic:form Post title:string body:text
+  # @example Generate a form for a specific controller
+  #   $ rails generate formtastic:form Post --controller admin/posts
+  class FormGenerator < Rails::Generators::NamedBase
+    desc "Generates a Formtastic form partial based on an existing model."
+
+    argument :name, :type => :string, :required => true, :banner => 'MODEL_NAME'
+    argument :attributes, :type => :array, :default => [], :banner => 'attribute attribute'
+
+    source_root File.expand_path('../../../templates', __FILE__)
+
+    class_option :template_engine
+
+    class_option :copy, :type => :boolean, :default => false, :group => :formtastic,
+    :desc => 'Copy the generated code the clipboard instead of generating a partial file."'
+
+    class_option :controller, :type => :string, :default => false, :group => :formtastic,
+    :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
+
+    def create_or_show
+      @attributes = reflected_attributes if @attributes.empty?
+
+      engine = options[:template_engine]
+
+      if options[:copy]
+        template = File.read("#{self.class.source_root}/_form.html.#{engine}")
+        erb = ERB.new(template, nil, '-')
+        generated_code = erb.result(binding).strip rescue nil
+        puts "The following code has been copied to the clipboard, just paste it in your views:" if save_to_clipboard(generated_code)
+        puts generated_code || "Error: Nothing generated. Does the model exist?"
+      else
+        empty_directory "app/views/#{controller_path}"
+        template "_form.html.#{engine}", "app/views/#{controller_path}/_form.html.#{engine}"
+      end
+    end
+
+    protected
+
+    def controller_path
+      @controller_path ||= if options[:controller]
+        options[:controller].underscore
+      else
+        name.underscore.pluralize
+      end
+    end
+
+    def reflected_attributes
+      columns = content_columns
+      columns += association_columns
+    end
+
+    def model
+      @model ||= name.camelize.constantize
+    end
+
+    # Collects content columns (non-relation columns) for the current class.
+    # Skips Active Record Timestamps.
+    def content_columns
+      model.content_columns.select do |column|
+        !Formtastic::Helpers::InputsHelper::SKIPPED_COLUMNS.include? column.name.to_sym
+      end
+    end
+
+    # Collects association columns (relation columns) for the current class. Skips polymorphic
+    # associations because we can't guess which class to use for an automatically generated input.
+    def association_columns
+      model.reflect_on_all_associations(:belongs_to).select do |association_reflection|
+        association_reflection.options[:polymorphic] != true
+      end
+    end
+
+    def save_to_clipboard(data)
+      return unless data
+
+      begin
+        case RUBY_PLATFORM
+        when /win32/
+          require 'win32/clipboard'
+          ::Win32::Clipboard.data = data
+        when /darwin/ # mac
+          `echo "#{data}" | pbcopy`
+        else # linux/unix
+          `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
+        end
+      rescue LoadError
+          false
+      else
+          true
+      end
+    end
+
+  end
+end

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

@@ -5,7 +5,7 @@
   <%- end -%>
   <%% end %>
 
-  <%%= f.buttons do %>
-    <%%= f.commit_button %>
+  <%%= f.actions do %>
+    <%%= f.action(:submit, :as => :input) %>
   <%% end %>
 <%% end %>