erb_form 0.1.4 → 0.1.5

data/lib/erb_form/builder.rb

@@ -18,10 +18,13 @@ module ErbForm
     end
 
     def field_layouts(attribute_name)
+      template_path = caller.select { |line| line.scan(template.view_paths.first.to_s).size > 0 }.first
+      template_path = template_path.split('/')[0...-1].join('/').gsub(template.view_paths.first.to_s, '')
+
       file = @field_layout.nil? ? attribute_name.to_s : @field_layout
       [
         [ErbForm.forms_path, @field_layout, attribute_name.to_s+'_field'],  # forms/custom_layout/attribute_name_field.html.erb
-        [template.controller_path, file+'_field'],                          # resourse_path/attribute_name_field.html.erb
+        [template_path, file+'_field'],                                     # template_path/attribute_name_field.html.erb
         [ErbForm.forms_path, @field_layout, 'field'],                       # forms/custom_layout/field.html.erb
         [ErbForm.forms_path, 'default', file+'_field'],                     # forms/attribute_name_field.html.erb
         [ErbForm.forms_path, 'default', 'field']                            # forms/attribute_name/field.html.erb

data/lib/erb_form/version.rb

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

data/spec/test_app/app/views/blogs/partials/_partial.html.erb

@@ -0,0 +1,3 @@
+  <fieldset>
+    <%= f.field :name %>
+  </fieldset>

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

@@ -0,0 +1,3 @@
+<div class="field_in_partial">
+  <%= form.input attribute_name, input_options %>
+</div>

data/spec/test_app/app/views/blogs/partials/simple_form_field.html.erb

@@ -0,0 +1,6 @@
+<div class="simple_form_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_field_from_a_partial.html.erb

@@ -0,0 +1,3 @@
+<%= form_for(@blog) do |f| %>
+  <%= render :partial => 'blogs/partials/partial', :locals => {:f => f}%>
+<% end %>

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

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe "blogs/render_field_from_a_partial" do
+  before(:each) do
+    assign(:blog, stub_model(Blog,
+      :name => "",
+    ).as_new_record)
+  end
+
+  describe "when the as option is passed" do
+    it "finds the correct layout file" do
+      render
+      rendered.should have_selector "div", :class => "field_in_partial"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb_form
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &2152479800 !ruby/object:Gem::Requirement
+  requirement: &2152017640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.0.0.rc
   type: :runtime
   prerelease: false
-  version_requirements: *2152479800
+  version_requirements: *2152017640
 description: Wrap form helper methods in re-usable erb templates.
 email:
 - 23inhouse@gmail.com
@@ -47,13 +47,17 @@ 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/extra_options_field.html.erb
 - 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/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
+- spec/test_app/app/views/blogs/render_field_from_a_partial.html.erb
 - spec/test_app/app/views/blogs/render_field_with_extra_options.html.erb
 - 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
@@ -92,9 +96,10 @@ 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_from_a_partial.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_input_as_a_collection.html.erb_spec.rb
-- spec/test_app/spec/views/blogs/render_input_as_different_type.html.erb_spec
+- 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_simple_form_with_options.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_with_simple_form.html.erb_spec.rb
@@ -134,13 +139,17 @@ 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/extra_options_field.html.erb
 - 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/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
+- spec/test_app/app/views/blogs/render_field_from_a_partial.html.erb
 - spec/test_app/app/views/blogs/render_field_with_extra_options.html.erb
 - 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
@@ -179,9 +188,10 @@ 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_from_a_partial.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_input_as_a_collection.html.erb_spec.rb
-- spec/test_app/spec/views/blogs/render_input_as_different_type.html.erb_spec
+- 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_simple_form_with_options.html.erb_spec.rb
 - spec/test_app/spec/views/blogs/render_with_simple_form.html.erb_spec.rb