drogus-merb-sexy-forms 0.0.3 → 0.0.4

data/Rakefile

@@ -10,7 +10,7 @@ require "spec/rake/spectask"
 require 'lib/merb-sexy-forms/merbtasks.rb'
 
 GEM_NAME = "merb-sexy-forms"
-GEM_VERSION = "0.0.3"
+GEM_VERSION = "0.0.4"
 AUTHOR = "Piotr Sarnacki"
 EMAIL = "drogus@gmail.com"
 HOMEPAGE = ""
@@ -28,7 +28,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 1.0.6.1')
+  s.add_dependency('merb', '>= 1.0.7.1')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,assets}/**/*")
   

data/TODO

@@ -1 +1,5 @@
 TODO:
+Add :required option.
+Add :description option - probably provided also with block to easily add more text
+Add error support - displaying errors "near" fields and error class in containers with fields with error.
+

data/lib/merb-sexy-forms.rb

@@ -3,7 +3,7 @@ if defined?(Merb::Plugins)
 
   # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
   Merb::Plugins.config[:merb_sexy_forms] = {
-    :chickens => false
+    :container_tag => "li"
   }
   
   Merb::BootLoader.before_app_loads do
@@ -17,4 +17,4 @@ if defined?(Merb::Plugins)
   end
   
   Merb::Plugins.add_rakefiles "merb-sexy-forms/merbtasks"
-end
+end

data/lib/merb-sexy-forms/builder.rb

@@ -2,98 +2,108 @@ module Merb::Helpers::SexyForm
   module Builder
     class Base < Merb::Helpers::Form::Builder::ResourcefulFormWithErrors
       def form(attrs = {}, &blk)
-        ul_options = attrs.delete(:ul)
         add_css_class(attrs, "sexy")
         super(attrs) do
           captured = @origin.capture(&blk)
-          tag(:ul, captured, ul_options)
+          add_main_container(captured, attrs)
         end
       end
 
-      def wrap_with_container(attrs = {}, content = "")
-        li = attrs.delete(:li)
-        container = attrs.delete(:container)
-
-        first = attrs.delete(:first)
-        method = attrs.delete(:method)
-
-        if first && (attrs[:id] || method)
-          if method
-            id = method ? "#{@name}_#{method}" : attrs[:id]
-          end
-          label_id = "#{id}_#{first[:value]}"
-        else
-          label_id = attrs[:id]
-        end
-
-        label = attrs.delete(:label)
-        if label && !label.is_a?(Hash)
-          label = {:label => {:title => label}}
-        end
-        if label.is_a?(Hash)
-          label[:label].merge!({:class => "main", :for => label_id})
-        end
-        label = label(label)
-
-        if container == false
-          content = label + content
+      def add_main_container(content, attrs)
+        ul_options = attrs.delete(:ul)
+        if Merb::Plugins.config[:merb_sexy_forms][:container_tag] == "li"
+          tag(:ul, content, ul_options)
         else
-          content = label + tag(:div, content, container)
-        end
-
-        if li == false
           content
-        else
-          li = li || {}
-          li.merge!(:id => "#{attrs[:id]}_container") if attrs[:id] and li[:id].blank?
-          tag(:li, content, li)
         end
       end
 
+      def wrap_with_container(attrs = {}, content = "")
+        content = add_html_to_field(content, attrs)
+        content = add_field_wrapper(content, attrs)
+        content = add_main_label(content, attrs)
+        content = add_container(content, attrs)
+      end
+
+
       %w(text password file).each do |kind|
         self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def unbound_#{kind}_field(attrs = {})
+          def unbound_#{kind}_field(attrs = {}, &blk)
+            yield(attrs) if block_given?
             label = attrs.delete(:label)
             wrap_with_container(attrs.merge(:label => label), super(clean_args!(attrs)))
           end
+
+          def bound_#{kind}_field(method, attrs = {}, &blk)
+            yield(attrs) if block_given?
+            super
+          end
         RUBY
       end
 
       def unbound_check_box(attrs = {})
+        yield(attrs) if block_given?
         update_label_options(attrs, "radio")
         wrap_with_container(attrs.merge(:label => nil),
             super(clean_args!(attrs)))
       end
 
+      def bound_check_box(method, attrs = {}, &blk)
+        yield(attrs) if block_given?
+        super
+      end
+
       def unbound_radio_button(attrs = {})
+        yield(attrs) if block_given?
         update_label_options(attrs, "radio")
         wrap_with_container(attrs.merge(:label => nil),
             super(clean_args!(attrs)))
       end
 
+      def bound_radio_button(method, attrs = {}, &blk)
+        yield(attrs) if block_given?
+        super
+      end
+
       def bound_radio_group(method, arr, global_attrs = {})
+        yield(attrs) if block_given?
         first = arr.first
         wrap_with_container(global_attrs.merge(:first => first, :method => method), super(method, arr))
       end
 
       def unbound_radio_group(arr, global_attrs = {})
+        yield(attrs) if block_given?
         wrap_with_container(global_attrs, super(arr))
       end
 
       def unbound_select(attrs = {})
+        yield(attrs) if block_given?
         wrap_with_container(attrs, super(clean_args!(attrs)))
       end
 
+      def bound_select(method, attrs = {}, &blk)
+        yield(attrs) if block_given?
+        super
+      end
+
       def unbound_text_area(contents, attrs = {})
+        yield(attrs) if block_given?
         label = attrs.delete(:label)
         wrap_with_container(attrs.merge(:label => label), super(clean_args!(attrs)))
       end
 
+      def bound_text_area(method, attrs = {}, &blk)
+        yield(attrs) if block_given?
+        super
+      end
+
       def button(contents, attrs = {})
+        yield(attrs) if block_given?
         wrap_with_container(attrs, super(contents, clean_args!(attrs)))
       end
 
       def submit(value, attrs = {})
+        yield(attrs) if block_given?
         wrap_with_container(attrs, super(value, clean_args!(attrs)))
       end
 
@@ -110,8 +120,10 @@ module Merb::Helpers::SexyForm
 
       def clean_args!(attrs)
         new_attrs = attrs.dup
-        new_attrs.delete(:li)
+        new_attrs.delete(:wrapper)
         new_attrs.delete(:container)
+        new_attrs.delete(:before)
+        new_attrs.delete(:after)
         new_attrs
       end
 
@@ -123,15 +135,81 @@ module Merb::Helpers::SexyForm
       end
 
       def process_form_attrs(attrs)
-        attrs[:id] = "#{@name}" unless attrs[:id] || @name.nil?
+        attrs[:id] = "#{@name}" unless attrs[:id] || @obj.nil?
 
-        if (@obj.respond_to?(:new_record?) && !@obj.new_record?) || (@obj.respond_to?(:new?) && !@obj.new?)
-          add_css_class(attrs, "edit")
-        else
-          add_css_class(attrs, "new")
+        if @obj
+          if (@obj.respond_to?(:new_record?) && !@obj.new_record?) || (@obj.respond_to?(:new?) && !@obj.new?)
+            add_css_class(attrs, "edit")
+          else
+            add_css_class(attrs, "new")
+          end
         end
         super(attrs)
       end
+
+      def add_main_label(content, attrs)
+        first = attrs.delete(:first)
+        method = attrs.delete(:method)
+
+        if first && (attrs[:id] || method)
+          if method && @obj
+            id = method ? "#{@name}_#{method}" : attrs[:id]
+          end
+          label_for = "#{id}_#{first[:value]}"
+        else
+          label_for = attrs[:id]
+        end
+
+        label = attrs.delete(:label)
+        
+        if label && !label.is_a?(Hash)
+          label = {:label => {:title => label}}
+        end
+
+        if label.is_a?(Hash)
+          label = label[:label]
+          label.merge!({:class => "main", :for => label_for})
+        end
+
+        label = label(label)
+
+        label + content
+      end
+
+      def add_container(content, attrs)
+        container = attrs.delete(:container)
+
+        if container == false
+          content
+        else
+          container = container || {}
+          container.merge!(:id => "#{attrs[:id]}_container") if attrs[:id] and container[:id].blank?
+          container_tag = Merb::Plugins.config[:merb_sexy_forms][:container_tag]
+          tag(container_tag, content, container)
+        end
+      end
+
+      def add_field_wrapper(content, attrs)
+        wrapper = attrs.delete(:wrapper)
+        if wrapper == false
+          content
+        else
+          tag(:div, content, wrapper)
+        end
+      end
+
+      def add_html_to_field(content, attrs)
+        before = attrs.delete(:before)
+        after = attrs.delete(:after)
+
+        if before
+          content = before + content
+        end
+        if after
+          content = content + after
+        end
+        content
+      end
     end
   end
-end
+end

data/lib/merb-sexy-forms/form.rb

@@ -17,4 +17,26 @@ module Merb::Helpers::Form
     form_contexts.pop
     ret
   end
-end
+
+  # monkey patching - need to do something about it
+  %w(text_field password_field hidden_field file_field
+  text_area select check_box radio_button radio_group).each do |kind|
+    self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+      def #{kind}(*args, &blk)
+        if bound?(*args)
+          current_form_context.bound_#{kind}(*args, &blk)
+        else
+          current_form_context.unbound_#{kind}(*args, &blk)
+        end
+      end
+    RUBY
+  end
+
+  def submit(contents, attrs = {}, &blk)
+    current_form_context.submit(contents, attrs, &blk)
+  end
+
+  def button(contents, attrs = {}, &blk)
+    current_form_context.button(contents, attrs, &blk)
+  end
+end

data/spec/fixture/app/controllers/sexy_form_for.rb

@@ -0,0 +1,2 @@
+class SexyFormForSpecs < SpecController
+end

data/spec/fixture/app/models/first_generic_fake_model.rb

@@ -0,0 +1,58 @@
+class FakeModel
+  
+  attr_accessor :vin, :make, :model
+  
+  def self.columns
+    [FakeColumn.new(:foo, :string), 
+     FakeColumn.new(:foobad, :string),
+     FakeColumn.new(:desc, :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),
+     FakeColumn.new(:foobar, :string)
+     ]     
+  end
+  
+  def valid?
+    false
+  end
+  
+  def new_record?
+    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
+  
+  def nothing
+    nil
+  end
+  
+  def to_s
+    'fake_model'
+  end
+end

data/spec/fixture/app/views/sexy_form_for_specs/additional_options.html.erb

@@ -0,0 +1,6 @@
+<%= sexy_form_for(@obj, :ul => {:class => "ul_class"}) do %>
+  <%= text_field :foo, :label => "Label: ",
+          :container => {:class => "contaiener_class"},
+          :wrapper => {:class => "wrapper_class" }
+   %>
+<% end =%>

data/spec/fixture/app/views/sexy_form_for_specs/append_attributes.html.erb

@@ -0,0 +1,7 @@
+<%= sexy_form_for(@obj, :ul => {:class => "ul_class"}) do %>
+  <%= text_field :foo,
+          :label => "Label: ",
+          :class => "class",
+          :id => "id"
+   %>
+<% end =%>

data/spec/fixture/app/views/sexy_form_for_specs/basic.html.erb

@@ -0,0 +1,3 @@
+<%= sexy_form_for(@obj) do %>
+  <%= text_field :foo, :label => "Label: " %>
+<% end =%>

data/spec/fixture/app/views/sexy_form_for_specs/before_after_field.html.erb

@@ -0,0 +1,6 @@
+<%= sexy_form_for(@obj, :ul => {:class => "ul_class"}) do %>
+  <%= text_field :foo,
+          :label => "Label: ", 
+          :before => '<span class="before"></span>', 
+          :after => '<span class="after"></span>' %>
+<% end =%>

data/spec/fixture/app/views/sexy_form_for_specs/blocks.html.erb

@@ -0,0 +1,23 @@
+<%= sexy_form_for(@obj, :ul => {:class => "ul_class"}) do %>
+  <%= text_field :foo do |c| %>
+    <% c[:class] = "text_class" %>
+  <% end =%>
+  <%= text_area :foo do |c| %>
+    <% c[:class] = "textarea_class" %>
+  <% end =%>
+  <%= check_box :baz do |c|%>
+    <% c[:class] = "checkbox_class" %>
+  <% end =%>
+  <%= radio_button :bat do |c|%>
+    <% c[:class] = "radio_class" %>
+  <% end =%>
+  <%= select :bar do |c|%>
+    <% c[:class] = "select_class" %>
+  <% end =%>
+  <%= button "contents" do |c| %>
+    <% c[:class] = "button_class" %>
+  <% end =%>
+  <%= submit "contents" do |c| %>
+    <% c[:class] = "submit_class" %>
+  <% end =%>
+<% end =%>

data/spec/fixture/app/views/sexy_form_for_specs/label_choice_class.html.erb

@@ -0,0 +1,4 @@
+<%= sexy_form_for(@obj) do %>
+  <%= radio_button :foo, :label => "Radio label: ", :id => "radio" %>
+  <%= check_box :bar, :label => "Checkbox label: ", :id => "checkbox" %>
+<% end =%>

data/spec/fixture/app/views/sexy_form_for_specs/with_labels.html.erb

@@ -0,0 +1,3 @@
+<%= sexy_form_for(@obj) do %>
+  <%= text_field :foo, :label => "Label: " %>
+<% end =%>

data/spec/fixture/app/views/sexy_form_specs/additional_options.html.erb

@@ -0,0 +1,3 @@
+<%= sexy_form(:ul => {:class => "ul_class"}) do %>
+  <%= text_field :name => "name", :label => "Label: ", :container => {:class => "contaiener_class"}, :wrapper => {:class => "wrapper_class"} %>
+<% end =%>

data/spec/fixture/app/views/sexy_form_specs/append_attributes.html.erb

@@ -0,0 +1,3 @@
+<%= sexy_form(:ul => {:class => "ul_class"}) do %>
+  <%= text_field :name => "name", :label => "Label: ", :class => "class", :id => "id" %>
+<% end =%>

data/spec/fixture/app/views/sexy_form_specs/basic.html.erb

@@ -0,0 +1,3 @@
+<%= sexy_form() do %>
+  <%= text_field :name => "name", :label => "Label: " %>
+<% end =%>

data/spec/fixture/app/views/sexy_form_specs/before_after_field.html.erb

@@ -0,0 +1,6 @@
+<%= sexy_form(:ul => {:class => "ul_class"}) do %>
+  <%= text_field :name => "name", 
+          :label => "Label: ", 
+          :before => '<span class="before"></span>', 
+          :after => '<span class="after"></span>' %>
+<% end =%>

data/spec/fixture/app/views/sexy_form_specs/blocks.html.erb

@@ -0,0 +1,23 @@
+<%= sexy_form(:ul => {:class => "ul_class"}) do %>
+  <%= text_field do |c|%>
+    <% c[:class] = "text_class" %>
+  <% end =%>
+  <%= text_area "content" do |c|%>
+    <% c[:class] = "textarea_class" %>
+  <% end =%>
+  <%= check_box do |c|%>
+    <% c[:class] = "checkbox_class" %>
+  <% end =%>
+  <%= radio_button do |c|%>
+    <% c[:class] = "radio_class" %>
+  <% end =%>
+  <%= select do |c|%>
+    <% c[:class] = "select_class" %>
+  <% end =%>
+  <%= button "contents" do |c| %>
+    <% c[:class] = "button_class" %>
+  <% end =%>
+  <%= submit "contents" do |c| %>
+    <% c[:class] = "submit_class" %>
+  <% end =%>
+<% end =%>

data/spec/merb_test.log

@@ -1 +1,94 @@
 Sat, 20 Dec 2008 13:41:20 GMT  ~  info  ~  Logfile created
+ ~ Could not load ./spec/fixture/app/views/sexy_form_for.rb:
+
+uninitialized constant SpecController - (NameError)
+
+./spec/fixture/app/views/sexy_form_for.rb:1
+/usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require'
+/usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in `require'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:863:in `load_file'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:1018:in `load_classes_with_requirements'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:1015:in `each'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:1015:in `load_classes_with_requirements'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:903:in `load_classes'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:641:in `run'
+/usr/lib/ruby/gems/1.8/gems/extlib-0.9.9/lib/extlib/dictionary.rb:268:in `each'
+/usr/lib/ruby/gems/1.8/gems/extlib-0.9.9/lib/extlib/dictionary.rb:268:in `each'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:639:in `run'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:99:in `run'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/server.rb:172:in `bootup'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/server.rb:42:in `start'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core.rb:170:in `start'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core.rb:183:in `start_environment'
+./spec/spec_helper.rb:18
+./spec/sexy_form_for_spec.rb:1:in `require'
+./spec/sexy_form_for_spec.rb:1
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:14:in `load'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:14:in `load_files'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:13:in `each'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:13:in `load_files'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/options.rb:98:in `run_examples'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/command_line.rb:10:in `run'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/bin/spec:4
+ ~ Could not load ./spec/fixture/app/views/sexy_form_for.rb:
+
+uninitialized constant SpecController - (NameError)
+
+./spec/fixture/app/views/sexy_form_for.rb:1
+/usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require'
+/usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in `require'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:863:in `load_file'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:1018:in `load_classes_with_requirements'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:1015:in `each'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:1015:in `load_classes_with_requirements'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:903:in `load_classes'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:641:in `run'
+/usr/lib/ruby/gems/1.8/gems/extlib-0.9.9/lib/extlib/dictionary.rb:268:in `each'
+/usr/lib/ruby/gems/1.8/gems/extlib-0.9.9/lib/extlib/dictionary.rb:268:in `each'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:639:in `run'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:99:in `run'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/server.rb:172:in `bootup'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/server.rb:42:in `start'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core.rb:170:in `start'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core.rb:183:in `start_environment'
+./spec/spec_helper.rb:18
+./spec/sexy_form_for_spec.rb:1:in `require'
+./spec/sexy_form_for_spec.rb:1
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:14:in `load'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:14:in `load_files'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:13:in `each'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:13:in `load_files'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/options.rb:98:in `run_examples'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/command_line.rb:10:in `run'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/bin/spec:4
+ ~ Could not load ./spec/fixture/app/views/sexy_form_for.rb:
+
+uninitialized constant SpecController - (NameError)
+
+./spec/fixture/app/views/sexy_form_for.rb:1
+/usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in `gem_original_require'
+/usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:31:in `require'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:863:in `load_file'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:1018:in `load_classes_with_requirements'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:1015:in `each'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:1015:in `load_classes_with_requirements'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:903:in `load_classes'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:641:in `run'
+/usr/lib/ruby/gems/1.8/gems/extlib-0.9.9/lib/extlib/dictionary.rb:268:in `each'
+/usr/lib/ruby/gems/1.8/gems/extlib-0.9.9/lib/extlib/dictionary.rb:268:in `each'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:639:in `run'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/bootloader.rb:99:in `run'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/server.rb:172:in `bootup'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core/server.rb:42:in `start'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core.rb:170:in `start'
+/usr/lib/ruby/gems/1.8/gems/merb-core-1.0.6.1/lib/merb-core.rb:183:in `start_environment'
+./spec/spec_helper.rb:18
+./spec/sexy_form_for_spec.rb:1:in `require'
+./spec/sexy_form_for_spec.rb:1
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:14:in `load'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:14:in `load_files'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:13:in `each'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/example_group_runner.rb:13:in `load_files'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/options.rb:98:in `run_examples'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/lib/spec/runner/command_line.rb:10:in `run'
+/usr/lib/ruby/gems/1.8/gems/rspec-1.1.11/bin/spec:4

data/spec/sexy_form_for_spec.rb

@@ -0,0 +1,80 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "sexy_form_for" do
+
+  before :each do
+    @c = SexyFormForSpecs.new(Merb::Request.new({}))
+    @c.instance_variable_set(:@obj, FakeModel.new)
+    @container = Merb::Plugins.config[:merb_sexy_forms][:container_tag]
+  end
+
+  it "should allow to pass block to any field and set hash contents inside" do
+    ret = @c.render(:blocks)
+    ret.should have_selector("form input[type=text].text_class")
+    ret.should have_selector("form input[type=submit].submit_class")
+    ret.should have_selector("form button.button_class")
+    ret.should have_selector("form input[type=radio].radio_class")
+    ret.should have_selector("form input[type=checkbox].checkbox_class")
+    ret.should have_selector("form select.select_class")
+    ret.should have_selector("form textarea.textarea_class")
+  end
+
+  it "should insert some html after and before field" do
+    ret = @c.render(:before_after_field)
+    ret.should have_selector("form span.before")
+    ret.should have_selector("form span.after")
+
+    ret.should_not have_selector("*[after], *[before]")
+  end
+
+  it "should append attributes to field" do
+    ret = @c.render(:append_attributes)
+    ret.should have_selector("form input#id.class")
+  end
+
+  it "should not add options attrs" do
+    ret = @c.render(:additional_options)
+    ret.should_not have_selector("*[container], *[ul], *[wrapper]")
+  end
+
+  it "should add containers" do
+    ret = @c.render(:basic)
+    ret.should have_selector("form #{@container} > label")
+  end
+
+  it "should add ul if container tag is li" do
+    Merb::Plugins.config[:merb_sexy_forms][:container_tag] = "li"
+    ret = @c.render(:basic)
+    ret.should have_selector("form > ul")
+  end
+
+  it "should'nt add ul if container tag is not li" do
+    Merb::Plugins.config[:merb_sexy_forms][:container_tag] = "div"
+    ret = @c.render(:basic)
+    ret.should_not have_selector("form > ul")
+  end
+
+  it "should add labels with field nested in container" do
+    ret = @c.render(:with_labels)
+    ret.should have_selector("form #{@container} > label")
+    ret.should have_selector("form #{@container} > div > input")
+  end
+
+  it "should add 'choice' class to labels for checkboxes or radio buttons" do
+    ret = @c.render(:label_choice_class)
+    ret.should have_selector("form div label[for=checkbox].choice")
+    ret.should have_selector("form div label[for=radio].choice")
+  end
+
+  it "should not add 'choice' class to main labels with checkboxes or radio buttons" do
+    ret = @c.render(:label_choice_class)
+    ret.should_not have_selector("form label.choice.main")
+  end
+
+  it "should generate main labels if label option is provided" do
+    ret = @c.render(:basic)
+    ret.should have_selector("label.main[for=fake_model_foo]")
+  end
+end
+
+

data/spec/sexy_form_spec.rb

@@ -0,0 +1,79 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "sexy_form" do
+
+  before :each do
+    @c = SexyFormSpecs.new(Merb::Request.new({}))
+    @container = Merb::Plugins.config[:merb_sexy_forms][:container_tag]
+  end
+
+  it "should allow to pass block to any field and set hash contents inside" do
+    ret = @c.render(:blocks)
+    ret.should have_selector("form input[type=text].text_class")
+    ret.should have_selector("form input[type=submit].submit_class")
+    ret.should have_selector("form button.button_class")
+    ret.should have_selector("form input[type=radio].radio_class")
+    ret.should have_selector("form input[type=checkbox].checkbox_class")
+    ret.should have_selector("form select.select_class")
+    ret.should have_selector("form textarea.textarea_class")
+  end
+
+  it "should insert some html after and before field" do
+    ret = @c.render(:before_after_field)
+    ret.should have_selector("form span.before")
+    ret.should have_selector("form span.after")
+
+    ret.should_not have_selector("*[after], *[before]")
+  end
+
+  it "should append attributes to field" do
+    ret = @c.render(:append_attributes)
+    ret.should have_selector("form input#id.class")
+  end
+
+  it "should not add options attrs" do
+    ret = @c.render(:additional_options)
+    ret.should_not have_selector("*[container], *[ul], *[wrapper]")
+  end
+
+  it "should add containers" do
+    ret = @c.render(:basic)
+    ret.should have_selector("form #{@container} > label")
+  end
+
+  it "should add ul if container tag is li" do
+    Merb::Plugins.config[:merb_sexy_forms][:container_tag] = "li"
+    ret = @c.render(:basic)
+    ret.should have_selector("form > ul")
+  end
+
+  it "should'nt add ul if container tag is not li" do
+    Merb::Plugins.config[:merb_sexy_forms][:container_tag] = "div"
+    ret = @c.render(:basic)
+    ret.should_not have_selector("form > ul")
+  end
+
+  it "should add labels with field nested in container" do
+    ret = @c.render(:with_labels)
+    ret.should have_selector("form #{@container} > label")
+    ret.should have_selector("form #{@container} > div > input")
+  end
+
+  it "should add 'choice' class to labels for checkboxes or radio buttons" do
+    ret = @c.render(:label_choice_class)
+    ret.should have_selector("form div label[for=checkbox].choice")
+    ret.should have_selector("form div label[for=radio].choice")
+  end
+
+  it "should not add 'choice' class to main labels with checkboxes or radio buttons" do
+    ret = @c.render(:label_choice_class)
+    ret.should_not have_selector("form label.choice.main")
+  end
+
+  it "should generate main labels if label option is provided" do
+    ret = @c.render(:basic)
+    ret.should have_selector("label.main")
+  end
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drogus-merb-sexy-forms
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Piotr Sarnacki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-20 00:00:00 -08:00
+date: 2009-01-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.6.1
+        version: 1.0.7.1
     version: 
 description: Merb plugin that provides extended builder for forms
 email: drogus@gmail.com
@@ -45,12 +45,28 @@ files:
 - spec/fixture/app
 - spec/fixture/app/controllers
 - spec/fixture/app/controllers/application.rb
+- spec/fixture/app/controllers/sexy_form_for.rb
 - spec/fixture/app/controllers/sexy_form.rb
 - spec/fixture/app/controllers/specs_controller.rb
 - spec/fixture/app/views
 - spec/fixture/app/views/sexy_form_specs
 - spec/fixture/app/views/sexy_form_specs/label_choice_class.html.erb
+- spec/fixture/app/views/sexy_form_specs/additional_options.html.erb
 - spec/fixture/app/views/sexy_form_specs/with_labels.html.erb
+- spec/fixture/app/views/sexy_form_specs/before_after_field.html.erb
+- spec/fixture/app/views/sexy_form_specs/append_attributes.html.erb
+- spec/fixture/app/views/sexy_form_specs/blocks.html.erb
+- spec/fixture/app/views/sexy_form_specs/basic.html.erb
+- spec/fixture/app/views/sexy_form_for_specs
+- spec/fixture/app/views/sexy_form_for_specs/label_choice_class.html.erb
+- spec/fixture/app/views/sexy_form_for_specs/additional_options.html.erb
+- spec/fixture/app/views/sexy_form_for_specs/with_labels.html.erb
+- spec/fixture/app/views/sexy_form_for_specs/before_after_field.html.erb
+- spec/fixture/app/views/sexy_form_for_specs/append_attributes.html.erb
+- spec/fixture/app/views/sexy_form_for_specs/blocks.html.erb
+- spec/fixture/app/views/sexy_form_for_specs/basic.html.erb
+- spec/fixture/app/models
+- spec/fixture/app/models/first_generic_fake_model.rb
 - spec/fixture/config
 - spec/fixture/config/init.rb.rb
 - spec/fixture/config/environments
@@ -60,9 +76,10 @@ files:
 - spec/fixture/config/rack.rb
 - spec/fixture/config/router.rb
 - spec/merb_test.log
+- spec/sexy_form_for_spec.rb
 - spec/spec_helper.rb
 - spec/merb-sexy-forms_spec.rb
-- spec/merb-sexy-forms-form_spec.rb
+- spec/sexy_form_spec.rb
 - spec/merb.main.pid
 - assets/stylesheets
 - assets/stylesheets/sexy_forms.css

data/spec/merb-sexy-forms-form_spec.rb

@@ -1,29 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-Merb::Plugins.config[:helpers] = {
-  :default_builder => Merb::Helpers::Form::Builder::FormWithErrors
-}
-
-describe "form" do
-
-  before :each do
-    @c = SexyFormSpecs.new(Merb::Request.new({}))
-  end
-
-  it "should add labels with field nested in container" do
-    ret = @c.render(:with_labels)
-    ret.should have_selector("form ul li label")
-    ret.should have_selector("form ul li div input")
-  end
-
-  it "should add 'choice' class to labels for checkboxes or radio buttons" do
-    ret = @c.render(:label_choice_class)
-    ret.should have_selector("form div label[for=checkbox].choice")
-    ret.should have_selector("form div label[for=radio].choice")
-  end
-
-  it "should not add 'choice' class to main labels" do
-    ret = @c.render(:label_choice_class)
-    ret.should_not have_selector("form label.choice.main")
-  end
-end