sinatra-formhelpers-ng 1.5.0 → 1.6.0

data/README.md

@@ -22,7 +22,7 @@ Usage
 -----
 With Bundler/Isolate:
 
-    gem 'sinatra-formhelpers', '~>0.6.0'
+    gem 'sinatra-formhelpers-ng'
 
 Then, include it in a Sinatra application:
 
@@ -83,10 +83,16 @@ This will create fields named <code>user[first\_name]</code>, <code>user[last\_n
 
 Known Bugs
 ----------
-* Currently <code>fieldset</code> does not return a <fieldset> tag properly (working on it)
+* Currently <code>fieldset</code> does not return a <fieldset> tag properly.
 
 
-Author
-* Initial efforts (c) 2009 twilson63.
-* Additional efforts (c) 2011 [Nate Wiger](http://nateware.com).  
+Fixed Bugs
+----------
+* The state of select tags was not persisted across form submissions.
+
+
+Authors
+-------
+* [Initial efforts](https://github.com/twilson63/sinatra-formhelpers) (c) 2009 [Tom Wilson](https://github.com/twilson63).
+* [Additional efforts](https://github.com/nateware/sinatra-formhelpers) (c) 2011 [Nate Wiger](http://nateware.com).
 * Further efforts (c) 2013 [Cymen Vig](http://blog.cymen.org/).

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

data/lib/sinatra/form_helpers.rb

@@ -3,13 +3,13 @@ module Sinatra
     # FormHelpers are a suite of helper methods
     # built to make building forms in Sinatra
     # a breeze.
-    # 
+    #
     # link "jackhq", "http://www.jackhq.com"
-    # 
+    #
     # label :person, :first_name
     # input :person, :first_name
     # textarea :person, :notes
-    # 
+    #
     # etc.
     def form(action, method=:get, options={}, &block)
       method_input = ''
@@ -34,10 +34,10 @@ module Sinatra
       out = yield Fieldset.new(self, obj)
       '<fieldset>' + (legend.nil? ? '' : "<legend>#{fast_escape_html(legend)}</legend>") + out + '</fieldset>'
     end
-    
+
     # Link to a URL
     def link(content, href=content, options={})
-      tag :a, content, options.merge(:href => href)  
+      tag :a, content, options.merge(:href => href)
     end
 
     # Link to an image
@@ -54,7 +54,8 @@ module Sinatra
     def input(obj, field=nil, options={})
       value = param_or_default(obj, field, options[:value])
       single_tag :input, options.merge(
-        :type => "text", :id => css_id(obj, field),
+        :type => options[:type] || "text",
+        :id => css_id(obj, field),
         :name => field.nil? ? obj : "#{obj}[#{field}]",
         :value => value
       )
@@ -62,12 +63,7 @@ module Sinatra
 
     # Form password input.  Specify the value as :value => 'foo'
     def password(obj, field=nil, options={})
-      value = param_or_default(obj, field, options[:value])
-      single_tag :input, options.merge(
-        :type => "password", :id => css_id(obj, field),
-        :name => field.nil? ? obj : "#{obj}[#{field}]",
-        :value => value
-      )
+      input(obj, field, options.merge(:type => 'password'))
     end
 
     # Form textarea box.
@@ -111,10 +107,10 @@ module Sinatra
         (labs.nil? || labs == true ? label(obj, "#{field}_#{id.to_s.downcase}", text) : '')
       end.join(join)
     end
-    
+
     # Form radio input.  Specify an array of values to get a radio group.
     def radio(obj, field, values, options={})
-      #content = @params[obj] && @params[obj][field.to_s] == value ? "true" : ""    
+      #content = @params[obj] && @params[obj][field.to_s] == value ? "true" : ""
       # , :checked => content
       join = options.delete(:join) || ' '
       labs = options.delete(:label)
@@ -140,33 +136,32 @@ module Sinatra
       end
       tag :select, content, options.merge(:id => css_id(obj, field), :name => "#{obj}[#{field}]")
     end
-    
+
     # Form hidden input.  Specify value as :value => 'foo'
-    def hidden(obj, field="", options={})
-      content = param_or_default(obj, field, options[:value])
-      single_tag :input, options.merge(:type => "hidden", :id => css_id(obj, field), :name => "#{obj}[#{field}]")      
+    def hidden(obj, field = nil, options = {})
+      input(obj, field, options.merge(:type => 'hidden'))
     end
-    
+
     # Standard open and close tags
     # EX : tag :h1, "shizam", :title => "shizam"
     # => <h1 title="shizam">shizam</h1>
     def tag(name, content, options={})
       "<#{name.to_s}" +
-        (options.length > 0 ? " #{hash_to_html_attrs(options)}" : '') + 
+        (options.length > 0 ? " #{hash_to_html_attrs(options)}" : '') +
         (content.nil? ? '>' : ">#{content}</#{name}>")
     end
-    
+
     # Standard single closing tags
     # single_tag :img, :src => "images/google.jpg"
     # => <img src="images/google.jpg" />
     def single_tag(name, options={})
       "<#{name.to_s} #{hash_to_html_attrs(options)} />"
     end
-    
+
     def fast_escape_html(text)
       text.to_s.gsub(/\&/,'&amp;').gsub(/\"/,'&quot;').gsub(/>/,'&gt;').gsub(/</,'&lt;')
     end
-    
+
     def titleize(text)
       text.to_s.gsub(/_+/, ' ').gsub(/\b('?[a-z])/) { $1.capitalize }
     end
@@ -195,7 +190,7 @@ module Sinatra
         [val, val]
       end
     end
-    
+
     def css_id(*things)
       things.compact.map{|t| t.to_s}.join('_').downcase.gsub(/\W/,'_')
     end

data/{sinatra-formhelpers.gemspec → sinatra-formhelpers-ng.gemspec}

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "sinatra-formhelpers"
-  s.version = "0.5.0"
+  s.name = "sinatra-formhelpers-ng"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nate Wiger", "Cymen Vig"]
-  s.date = "2013-03-28"
-  s.description = "Simple, lightweight form helpers for Sinatra. Based on initial efforts by twilson63."
-  s.email = "nate@wiger.org"
+  s.authors = ["twilson63", "Nate Wiger", "Cymen Vig"]
+  s.date = "2013-05-03"
+  s.description = "Simple, lightweight form helpers for Sinatra."
+  s.email = "cymenvig@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -25,11 +25,11 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/sinatra/form_helpers.rb",
-    "sinatra-formhelpers.gemspec",
+    "sinatra-formhelpers-ng.gemspec",
     "spec/form_helpers_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/nateware/sinatra-formhelpers"
+  s.homepage = "http://github.com/cymen/sinatra-formhelpers"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.25"
   s.summary = "Form helpers for Sinatra"

data/spec/form_helpers_spec.rb

@@ -2,15 +2,15 @@ require File.expand_path 'spec_helper', File.dirname(__FILE__)
 
 # class Application < Sinatra::Base
 #   register Sinatra::FormHelpers
-# 
+#
 #   set :raise_errors, false
 #   set :show_exceptions, false
-#   
+#
 #   get '/link' do
-#     
+#
 #   end
 # end
-# 
+#
 # class Bacon::Context
 #   include Rack::Test::Methods
 #   def app
@@ -38,7 +38,7 @@ describe "Sinatra::FormHelpers methods" do
     fh.form(:person, :create) do |f|
       # f.input(:first_name)
       f.input(:last_name)
-    end.should == '<form action="/person" method="POST"><fieldset>' + 
+    end.should == '<form action="/person" method="POST"><fieldset>' +
       # '<input id="person_first_name" name="person[first_name]" type="text" />' +
       '<input id="person_last_name" name="person[last_name]" type="text" />' +
       '</fieldset></form>'
@@ -83,7 +83,7 @@ describe "Sinatra::FormHelpers methods" do
   end
   it 'supports multiple values for checkboxes' do
     fh.params = {:user => {'devices' => ['iPhone', 'iPad'] }}
-    fh.checkbox(:user, :devices, ['iPhone', 'iPad', 'iPod', 'iPoop']).should == 
+    fh.checkbox(:user, :devices, ['iPhone', 'iPad', 'iPod', 'iPoop']).should ==
       "<input checked=\"checked\" id=\"user_devices_iphone\" name=\"user[devices][]\" type=\"checkbox\" value=\"iPhone\" /><label for=\"user_devices_iphone\">iPhone</label> <input checked=\"checked\" id=\"user_devices_ipad\" name=\"user[devices][]\" type=\"checkbox\" value=\"iPad\" /><label for=\"user_devices_ipad\">iPad</label> <input id=\"user_devices_ipod\" name=\"user[devices][]\" type=\"checkbox\" value=\"iPod\" /><label for=\"user_devices_ipod\">iPod</label> <input id=\"user_devices_ipoop\" name=\"user[devices][]\" type=\"checkbox\" value=\"iPoop\" /><label for=\"user_devices_ipoop\">iPoop</label>"
   end
 end
@@ -102,7 +102,7 @@ describe "Sinatra::FormHelpers in app" do
     app.get '/label' do
       erb "<%= label :person, :first_name %>"
     end
-    
+
     get '/label'
     last_response.body.should == %q(<label for="person_first_name">First Name</label>)
   end
@@ -111,11 +111,11 @@ describe "Sinatra::FormHelpers in app" do
     app.get '/hello' do
       erb "<%= label :person, :first_name, 'Hello World'%>"
     end
-      
+
     get '/hello'
     last_response.body.should == %q(<label for="person_first_name">Hello World</label>)
   end
-  
+
   it 'renders an input tag type text without @params' do
     app.get '/text' do
       erb "<%= input :person, :first_name %>"
@@ -126,34 +126,61 @@ describe "Sinatra::FormHelpers in app" do
     last_response.body.should == %q(<input id="person_first_name" name="person[first_name]" type="text" />)
   end
 
+  it 'accepts an input tag with custom type option' do
+    app.get '/input-with-custom-type' do
+      erb "<%= input :person, :password, type: 'password' %>"
+    end
+
+    get '/input-with-custom-type'
+    last_response.body.should == '<input id="person_password" name="person[password]" type="password" />'
+  end
+
   it 'renders an input tag type text with single arg' do
     app.get '/q' do
       erb "<%= input :q %>"
     end
-  
+
     get '/q'
     last_response.body.should == %q(<input id="q" name="q" type="text" />)
   end
-  
+
   it 'renders an input tag type text with @params' do
     app.get '/tom' do
       @params = { :person => {"first_name" => "Tom"}}
       erb "<%= input :person, :first_name %>"
     end
-        
+
     get '/tom'
     last_response.body.should == %q(<input id="person_first_name" name="person[first_name]" type="text" value="Tom" />)
   end
-  
+
+  it 'renders a password tag type password' do
+    app.get '/password' do
+      erb "<%= password :person, :password %>"
+    end
+
+    get '/password'
+    last_response.body.should == '<input id="person_password" name="person[password]" type="password" />'
+  end
+
+  it 'renders a button tag type button' do
+    app.get '/button' do
+      erb "<%= button :new %>"
+    end
+
+    get '/button'
+    last_response.body.should == '<input id="button_new" name="button" type="button" value="new" />'
+  end
+
   it 'renders an textarea tag type text without @params' do
     app.get '/notes' do
       erb "<%= textarea :person, :notes %>"
     end
-    
+
     get '/notes?person[notes]=Yeppers'
     last_response.body.should == %q(<textarea id="person_notes" name="person[notes]">Yeppers</textarea>)
   end
-  
+
   it 'renders a textarea tag with @params' do
     app.get '/notes2' do
       @params = { :person => {"notes" => "This is a note"}}
@@ -163,12 +190,12 @@ describe "Sinatra::FormHelpers in app" do
     get '/notes2'
     last_response.body.should == %q(<textarea id="person_notes" name="person[notes]">This is a note</textarea>)
   end
-  
+
   it 'renders a textarea tag with @params' do
     app.get '/img' do
       erb "<%= image '/images/hello.png', :alt => 'Lolcatz' %>"
     end
-    
+
     get '/img'
     last_response.body.should == '<img alt="Lolcatz" src="/images/hello.png" />'
   end
@@ -177,25 +204,25 @@ describe "Sinatra::FormHelpers in app" do
     app.get '/sub' do
       erb "<%= submit 'Create' %>"
     end
-    
+
     get '/sub'
     last_response.body.should == '<input id="button_create" name="submit" type="submit" value="Create" />'
   end
-  
+
   it 'renders an input tag with a submit type with zero args' do
     app.get '/create' do
       erb "<%= submit %>"
     end
-    
+
     get '/create'
     last_response.body.should == '<input id="button_submit" name="submit" type="submit" value="Submit" />'
   end
-  
+
   it 'renders an input tag with a checkbox type' do
     app.get '/check' do
       erb "<%= checkbox :person, :active, 'Yes' %>"
     end
-    
+
     get '/check'
     last_response.body.should ==
       '<input id="person_active_yes" name="person[active]" type="checkbox" value="Yes" /><label for="person_active_yes">Yes</label>'
@@ -229,39 +256,48 @@ describe "Sinatra::FormHelpers in app" do
     app.get '/select' do
       erb "<%= select :person, :relationship, ['Friend','CoWorker','Lead'] %>"
     end
-    
+
     get '/select'
     last_response.body.should == '<select id="person_relationship" name="person[relationship]">' +
-      '<option value="Friend">Friend</option><option value="CoWorker">CoWorker</option>' + 
+      '<option value="Friend">Friend</option><option value="CoWorker">CoWorker</option>' +
       '<option value="Lead">Lead</option></select>'
   end
-  
+
   it 'renders a select tag with selected option' do
     app.get '/select2' do
       @params = { :person => {"relationship" => "CoWorker"}}
       erb "<%= select :person, :relationship, ['Friend','CoWorker','Lead'] %>"
     end
-    
+
     get '/select2'
     last_response.body.should == '<select id="person_relationship" name="person[relationship]">' +
-      '<option value="Friend">Friend</option><option selected="selected" value="CoWorker">CoWorker</option>' + 
+      '<option value="Friend">Friend</option><option selected="selected" value="CoWorker">CoWorker</option>' +
       '<option value="Lead">Lead</option></select>'
   end
-  
+
+  it 'renders a hidden tag with single arg' do
+    app.get '/hidden' do
+      erb "<%= hidden :q %>"
+    end
+
+    get '/hidden'
+    last_response.body.should == %q(<input id="q" name="q" type="hidden" />)
+  end
+
   it 'renders a hidden tag with value' do
-    app.get '/hidden' do 
+    app.get '/hidden2' do
       erb '<%= hidden :person, :id, :value => 1 %>'
     end
-    
-    get '/hidden'
+
+    get '/hidden2'
     last_response.body.should == '<input id="person_id" name="person[id]" type="hidden" value="1" />'
   end
-  
+
   it 'renders a form tag' do
     app.get '/form' do
       erb "<%= form :person, :create %>"
     end
-      
+
     get '/form'
     last_response.body.should == %q(<form action="/person" method="POST">)
   end
@@ -276,7 +312,7 @@ describe "Sinatra::FormHelpers in app" do
 # <% end %>
 # EndTemplate
 #     end
-#       
+#
 #     get '/form_for'
 #     last_response.body.should == %q(<form action="/person" method="POST">)
 #   end

data/spec/spec_helper.rb

@@ -37,11 +37,11 @@ end
 #   @app ||= Class.new Sinatra::Base
 #   Rack::Lint.new @app
 # end
-# 
+#
 # def app=(base)
 #   @app = base
 # end
-# 
+#
 # def mock_app(base = Sinatra::Base, &block)
 #   inner = nil
 #   @app  = Sinatra.new(base) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-formhelpers-ng
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -77,7 +77,7 @@ files:
 - Rakefile
 - VERSION
 - lib/sinatra/form_helpers.rb
-- sinatra-formhelpers.gemspec
+- sinatra-formhelpers-ng.gemspec
 - spec/form_helpers_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/cymen/sinatra-formhelpers
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3413029365659402613
+      hash: 1135526224546882131
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: