JunKikuchi-block-html 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/block-html/form.rb

@@ -1,114 +1,106 @@
 class BlockHTML
-  def self.normalize_model_name(model)
-    model.class.name.gsub(/::/, '_').downcase
-  end
-
-  def normalize_params(_name, params)
-    if @model.nil?
-      id   = params[:id] || _name
-      name = _name
-    else
-      model_name = self.class.normalize_model_name(@model)
-      id   = params[:id] || "#{model_name}_#{_name}"
-      name = "#{model_name}[#{_name}]"
+  class Form < BlockHTML
+    def tag(tag, attrs={}, &block)
+      self << Tag.new(nil, tag, attrs, @env_instance, &block)
     end
 
-    value   = @model[_name.to_sym] unless @model.nil?
-    value ||= params[:value] || params[:default] || nil
-
-    label = params[:label] || _name
+    def form(attrs={}, &block)
+      tag(:form, attrs, &block)
+    end
 
-    errors   = @model.errors[_name.to_sym] unless @model.nil?
-    errors ||= params[:error] || []
+    class Tag < BlockHTML::Tag
+      def initialize(model, name, attrs={}, env_instance=nil, &block)
+        @model = model
+        super(name, attrs, env_instance, &block)
+      end
 
-    [id, name, value, label, errors]
-  end
-  private :normalize_params
+      def tag(tag, attrs={}, &block)
+        self << Tag.new(@model, tag, attrs, @env_instance, &block)
+      end
 
-  def error_tag(bhtml, errors)
-    bhtml.tag(:div, :class => :form_error_messages) do |div|
-      errors.each do |error|
-        div.tag(:p, :class => :form_error_message) do |_p|
-          _p.text error
-        end
+      def model(model, &block)
+        @model = model
+        block.call(self)
+        @model = nil
       end
-    end unless errors.empty?
-  end
-  private :error_tag
 
-  def form(attrs={}, &block)
-    tag :form, attrs do |form|
-      form.tag :dl, &block
-    end
-  end
+      def errors(name, params={})
+        return if @model.nil? || @model.errors[name].empty?
 
-  def for(model, &block)
-    @model = model
-    block.call self
-    @model = nil
-  end
+        tag(:div, params) {
+          @model.errors.on(name).each do |val|
+            tag(:p).text(val)
+          end
+        }
+      end
 
-  #
-  # params[:id]
-  # params[:value]
-  # params[:default]
-  # params[:label]
-  #
-  def edit(_name, params={})
-    id, name, value, label, errors = normalize_params(_name, params)
+      def edit(name, attrs={})
+        self << Element::Input.new(
+          @model,
+          attrs.merge(:name => name, :type => :text)
+        )
+      end
 
-    tag(:dt).tag(:label, :for => id).text label
-    tag(:dd) do |dd|
-      dd.tag :input,
-        :type  => :text,
-        :id    => id,
-        :name  => name,
-        :value => value
-      error_tag(dd, errors)
-    end
-  end
+      %w(file hidden).each do |type|
+        class_eval %Q{
+          def #{type}(name, attrs={})
+            self << Element::Input.new(
+              @model,
+              attrs.merge(:name => name, :type => :#{type})
+            )
+          end
+        }
+      end
 
-  def password(_name, params={})
-    id, name, value, label, errors = normalize_params(_name, params)
+      %w(submit reset button radio).each do |type|
+        class_eval %Q{
+          def #{type}(name, attrs={})
+            self << Element::Button.new(
+              @model,
+              attrs.merge(:name => name, :type => :#{type})
+            )
+          end
+        }
+      end
 
-    tag(:dt).tag(:label, :for => id).text label
-    tag(:dd) do |dd|
-      dd.tag :input,
-        :type => :password,
-        :id   => id,
-        :name => name
-      error_tag(dd, errors)
+      def checkbox(name, attrs={})
+        self << Element::Checkbox.new(
+          @model,
+          attrs.merge(:name => name, :type => :checkbox)
+        )
+      end
     end
-  end
-
-  def checkbox(_name, params={})
-    id, name, value, label, errors = normalize_params(_name, params)
 
-    attrs = {
-      :type => 'submit',
-      :id   => id,
-      :name => name
-    }
-    attrs[:checked] = '' if value
+    class Element < BlockHTML
+      def initialize(model, attrs)
+        super()
+        @model = model
+        @attrs = attrs
+        @name  = @attrs[:name]
+        @id    = @attrs[:id] || @name
+        @value = @model ? @model.__send__(@name) : @attrs[:value]
+      end
 
-    tag(:dt).tag(:label, :for => id).text label
-    tag(:dd) do |dd|
-      dd.tag :input, attrs
-      error_tag(dd, errors)
-    end
-  end
+      class Input < Element
+        def initialize(model, attrs)
+          super(model, attrs)
+          tag(:input, @attrs.merge(:id => @id, :value => @value))
+        end
+      end
 
-  def submit(_name, params={})
-    id, name, value, label, errors = normalize_params(_name, params)
+      class Button < Element
+        def initialize(model, attrs)
+          super(model, attrs)
+          tag(:input, @attrs.merge(:id => @id, :value => @value || @name))
+        end
+      end
 
-    tag(:dt).text
-    tag(:dd) do |dd|
-      dd.tag :input,
-        :type  => :submit,
-        :id    => id,
-        :name  => name,
-        :value => label || name
-      error_tag(dd, errors)
+      class Checkbox < Element
+        def initialize(model, attrs)
+          super(model, attrs)
+          tag(:input, @value ? @attrs.merge(:checked => '') : @attrs)
+        end
+      end
     end
   end
 end

data/lib/block-html.rb

@@ -71,6 +71,12 @@ class BlockHTML
     self
   end
 
+  def form(attrs={}, &block)
+    self << Form.new(@env_instance) {
+      form(attrs, &block)
+    }
+  end
+
   def render(renderer)
     each do |node|
       node.render(renderer)
@@ -140,14 +146,6 @@ class BlockHTML
       super(env_instance, &block)
     end
 
-    def [](key)
-      @attrs[key]
-    end
-
-    def []=(key, val)
-      @attrs[key] = val
-    end
-
     def render(renderer)
       renderer.tag(self, @name, @attrs)
     end
@@ -291,4 +289,6 @@ class BlockHTML
       @buf
     end
   end
+
+  autoload :Form, 'block-html/form'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: JunKikuchi-block-html
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jun Kikuchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -07:00
+date: 2009-09-06 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - spec/block-html_spec.rb
 has_rdoc: false
 homepage: http://github.com/JunKikuchi/block-html
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -53,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: block-html