erb_form 0.1.1 → 0.1.2

data/lib/erb_form/builder.rb

@@ -4,15 +4,17 @@ module ErbForm
       raise ErbForm::DoubleRenderError.new(clean_backtrace(caller)), nil, clean_backtrace(caller) if recursing?
       @prevent_recursion = true
       @field_layout = options.delete(:layout)
-      return render_field(field_template_path(attribute_name), attribute_name, options)
+      render_field(attribute_name, options)
     rescue ActionView::MissingTemplate => e
       raise ErbForm::MissingTemplate.new(field_layouts(attribute_name)), nil, clean_backtrace(e.backtrace)
     end
 
   private
 
-    def recursing?
-      !!@prevent_recursion
+    def clean_backtrace(backtrace)
+      unless backtrace[0].scan(__FILE__).size > 0
+        backtrace = backtrace.collect { |line| line.scan(__FILE__).size > 0 ? nil : line }.compact!
+      end
     end
 
     def field_layouts(attribute_name)
@@ -30,19 +32,6 @@ module ErbForm
       }
     end
 
-    def render_field(field_template_path, attribute_name, options)
-      output = template.render(:file => '/' + (field_template_path || 'a_non_existant_file_to_force_a_missing_template_error'), :locals => {
-        :form => self,
-        :attribute_name => attribute_name,
-        :error_options => simplify_options(:error, options),
-        :hint_options => simplify_options(:hint, options),
-        :input_options => simplify_options(:input, options),
-        :label_options => simplify_options(:label, options)
-      })
-      @prevent_recursion = false
-      output
-    end
-
     def field_template_path(attribute_name)
       field_layouts(attribute_name).detect { |template_file|
         template.view_paths.exists?(template_file, '', false, {
@@ -53,15 +42,41 @@ module ErbForm
       }
     end
 
-    def clean_backtrace(backtrace)
-      unless backtrace[0].scan(__FILE__).size > 0
-        backtrace = backtrace.collect { |line| line.scan(__FILE__).size > 0 ? nil : line }.compact!
-      end
+    def field_template_file(attribute_name)
+      '/' + (field_template_path(attribute_name) || 'a_non_existant_file_to_force_a_missing_template_error')
+    end
+
+    def locals(attribute_name, options)
+      options.except(:form, :attribute_name, :error, :hint, :input, :label).tap { |o|
+        o[:form] = self
+        o[:attribute_name] = attribute_name
+        o[:error_options] = simplify_options(:error, options)
+        o[:hint_options] = simplify_options(:hint, options)
+        o[:input_options] = simplify_options(:input, options)
+        o[:label_options] = simplify_options(:label, options)
+      }
+    end
+
+    def recursing?
+      !!@prevent_recursion
+    end
+
+    def render_field(attribute_name, options)
+      output = template.render(:file => field_template_file(attribute_name), :locals => locals(attribute_name, options))
+      @prevent_recursion = false
+      output
     end
 
     def simplify_options(key, options = {})
-      newkey = key == :error ? :error_prefix : key
-      options[key].is_a?(Hash) ? options[key] : { newkey => (options[key]) }
+      newkey = case key
+      when :error
+        :error_prefix
+      when :input
+        :input_html
+      else
+        key
+      end
+      options[key].is_a?(Hash) && newkey == key ? options[key] : { newkey => (options[key]) }
     end
   end
 

data/lib/erb_form/version.rb

@@ -1,3 +1,3 @@
 module ErbForm
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/test_app/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.9'
 gem 'sqlite3'
-gem 'erb_form', '0.1.1', :path => '../..'
+gem 'erb_form', :path => '../..'
 gem 'simple_form', :git => 'git://github.com/plataformatec/simple_form'
 
 group :development , :test  do

data/spec/test_app/app/views/blogs/extra_options_field.html

@@ -0,0 +1,3 @@
+<div class="extra_options_field">
+  <%= custom %>
+</div>

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

@@ -0,0 +1,8 @@
+<%= form_for(@blog) do |f| %>
+  <fieldset>
+    <%= f.field :name, {
+      :layout => 'extra_options',
+      :custom => 'My extra options as locals' }
+    %>
+  </fieldset>
+<% end %>

data/spec/test_app/app/views/blogs/{render_simple_form_with_options.html → render_simple_form_with_options.html.erb}

@@ -4,7 +4,7 @@
       :layout => 'simple_form',
       :error => 'My custom error',
       :hint => 'My custom hint',
-      :input => 'My custom input',
+      :input => {:size => 5},
       :label => 'My custom label' }
     %>
   </fieldset>

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

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe "blogs/render_field_with_extra_options" do
+  before(:each) do
+    assign(:blog, stub_model(Blog,
+      :name => "",
+    ).as_new_record)
+  end
+
+  describe "when there are extra options" do
+    it "finds the correct layout file" do
+      render
+      rendered.should have_selector "div", :class => "extra_options_field"
+    end
+
+    it "passes them thru as locals" do
+      render
+      rendered.should contain "My extra options as locals"
+    end
+  end
+end

data/spec/test_app/spec/views/blogs/{render_simple_form_with_options.html.erb_spec → render_simple_form_with_options.html.erb_spec.rb}

@@ -25,6 +25,7 @@ describe "blogs/render_simple_form_with_options" do
       render
       rendered.should have_selector "input", :class => "string required"
       rendered.should have_selector "input", :placeholder => "type your name here (in english)"
+      rendered.should have_selector "input", :size => '5'
     end
 
     it "renders the hint" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb_form
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &2153822240 !ruby/object:Gem::Requirement
+  requirement: &2156007040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.0.0.rc
   type: :runtime
   prerelease: false
-  version_requirements: *2153822240
+  version_requirements: *2156007040
 description: Wrap form helper methods in re-usable erb templates.
 email:
 - 23inhouse@gmail.com
@@ -47,14 +47,16 @@ files:
 - spec/test_app/app/models/blog.rb
 - spec/test_app/app/views/blogs/double_render_error.html.erb
 - spec/test_app/app/views/blogs/double_render_field.html.erb
+- spec/test_app/app/views/blogs/extra_options_field.html
 - spec/test_app/app/views/blogs/find_defaults.html.erb
 - spec/test_app/app/views/blogs/find_layouts.html.erb
 - spec/test_app/app/views/blogs/legacy_field.html.erb
 - 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/render_field_with_extra_options.html.erb
 - spec/test_app/app/views/blogs/render_multiple_layouts.html.erb
-- spec/test_app/app/views/blogs/render_simple_form_with_options.html
+- 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/simple_form_field.html.erb
 - spec/test_app/app/views/forms/default/field.html.erb
@@ -88,8 +90,9 @@ files:
 - spec/test_app/spec/views/blogs/find_layouts.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/missing_attribute_template_error.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/missing_layout_template_error.html.erb_spec.rb
+- spec/test_app/spec/views/blogs/render_field_with_extra_options.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_multiple_layouts.html.erb_spec.rb
-- spec/test_app/spec/views/blogs/render_simple_form_with_options.html.erb_spec
+- 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: ''
 licenses: []
@@ -127,14 +130,16 @@ test_files:
 - spec/test_app/app/models/blog.rb
 - spec/test_app/app/views/blogs/double_render_error.html.erb
 - spec/test_app/app/views/blogs/double_render_field.html.erb
+- spec/test_app/app/views/blogs/extra_options_field.html
 - spec/test_app/app/views/blogs/find_defaults.html.erb
 - spec/test_app/app/views/blogs/find_layouts.html.erb
 - spec/test_app/app/views/blogs/legacy_field.html.erb
 - 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/render_field_with_extra_options.html.erb
 - spec/test_app/app/views/blogs/render_multiple_layouts.html.erb
-- spec/test_app/app/views/blogs/render_simple_form_with_options.html
+- 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/simple_form_field.html.erb
 - spec/test_app/app/views/forms/default/field.html.erb
@@ -168,6 +173,7 @@ test_files:
 - spec/test_app/spec/views/blogs/find_layouts.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/missing_attribute_template_error.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/missing_layout_template_error.html.erb_spec.rb
+- spec/test_app/spec/views/blogs/render_field_with_extra_options.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_multiple_layouts.html.erb_spec.rb
-- spec/test_app/spec/views/blogs/render_simple_form_with_options.html.erb_spec
+- 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