Changeset 1002

Timestamp:

11/14/07 21:36:21 (1 year ago)

Author:

iv..@gweezlebur.com

Message:

Add file_field and file_control to merb_helpers / thanks ShayArnett? / Closes #297

Files:

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

plugins/merb_helpers/Rakefile

@@ -21 +21 @@
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-requirements << 'merb'
+add_dependency("merb", ">=0.4")
-  s.require_path = 'lib'
-  s.autorequire = PLUGIN
@@ -27 +27 @@
-end
-
-spec.add_dependency("merb", ">=0.4")
-
-Rake::GemPackageTask.new(spec) do |pkg|

plugins/merb_helpers/lib/form_helpers.rb

@@ -166 +166 @@
-      end
-      
+      ## file input control
+      def file_control(col, attrs = {})
+        errorify_field(attrs, col)
+        file_field(control_name_value(col, attrs))
+      end
+      
+      def file_field(attrs = {})
+        attrs.merge!(:type => "file")
+        optional_label(attrs) { self_closing_tag("input", attrs) }
+      end
+      
-      private
-      # Fake out the browser to send back the method for RESTful stuff.

plugins/merb_helpers/specs/merb_helpers_spec.rb

@@ -466 +466 @@
-end
-
+describe "file_field (basic)" do
+  it_should_behave_like "FakeBufferConsumer"
+  
+  it "should return a basic file field based on the values passed in" do
+    file_field(:name => "foo", :value => "bar").should match_tag( :input, :type => "file", :name => "foo", :value => "bar")
+  end
+  
+  it "should wrap the field in a label if the :label option is passed to the file_field" do
+    result = file_field(:label => "LABEL" )
+    result.should match(/<label>LABEL<input type="file"\s*\/><\/label>/)
+  end
+end
+
+describe "file_control (data bound)" do
+  it_should_behave_like "FakeBufferConsumer"
+  
+  it "should take a string object and return a useful file control" do
+    f = form_for :obj do
+      file_control(:foo).should match_tag(:input, :type => "file", :name => "fake_model[foo]", :value => "foowee")
+    end
+  end
+
+  it "should take additional attributes and use them" do
+    form_for :obj do
+      file_control(:foo, :bar => "7").should match_tag(:input, :type => "file", :name => "fake_model[foo]", :value => "foowee", :bar => "7")
+    end
+  end
+  
+  it "should wrap the file_control in a label if the :label option is passed in" do
+    form_for :obj do
+      _buffer << text_control(:foo, :label => "LABEL")
+    end
+    _buffer.should match(/<label>LABEL<input/)
+    res = _buffer.scan(/<[^>]*>/)
+    res[2].should_not match_tag(:input, :label => "LABEL")
+  end
+end
+