sinatra_more 0.3.28 → 0.3.29

data/README.rdoc

@@ -731,6 +731,7 @@ See the wiki article for additional information: <http://wiki.github.com/nesquen
 * Nathan Esquenazi - Project creator and code maintainer
 * Arthur Chiu      - Forming the idea and various code contributions
 * Rob Holland      - Added couchrest ORM component to generator
+* Bill Turner      - Added several form builder and helper fixes
 
 == Known Issues
 

data/VERSION

@@ -1 +1 @@
-0.3.28
+0.3.29

data/lib/sinatra_more/markup_plugin/form_builder/abstract_form_builder.rb

@@ -92,7 +92,7 @@ class AbstractFormBuilder
   # Returns the object's models name
   #   => user_assignment
   def object_name
-    object.is_a?(Symbol) ? object : object.class.to_s.underscore
+    object.is_a?(Symbol) ? object : object.class.to_s.underscore.gsub('/', '-')
   end
 
   # Returns true if the value matches the value in the field

data/lib/sinatra_more/markup_plugin/form_helpers.rb

@@ -82,8 +82,8 @@ module SinatraMore
     # Constructs a text area input from the given options
     # text_area_tag :username, :class => 'long', :value => "Demo?"
     def text_area_tag(name, options={})
-      options.reverse_merge!(:name => name, :value => '')
-      content_tag(:textarea, options.delete(:value), options)
+      options.reverse_merge!(:name => name)
+      content_tag(:textarea, options.delete(:value).to_s, options)
     end
 
     # Constructs a password field input from the given options

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.28"
+  s.version = "0.3.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]

data/test/fixtures/markup_app/app.rb

@@ -59,4 +59,8 @@ class Errors < Array
   def full_messages
     ["This is a fake error", "This is a second fake error", "This is a third fake error"]
   end
+end
+
+module Outer
+  class UserAccount; end
 end

data/test/markup_plugin/test_form_builder.rb

@@ -33,6 +33,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_has_tag('form input', :type => 'text', :name => 'markup_user[username]') { actual_html }
       assert_has_tag('form input[type=hidden]', :name => '_method', :count => 0) { actual_html } # no method action field
     end
+    
+    should "display correct form html for namespaced object" do
+      actual_html = form_for(Outer::UserAccount.new, '/register', :method => 'post') { |f| f.text_field :username }
+      assert_has_tag('form', :action => '/register', :method => 'post') { actual_html }
+      assert_has_tag('form input', :type => 'text', :name => 'outer-user_account[username]') { actual_html }
+    end
 
     should "display correct form html with method :put" do
       actual_html = form_for(@user, '/update', :method => 'put') { "Demo" }
@@ -301,10 +307,15 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_has_tag('textarea.large', :id => 'user_about', :name => 'user[about]') { actual_html }
     end
     
-    should "display correct text_area html and content" do
+    should "display correct text_area html and custom content" do
       actual_html = standard_builder.text_area(:about, :value => "Demo")
       assert_has_tag('textarea', :id => 'user_about', :content => 'Demo') { actual_html }
     end
+    
+    should "display correct text_area html and default content" do
+      actual_html = standard_builder(MarkupUser.new).text_area(:about)
+      assert_has_tag('textarea', :id => 'markup_user_about', :content => '') { actual_html }
+    end
 
     should "display correct text_area in haml" do
       visit '/haml/form_for'

data/test/markup_plugin/test_form_helpers.rb

@@ -194,6 +194,12 @@ class TestFormHelpers < Test::Unit::TestCase
       actual_html = text_area_tag(:about, :value => "a test")
       assert_has_tag(:textarea, :content => "a test", :name => 'about') { actual_html }
     end
+    
+    should "display text area in ruby with no content with closing tag" do
+      actual_html = text_area_tag(:about)
+      assert_has_tag(:textarea, :content => "", :name => 'about') { actual_html }
+      assert_equal '<textarea name="about"></textarea>', actual_html
+    end
 
     should "display text area in erb" do
       visit '/erb/form_tag'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.28
+  version: 0.3.29
 platform: ruby
 authors: 
 - Nathan Esquenazi