Changeset 731

Timestamp:

10/08/07 16:35:13 (1 year ago)

Author:

wyca..@gmail.com

Message:

Lots of progress on merb helpers

Files:

• plugins/merb_helpers/lib/form_helpers.rb (modified) (2 diffs)
• plugins/merb_helpers/specs/merb_helpers_spec.rb (modified) (2 diffs)
• plugins/merb_helpers/specs/spec_helper.rb (modified) (1 diff)

plugins/merb_helpers/lib/form_helpers.rb

@@ +1 @@
+class Hash
+  
+  def to_html_attributes
+    map do |k,v|
+      "#{k.to_s.camelize.downcase}=\"#{v}\""
+    end.join(" ")
+  end
+  
+  def add_html_class!(html_class)
+    if self[:class]
+      self[:class] = "#{self[:class]} #{html_class}"
+    else
+      self[:class] = html_class
+    end
+  end
+  
+end
+
-module Merb
-  module Helpers
@@ -18 +36 @@
-      end
-      
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        old_obj, @_obj = @_obj, instance_variable_get("@#{obj}")
-        @_object_name = obj
-        old_block, @_block = @_block, block
-        
-
-
-
-
+
+
+
-      end
-      
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-      

plugins/merb_helpers/specs/merb_helpers_spec.rb

@@ -5 +5 @@
-include Merb::ErubisCaptureMixin
-include Merb::Helpers::Form
-
-
-describe "error_messages_for" do
@@ -37 +36 @@
-end
-
-
-
-
-
+
+
-  
-
-
+
+
+
+
+
+
-  end
-end
-
-
-
-
-
+
+
+
+
+
+
+
+
-  end
-end
-
-
+
+
-  
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
+end
+
+describe "text_field (basic)" do
+  it "should return a basic text field based on the values passed in" do
+    text_field(:name => "foo", :value => "bar").should == "<input type=\"text\" name=\"foo\" value=\"bar\"/>"  
+  end
+end
+
+describe "text_control (data bound)" do
+  it_should_behave_like "FakeBufferConsumer"
-  
-  it "should take a string object and return a useful text control" do
-    f = form_for :obj do
-== "<form><input type='text' name='obj[foo]' value='foowee'/>"
+match_tag(:input, :type => "text", :name => "obj[foo]", :value => "foowee")
-    end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-  
+  it "should render controls with errors if their attribute contains an error" do
+    form_for :obj do
+      checkbox_control(:bazbad).should match_tag(:input, :type =>"checkbox", :name => "obj[bazbad]", 
+        :class => "error checkbox", :value => "1", :checked => "checked")
+      checkbox_control(:batbad).should match_tag(:input, :type =>"checkbox", :name => "obj[batbad]", 
+        :class => "error checkbox", :value => "0")        
+    end
+  end
+    
-end
+
+describe "hidden_field (basic)" do
+  include TagMatchers
+  
+  it "should return a basic checkbox based on the values passed in" do
+    hidden_field(:name => "foo", :value => "bar").should match_tag(:input, :type => "hidden", :name => "foo", :value => "bar")
+  end
+end
+
+describe "hidden_control (data bound)" do
+  it_should_behave_like "FakeBufferConsumer"
+    
+  it "should take a string and return a useful checkbox control" do
+    form_for :obj do
+      hidden_control(:foo).should match_tag(:input, :type =>"hidden", :name => "obj[foo]", :value => "foowee")
+    end
+  end
+  
+  it "should render controls with errors if their attribute contains an error" do
+    form_for :obj do
+      hidden_control(:foobad).should match_tag(:input, :type =>"hidden", :name => "obj[foobad]", :value => "foowee", :class => "error")
+    end
+  end
+    
+end
+
+describe "radio button (basic)" do
+  include TagMatchers
+  it "should should return a basic radio button based on the values passed in" do
+    radio_field(:name => "foo", :value => "bar").should match_tag(:input, :type => "radio", :name => "foo", :value => "bar")
+  end
+end
+
+describe "radio button groups (data bound)" do
+  it_should_behave_like "FakeBufferConsumer"
+  
+  it "should return a group of radio buttons" do
+    form_for :obj do
+      radio = radio_group_control(:foo, [:foowee, :baree]).scan(/<[^>]*>/)
+      radio[0].should match_tag(:input, :type => "radio", :name => "obj[foo]", :value => "foowee", :selected => "selected")
+      radio[1].should match_tag(:input, :type => "radio", :name => "obj[foo]", :value => "baree")
+      radio[1].should not_match_tag(:selected => "selected")
+    end
+  end
+end
+
+describe "submit_button" do
+  it_should_behave_like "FakeBufferConsumer"
+    
+  it "should produce a simple submit button" do
+    submit_button("Foo").should == "<button type=\"submit\">Foo</button>"
+  end
+end

plugins/merb_helpers/specs/spec_helper.rb

@@ -3 +3 @@
-require 'rubygems'
-require 'merb'
+
+module TagMatchers
+  class MatchTag
+    def initialize(name, attrs)
+      @name, @attrs = name, attrs
+    end
+
+    def matches?(target)
+      @errors = []
+      unless target.include?("<#{@name}")
+        @errors << "Expected a <#{@name}>, but was #{target}"
+      end
+      @attrs.each do |attr, val|
+        unless target.include?("#{attr}=\"#{val}\"")
+          @errors << "Expected #{attr}=\"#{val}\", but was #{target}"
+        end
+      end
+      @errors.size == 0
+    end
+    
+    def failure_message
+      @errors[0]
+    end
+  end
+  
+  class NotMatchTag
+    def initialize(attrs)
+      @attrs = attrs
+    end
+    
+    def matches?(target)
+      @errors = []
+      @attrs.each do |attr, val|
+        if target.include?("#{attr}=\"#{val}\"")
+          @errors << "Should not include #{attr}=\"#{val}\", but was #{target}"
+        end
+      end
+      @errors.size == 0
+    end
+    
+    def failure_message
+      @errors[0]
+    end
+  end
+  
+  def match_tag(name, attrs)
+    MatchTag.new(name, attrs)
+  end
+  def not_match_tag(attrs)
+    NotMatchTag.new(attrs)
+  end
+end
+
+class FakeModel
+  def self.columns
+    [FakeColumn.new(:foo, :string), 
+     FakeColumn.new(:foobad, :string),       
+     FakeColumn.new(:bar, :integer), 
+     FakeColumn.new(:barbad, :integer),      
+     FakeColumn.new(:baz, :boolean),
+     FakeColumn.new(:bazbad, :boolean),
+     FakeColumn.new(:bat, :boolean),
+     FakeColumn.new(:batbad, :boolean)
+     ]     
+  end
+  
+  def valid?
+    false
+  end
+  
+  def errors
+    FakeErrors.new(self)
+  end
+  
+  def foo
+    "foowee"
+  end
+  alias_method :foobad, :foo
+  
+  def bar
+    7
+  end
+  alias_method :barbad, :bar
+  
+  def baz
+    true
+  end
+  alias_method :bazbad, :baz
+  
+  def bat
+    false
+  end
+  alias_method :batbad, :bat
+end
+
+class FakeModel2 < FakeModel
+
+  def foo
+    "foowee2"
+  end
+  alias_method :foobad, :foo
+  
+end
+
+class FakeErrors
+  
+  def initialize(model)
+    @model = model
+  end
+  
+  def on(name)
+    name.to_s.include?("bad")
+  end
+  
+end
+
+class FakeColumn
+  attr_accessor :name, :type
+  def initialize(name, type)
+    @name, @type = name, type
+  end
+end
+
+describe "FakeBufferConsumer", :shared => true do
+  include TagMatchers
+  
+  before :each do
+    @obj = FakeModel.new
+    def _buffer(buf = "") @buffer ||= "" end    
+  end
+end