erb_form 0.1.5 → 0.1.6

data/lib/erb_form/builder.rb

@@ -50,7 +50,7 @@ module ErbForm
     end
 
     def locals(attribute_name, options)
-      options.except(:form, :attribute_name, :as, :collection, :error, :hint, :input, :label).tap { |o|
+      options.except(:form, :attribute_name, :as, :collection, :required, :error, :hint, :input, :label).tap { |o|
         o[:form] = self
         o[:attribute_name] = attribute_name
         o[:error_options] = simplify_options(:error, options)
@@ -73,13 +73,16 @@ module ErbForm
     def simplify_options(key, options = {})
       newkey = case key
       when :error
-        locals = { :error_prefix => options[:error] }
+        locals = { :error_prefix => options[:error] || options[:label] }
         :error_prefix
       when :input
         locals = { :input_html => options[:input] }
-        locals[:as] = options[:as] if options.has_key?(:as)
-        locals[:collection] = options[:collection] if options.has_key?(:collection)
+        locals.merge!(options.select { |k,v| [:as, :collection, :required].include?(k)})
         :input_html
+      when :label
+        locals = { :label => options[:label] }
+        locals.merge!(options.select { |k,v| [:as, :required].include?(k)})
+        :modified
       else
         locals = { key => options[key] }
         key

data/lib/erb_form/version.rb

@@ -1,3 +1,3 @@
 module ErbForm
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/test_app/app/views/blogs/name_field.html.erb

@@ -1,3 +1,4 @@
 <div class="blogs_name_field">
+  <%= form.label attribute_name, label_options %>
   <%= form.input attribute_name, input_options %>
 </div>

data/spec/test_app/app/views/blogs/optional_form_field.html.erb

@@ -0,0 +1,6 @@
+<div class="optional_field">
+  <%= form.label attribute_name, label_options %>
+  <%= form.input attribute_name, input_options %>
+  <%= form.hint attribute_name, hint_options %>
+  <%= form.full_error attribute_name, error_options %>
+</div>

data/spec/test_app/app/views/blogs/render_optional_and_required_form.html.erb

@@ -0,0 +1,6 @@
+<%= form_for(@blog) do |f| %>
+  <fieldset>
+    <%= f.field :post, { :layout => 'required_form' } %>
+    <%= f.field :published, { :layout => 'optional_form', :required => true } %>
+  </fieldset>
+<% end %>

data/spec/test_app/app/views/blogs/render_simple_form_with_options.html.erb

@@ -7,5 +7,9 @@
       :input => {:size => 5},
       :label => 'My custom label' }
     %>
+    <%= f.field :post, {
+      :layout => 'simple_form',
+      :label => 'My custom label' }
+    %>
   </fieldset>
 <% end %>

data/spec/test_app/app/views/blogs/required_form_field.html.erb

@@ -0,0 +1,6 @@
+<div class="required_field">
+  <%= form.label attribute_name, label_options %>
+  <%= form.input attribute_name, input_options %>
+  <%= form.hint attribute_name, hint_options %>
+  <%= form.full_error attribute_name, error_options %>
+</div>

data/spec/test_app/config/initializers/simple_form.rb

@@ -98,7 +98,7 @@ SimpleForm.setup do |config|
   # config.form_class = :simple_form
 
   # Whether attributes are required by default (or not). Default is true.
-  # config.required_by_default = true
+  config.required_by_default = false
 
   # Tell browsers whether to use default HTML5 validations (novalidate option).
   # Default is enabled.

data/spec/test_app/spec/views/blogs/render_input_as_different_type.html.erb_spec.rb

@@ -16,6 +16,12 @@ describe "blogs/render_input_as_different_type" do
     it "renders the input as that type" do
       render
       rendered.should have_selector "input", :type => 'checkbox'
+      rendered.should have_selector "input", :class => 'boolean required'
+    end
+
+    it "renders the label as that type" do
+      render
+      rendered.should have_selector "label", :class => 'boolean required'
     end
   end
 end

data/spec/test_app/spec/views/blogs/render_optional_and_required_form.html.erb_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe "blogs/render_optional_and_required_form" do
+  before(:each) do
+    assign(:blog, stub_model(Blog,
+      :post => "",
+      :published => ""
+    ).as_new_record)
+  end
+
+  describe "when there are simeple form helpers" do
+    it "finds the correct layout file" do
+      render
+      rendered.should have_selector "div", :class => "optional_field"
+      rendered.should have_selector "div", :class => "required_field"
+    end
+
+    it "renders the helpers with a required class" do
+      render
+      rendered.should have_selector "label", :class => "text optional"
+      rendered.should have_selector "textarea", :class => "text optional"
+    end
+
+    it "renders the helpers with an optional class" do
+      render
+      rendered.should have_selector "label", :class => "boolean required"
+      rendered.should have_selector "input", :class => "boolean required"
+    end
+  end
+end

data/spec/test_app/spec/views/blogs/render_simple_form_with_options.html.erb_spec.rb

@@ -4,7 +4,8 @@ describe "blogs/render_simple_form_with_options" do
   before(:each) do
     assign(:blog, stub_model(Blog,
       :name => "",
-      :errors => {:name => ['must not be blank']}
+      :post => "",
+      :errors => {:name => ['must not be blank'], :post => ['must not be blank']}
     ).as_new_record)
   end
 
@@ -36,6 +37,7 @@ describe "blogs/render_simple_form_with_options" do
     it "renders the error" do
       render
       rendered.should contain "My custom error must not be blank"
+      rendered.should contain "My custom label must not be blank"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb_form
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000Z
+date: 2012-02-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &2152017640 !ruby/object:Gem::Requirement
+  requirement: &2153122900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.0.0.rc
   type: :runtime
   prerelease: false
-  version_requirements: *2152017640
+  version_requirements: *2153122900
 description: Wrap form helper methods in re-usable erb templates.
 email:
 - 23inhouse@gmail.com
@@ -54,6 +54,7 @@ files:
 - spec/test_app/app/views/blogs/missing_attribute_template_error.html.erb
 - spec/test_app/app/views/blogs/missing_layout_template_error.html.erb
 - spec/test_app/app/views/blogs/name_field.html.erb
+- spec/test_app/app/views/blogs/optional_form_field.html.erb
 - spec/test_app/app/views/blogs/partials/_partial.html.erb
 - spec/test_app/app/views/blogs/partials/name_field.html.erb
 - spec/test_app/app/views/blogs/partials/simple_form_field.html.erb
@@ -62,8 +63,10 @@ files:
 - spec/test_app/app/views/blogs/render_input_as_a_collection.html.erb
 - spec/test_app/app/views/blogs/render_input_as_different_type.html.erb
 - spec/test_app/app/views/blogs/render_multiple_layouts.html.erb
+- spec/test_app/app/views/blogs/render_optional_and_required_form.html.erb
 - spec/test_app/app/views/blogs/render_simple_form_with_options.html.erb
 - spec/test_app/app/views/blogs/render_with_simple_form.html.erb
+- spec/test_app/app/views/blogs/required_form_field.html.erb
 - spec/test_app/app/views/blogs/simple_form_field.html.erb
 - spec/test_app/app/views/forms/default/field.html.erb
 - spec/test_app/app/views/forms/default/legacy_field.html.erb
@@ -101,6 +104,7 @@ files:
 - spec/test_app/spec/views/blogs/render_input_as_a_collection.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_input_as_different_type.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_multiple_layouts.html.erb_spec.rb
+- spec/test_app/spec/views/blogs/render_optional_and_required_form.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_simple_form_with_options.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_with_simple_form.html.erb_spec.rb
 homepage: ''
@@ -146,6 +150,7 @@ test_files:
 - spec/test_app/app/views/blogs/missing_attribute_template_error.html.erb
 - spec/test_app/app/views/blogs/missing_layout_template_error.html.erb
 - spec/test_app/app/views/blogs/name_field.html.erb
+- spec/test_app/app/views/blogs/optional_form_field.html.erb
 - spec/test_app/app/views/blogs/partials/_partial.html.erb
 - spec/test_app/app/views/blogs/partials/name_field.html.erb
 - spec/test_app/app/views/blogs/partials/simple_form_field.html.erb
@@ -154,8 +159,10 @@ test_files:
 - spec/test_app/app/views/blogs/render_input_as_a_collection.html.erb
 - spec/test_app/app/views/blogs/render_input_as_different_type.html.erb
 - spec/test_app/app/views/blogs/render_multiple_layouts.html.erb
+- spec/test_app/app/views/blogs/render_optional_and_required_form.html.erb
 - spec/test_app/app/views/blogs/render_simple_form_with_options.html.erb
 - spec/test_app/app/views/blogs/render_with_simple_form.html.erb
+- spec/test_app/app/views/blogs/required_form_field.html.erb
 - spec/test_app/app/views/blogs/simple_form_field.html.erb
 - spec/test_app/app/views/forms/default/field.html.erb
 - spec/test_app/app/views/forms/default/legacy_field.html.erb
@@ -193,5 +200,6 @@ test_files:
 - spec/test_app/spec/views/blogs/render_input_as_a_collection.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_input_as_different_type.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_multiple_layouts.html.erb_spec.rb
+- spec/test_app/spec/views/blogs/render_optional_and_required_form.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_simple_form_with_options.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_with_simple_form.html.erb_spec.rb