visionmedia-dm-forms 0.0.2 → 0.0.3

data/lib/dm-forms/core_ext.rb

@@ -1,39 +1,44 @@
 
-class NilClass
-  def to_xml_attributes #:nodoc:
-    ''
+class String
+
+  ##
+  # String to bool.
+  
+  def to_bool
+    !empty? and self != '0' and self != 'false' and self != 'nil'
   end
-  alias :to_html_attributes :to_xml_attributes
+  
 end
 
-class String
-    
+class TrueClass
+  
   ##
-  # Convert to a human readable string.
-  #
-  # === Examples:
-  #    
-  #   'im_a_simple.String'.humanize # => 'im a simple String'
-  #
-  
-  def humanize
-    gsub(/[^a-zA-Z\d]/, ' ') || self
+  # True to bool.
+  
+  def to_bool
+    self
   end
   
+end
+
+class FalseClass
+  
   ##
-  # Indent a string with pseudo +tabs+ (spaces). Defaults to a single tab.
+  # False to bool.
   
-  def indent tabs = 1 
-    gsub /^/, '  ' * tabs
+  def to_bool
+    self
   end
+  
 end
 
-class Symbol
+class NilClass
   
   ##
-  # Convert to a human readable string. See String#humanize
+  # Nil to bool.
   
-  def humanize
-    to_s.humanize
+  def to_bool
+    false
   end
+  
 end

data/lib/dm-forms/helpers.rb

@@ -0,0 +1,83 @@
+
+module DataMapper
+  module Form
+    module Helpers
+      
+      def fields_for model, attrs = {}, &block 
+        with_form_context model do
+          capture &block
+        end
+      end
+      
+      def submit value = nil, attrs = {}
+        attrs[:value] = value unless value.blank?
+        form_context(nil, self).unbound_submit attrs
+      end
+      
+      %w( form fieldset ).each do |type|
+        class_eval <<-EOF
+          def #{type} *args, &block
+            form_context(nil, self).#{type} *args, &block
+          end
+        EOF
+      end
+      
+      %w( form_for fieldset_for ).each do |type|
+        class_eval <<-EOF
+          def #{type} model, attrs = {}, &block
+            with_form_context model do
+              #{type.sub(/_for/, '')} attrs, &block
+            end
+          end
+        EOF
+      end
+      
+      %w( checkbox button file textarea 
+      hidden password radio select textfield ).each do |type|
+        define_method type do |*args|
+          method = bound?(*args) ? :"bound_#{type}" : :"unbound_#{type}"
+          form_context(nil, self).send method, *args
+        end
+      end
+      
+      #:nodoc:
+      
+      def new_form_context *args
+        Base.new *args
+      end
+      
+      def form_context *args
+        @__form_context ||= new_form_context *args
+      end
+      
+      def with_form_context model, attrs = {}, &block
+        last_context, @__form_context = form_context, new_form_context(model, self)
+        captured = instance_eval &block
+        @__form_context = last_context
+        captured
+      end
+      
+      def bound? *args 
+        args.first.is_a? Symbol
+      end
+      
+      def clear_buffer
+        @buffer = ''
+      end
+      
+      def buffer string = nil
+        @buffer ||= ''
+      end
+      
+      def capture &block
+        if block.arity > 0
+          yield self
+        else
+          instance_eval &block
+        end
+        buffer
+      end
+      
+    end
+  end
+end

data/lib/dm-forms/mixins.rb

@@ -0,0 +1,8 @@
+
+module DataMapper::Form
+  autoload :Errors, 'dm-forms/mixins/errors'
+  autoload :Labels, 'dm-forms/mixins/labels'
+  autoload :Wrappers, 'dm-forms/mixins/wrappers'
+  autoload :Descriptions, 'dm-forms/mixins/descriptions'
+end
+

data/lib/dm-forms/mixins/descriptions.rb

@@ -0,0 +1,18 @@
+
+module DataMapper::Form::Descriptions
+  
+  def tag name, contents = nil, attrs = {}, &block
+    description = description_tag attrs
+    super + description
+  end
+  
+  def self_closing_tag name, attrs = {}
+    description = description_tag attrs
+    super + description
+  end
+  
+  def description_tag attrs = {}
+    (description = attrs.delete(:description)) ? tag(:span, description, :class => 'description') : ''
+  end
+  
+end      

data/lib/dm-forms/mixins/labels.rb

@@ -0,0 +1,16 @@
+
+module DataMapper::Form::Labels
+  
+  def tag name, contents = nil, attrs = {}, &block
+    label_tag(attrs) +  super
+  end
+  
+  def self_closing_tag name, attrs = {}
+    label_tag(attrs) +  super
+  end
+  
+  def label_tag attrs = {}
+    (label = attrs.delete(:label)) ? tag(:label, label, :for => attrs[:name]) : ''
+  end
+  
+end

data/lib/dm-forms/mixins/wrappers.rb

@@ -0,0 +1,26 @@
+
+module DataMapper::Form::Wrappers
+  
+  def tag name, contents = nil, attrs = {}, &block
+    attrs, contents = contents, nil if contents.is_a? Hash
+    unless name.in? :form, :fieldset, :legend, :span, :div, :option, :optgroup
+      tag(:div, super, :class => wrapper_classes(name, attrs))
+    else
+      super
+    end
+  end
+  
+  def self_closing_tag name, attrs = {}
+    tag :div, super, :class => wrapper_classes(name, attrs)
+  end
+  
+  def wrapper_classes name, attrs = {}
+    classes = attrs.include?(:type) ? "form-#{attrs[:type]}" : "form-#{name}"
+    classes.add_class "form-#{classify_name(attrs[:name])}"
+  end
+  
+  def classify_name name
+    name.to_s.gsub('[', '-').gsub(']', '')
+  end
+  
+end

data/lib/dm-forms/tag.rb

@@ -1,156 +1,89 @@
 
 module DataMapper
   module Form
-    class Tag
-      
-      ##
-      # Boolean attributes.
-      
-      BOOLEAN_ATTRIBUTES = :disabled, :readonly, :multiple, :checked, :selected
-      
-      ##
-      # Elements which should not include auto-generated classes.
-      
-      IGNORE_CLASSES_ON_ELEMENTS = :form, :label, :fieldset, :hidden
-      
-      ##
-      # Name of element (input, fieldset, etc).
-      
-      attr_accessor :name
-      
-      ##
-      # Options passed to the constructor.
-      
-      attr_accessor :options
-      
-      ##
-      # Attributes pulled from #options.
-      
-      attr_accessor :attributes
-      
-      ##
-      # Markup placed before the element.
-      
-      attr_accessor :before
-      
-      ##
-      # Markup placed after the element.
-      
-      attr_accessor :after
-      
-      ##
-      # Tag's description.
-      
-      attr_accessor :description
-          
-      def initialize name, options = {}, &block
-        @name, @options, @attributes = name, options, (options[:attributes] ||= {})
-        @before, @after = attribute(:before, ''), attribute(:after, '')
-        @description = Elements.desc(attribute(:description)) || ''
-        @model = attribute :model
-        (@attributes[:value] ||= '') << Elements.capture_elements(@model, &block) if block_given?
+    module Tag
+      
+      #--
+      # Borrowed / adapted from Merb
+      #++
+      
+      BOOL_ATTRIBUTES = :selected, :checked, :multiple
+      
+      ##
+      # Creates a generic tag. You can invoke it a variety of ways.
+      #   
+      #   tag :div
+      #   # <div></div>
+      #   
+      #   tag :div, 'content'
+      #   # <div>content</div>
+      #   
+      #   tag :div, :class => 'class'
+      #   # <div class="class"></div>
+      #   
+      #   tag :div, 'content', :class => 'class'
+      #   # <div class="class">content</div>
+      #   
+      #   tag :div do
+      #     'content'
+      #   end
+      #   # <div>content</div>
+      #   
+      #   tag :div, :class => 'class' do
+      #     'content'
+      #   end
+      #   # <div class="class">content</div>
+      # 
+      
+      def tag name, contents = nil, attrs = {}, &block
+        attrs, contents = contents, nil if contents.is_a? Hash 
+        contents = yield if block_given?
+        open_tag(name, attrs) + contents.to_s + close_tag(name)
       end
     
       ##
-      # Render final markup of this element or 'tag'.
-    
-      def render
-        @attributes[:class] = classes unless classes.blank?
-        prepare_boolean_attributes
-        before << label
-        close = self_closing? ? " />" : ">#{inner_html}</#{@name}>"
-        open = "<#{@name} #{@attributes.to_html_attributes}"
-        tag = before << open << close << description << after << "\n"
-      end
-      alias :to_s :render
+      # Creates the opening tag with attributes for the provided +name+
+      # attrs is a hash where all members will be mapped to key="value"
+      #
+      # Note: This tag will need to be closed
       
-      ##
-      # Prepare boolean attribute values, so that the user may
-      # utilize :multiple => true, instead of :multiple => :multiple.
-      
-      def prepare_boolean_attributes
-        @attributes.each_pair do |key, value|
-          if BOOLEAN_ATTRIBUTES.include? key
-            if value
-              @attributes[key] = key
-            else
-              @attributes.delete key
-            end
-          end
-        end
+      def open_tag name, attrs = {}
+        "<#{name}#{optional_attrs(attrs)}>"
       end
     
       ##
-      # Wither or not a tag is self-closing (<br />).
-    
-      def self_closing?
-        @options[:self_closing]
-      end
-    
-      ##
-      # The inner HTML of this tag, only available for
-      # elements which are not self-closing.
-    
-      def inner_html
-        attribute :value, '' unless self_closing?
+      # Creates a closing tag
+      
+      def close_tag name 
+        "</#{name}>\n"
       end
-          
-      ##
-      # Is the element required.
     
-      def required?
-        attribute :required, false
-      end 
-      
       ##
-      # Generates a label when needed.
+      # Creates a self closing tag.  Like <br/> or <img src="..."/>
+      #
+      # +name+ : the name of the tag to create
+      # +attrs+ : a hash where all members will be mapped to key="value"
       
-      def label
-        @label ||= has_label? ? Elements.label(@attributes.delete(:label), :for => @attributes[:name], :required => required?) : ''
+      def self_closing_tag name, attrs = {}
+        "<#{name}#{optional_attrs(attrs)}/>\n"
       end
       
-      ##
-      # Wither or not this tag has a label.
-      
-      def has_label?
-        !@attributes[:label].blank?
-      end
-
-      ##
-      # Returns user generated classes as well as those generated by
-      # dm-forms for styling consistancy.
-    
-      def classes
-        @classes ||= [@attributes[:class], generate_classes].join(' ').strip if should_add_classes?
-      end
-            
       private
       
-      ##
-      # Generates element class(es) such as form-submit.
-              
-      def generate_classes
-        classes = "form-#{@name == :input ? @attributes[:type] : @name}"
-        classes << " form-#{@attributes[:name]}" unless @attributes[:name].blank?
-        classes
-      end
-    
-      ##
-      # Wither or not classes should be added to this element.
-    
-      def should_add_classes?
-        !(IGNORE_CLASSES_ON_ELEMENTS.include? @name or IGNORE_CLASSES_ON_ELEMENTS.include? @attributes[:type])
+      #:stopdoc:
+      
+      def optional_attrs attrs = {}
+        ' ' + boolean_attrs(attrs).to_html_attributes unless attrs.blank?
       end
-    
-      ##
-      # Return an +attribute+ or its +default+ value, removing
-      # it from @attributes so that final attributes rendered
-      # within the HTML are not cluttered with ad-hoc keys.
-    
-      def attribute attribute, default = nil
-        @attributes.delete(attribute) || default 
+      
+      def boolean_attrs attrs = {}
+        attrs.each do |key, value|
+          if key.in? BOOL_ATTRIBUTES
+            value.to_bool ? attrs[key] = key : attrs.delete(key)
+          end
+        end
       end
-    
+      
     end
   end
-end
+end