Fingertips-form-san 0.2.0 → 0.3.0

data/README.rdoc

@@ -1,12 +1,27 @@
 = Form-San
 
-Form-San is a lean replacement for the Rails form builder.
+Form-San is a lean extension for the Rails form builder.
 
-  <% FormSan.form_for(@book) do |f| %>
+  <% form_for(@member, :builder => FormSan::FormBuilder) do |f| %>
     <% f.fieldset do %>
       <% f.fields do %>
-        <f.text_field_with_label :email %>
-        <p class="note">We're not going to spam you.</p>
+        <%= f.error_messages %>
+        
+        <% f.field(:email, :type => :text, :class => 'medium') do %>
+          <p class="hint">You’ll log in using your email address.</p>
+        <% end %>
+        <%= f.field(:password, :type => :password) %>
+      
+        <% f.fields_for(@member.artist) do |a| %>
+          <% a.field(:name, :type => :text, :class => 'medium') do %>
+            <p class="hint">Shown on the site.</p>
+          <% end %>
+        <% end %>
       <% end %>
     <% end %>
+    
+    <div class="submit">
+      <%= f.submit 'Sign up' %>
+      <%= link_to 'Cancel', root_path, :class => 'cancel' %>
+    </div>
   <% end %>

data/lib/form_san.rb

@@ -1,49 +1,70 @@
-require 'form_san/form_builder'
+require 'action_view/helpers'
 
 module FormSan
-  class Helpers
-    include ActionController::UrlWriter
-    include ActionController::RecordIdentifier
-    include ActionController::PolymorphicRoutes
+  class FormBuilder < ActionView::Helpers::FormBuilder
+    def fieldset(&block)
+      @template.content_tag(:div, :class => 'fieldset', &block)
+    end
     
-    protected :default_url_options, :default_url_options=
+    def fields(&block)
+      @template.content_tag(:div, :class => 'fields', &block)
+    end
     
-    def form_for(output_buffer, record, options={}, &block)
-      content_tag(output_buffer, 'form', :action => polymorphic_path(record)) do
-        block.call(FormSan::FormBuilder.new(output_buffer, record, options)) if block_given?
+    def error_messages
+      unless @object.errors.count.zero?
+        attributes_with_errors =  @object.errors.map { |attribute, _| attribute } - ['base']
+        @template.content_tag(:p, :class => 'errors') do
+          if attributes_with_errors.size > 1
+            @template.concat "Sorry, there were problems with the #{attributes_with_errors.to_sentence}."
+          elsif attributes_with_errors.size == 1
+            @template.concat "Sorry, there was a problem with the #{attributes_with_errors.first}."
+          else
+            @template.concat "#{@object.class} #{@object.errors.on(:base)}."
+          end
+        end
+      else
+        ''
       end
     end
     
-    def content_tag(output_buffer, name, html_options={}, &block)
-      output_buffer << "<#{name}#{hash_to_attributes(html_options)}>"
-      block.call.to_s if block_given?
-      output_buffer << "</#{name}>"
+    def error_message(attribute)
+      unless @object.errors.on(attribute).blank?
+        @template.content_tag(:p, :class => 'notice') do
+          @template.concat ERB::Util.html_escape(@object.errors.on(attribute).mb_chars.capitalize)
+        end
+      else
+        ''
+      end
     end
     
-    def tag(output_buffer, name, html_options={})
-      output_buffer << "<#{name}#{hash_to_attributes(html_options)} />"
+    def field_without_block(attribute, extra_content=nil, *args)
+      options = args.extract_options!
+      classes = @object.errors.on(attribute) ? 'invalid field' : 'field'
+      
+      @template.content_tag(:div, :class => classes) do
+        @template.concat(@template.content_tag(:div, :class => 'label') do
+          @template.concat self.label(attribute, *args)
+        end)
+        @template.concat ActionView::Helpers::InstanceTag.new(@object_name,
+          attribute, self, @object).to_input_field_tag(options.delete(:type), options)
+        @template.concat error_message(attribute)
+        @template.concat extra_content unless extra_content.blank?
+        @template.output_buffer # The block needs to return the current buffer
+      end
     end
     
-    private
-    
-    def hash_to_attributes(html_options)
-      attributes = html_options.map do |key, value|
-        value = value.join(' ') if value.is_a?(Array)
-        "#{key}=\"#{value}\"" if value
-      end.compact
-      attributes.empty? ? '' : " #{attributes.join(' ')}"
+    def field(attribute, *args, &block)
+      if block_given?
+        @template.concat field_without_block(attribute, @template.capture(&block), *args)
+      else
+        field_without_block(attribute, nil, *args)
+      end
     end
   end
-  
-  def self.helpers
-    @helpers ||= FormSan::Helpers.new
-  end
-  
-  def self.method_missing(method, *arguments, &block)
-    if helpers.public_methods(inherited=false).include?(method.to_s)
-      helpers.send(method, *arguments, &block)
-    else
-      super
-    end
+end
+
+class ActionView::Helpers::InstanceTag
+  def error_wrapping(html_tag, has_error)
+    html_tag
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Fingertips-form-san
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -13,7 +13,7 @@ date: 2009-03-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: A lean replacement form builder for Rails.
+description: A form builder for ActionView.
 email: manfred@fngtps.com
 executables: []
 
@@ -24,7 +24,6 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - lib/form_san.rb
-- lib/form_san/form_builder.rb
 - rails/init.rb
 - README.rdoc
 - LICENSE
@@ -54,6 +53,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A lean replacement form builder for Rails.
+summary: Form-San is a form builder that makes it slightly easier to create fields with labels and validation messages.
 test_files: []
 

data/lib/form_san/form_builder.rb

@@ -1,104 +0,0 @@
-module FormSan
-  class FormBuilder
-    attr_accessor :output_buffer
-    
-    def initialize(output_buffer, record, options={})
-      @output_buffer = output_buffer
-      @record = record
-      @options = options
-    end
-    
-    def error_messages(html_options={})
-      unless @record.errors.count.zero?
-        FormSan.content_tag(output_buffer, 'p', html_options.reverse_merge(:class => 'errors')) do
-          attributes_with_errors =  @record.errors.map { |attribute, _| attribute } - ['base']
-          if attributes_with_errors.size > 1
-            output_buffer << "Sorry, there were problems with the #{attributes_with_errors.to_sentence}."
-          elsif attributes_with_errors.size == 1
-            output_buffer << "Sorry, there was a problem with the #{attributes_with_errors.first}."
-          else
-            output_buffer << "#{@record.class} #{@record.errors.on(:base)}."
-          end
-        end
-      end
-    end
-    
-    def error_message(attribute, html_options={})
-      unless @record.errors.on(attribute).blank?
-        FormSan.content_tag(output_buffer, 'p', html_options.reverse_merge(:class => 'notice')) do
-          output_buffer << @record.errors.on(attribute).mb_chars.capitalize
-        end
-      end
-    end
-    
-    def fieldset(&block)
-      FormSan.content_tag(output_buffer, 'div', :class => 'fieldset') { block.call(self) }
-    end
-    
-    def fields(&block)
-      FormSan.content_tag(output_buffer, 'div', :class => 'fields') { block.call(self) }
-    end
-    
-    def field(attribute, options={}, html_options={}, &block)
-      classes = %w(field)
-      classes << 'invalid' if @record.errors.on(attribute)
-      html_options.reverse_merge!(:value => self.class.value_before_type_cast(@record, attribute))
-      FormSan.content_tag(output_buffer, 'div', :class => classes) do
-        label(attribute, options[:humanized])
-        input(attribute, html_options.merge(:type => options[:type]))
-        error_message(attribute)
-        output_buffer << block.call if block_given?
-      end
-    end
-    
-    def label(attribute, humanized_attribute=nil, html_options={}, &block)
-      humanized_attribute ||= @record.class.human_attribute_name(attribute.to_s)
-      if block_given?
-        FormSan.content_tag(output_buffer, 'label', html_options) do
-          block.call(self)
-          output_buffer << " #{humanized_attribute}"
-        end
-      else
-        html_options[:for] ||= "#{@record.class.name.downcase}_#{attribute}"
-        FormSan.content_tag(output_buffer, 'div', :class => 'label') do
-          FormSan.content_tag(output_buffer, 'label', html_options) do
-            output_buffer << humanized_attribute
-          end
-        end
-      end
-    end
-    
-    def input(attribute, html_options={})
-      html_options.reverse_merge!(
-        :id   => "#{@record.class.name.downcase}_#{attribute}",
-        :name => "#{@record.class.name.downcase}[#{attribute}]"
-      )
-      FormSan.tag(output_buffer, 'input', html_options)
-    end
-    
-    def text_field(attribute, html_options={})
-      input(attribute, html_options.reverse_merge(:type => 'text'))
-    end
-    
-    def password_field(attribute, html_options={})
-      input(attribute, html_options.reverse_merge(:type => 'password'))
-    end
-    
-    def submit(label, html_options={})
-      html_options.reverse_merge!(
-        :value => label,
-        :type => 'submit'
-      )
-      FormSan.tag(output_buffer, 'input', html_options)
-    end
-    
-    def self.value_before_type_cast(object, attribute)
-      if object.respond_to?("#{attribute}_before_type_cast")
-        object.send("#{attribute}_before_type_cast")
-      else
-        object.send(attribute)
-      end
-    rescue NoMethodError
-    end
-  end
-end