sinatra-formhelpers-huii 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e3afa1fef5cdb894505740fc84cb2b947d34f2
-  data.tar.gz: 1736334d86153040c20804cc4984ce2fa24e9fa1
+  metadata.gz: 5d97b0b165937636fbee233e4a0c7b49481ec733
+  data.tar.gz: 7adf2ae31d39a4f939b444e75a3b847b8dc85ac8
 SHA512:
-  metadata.gz: b7f35ade749d69b901ca5aafefb347be9eec5780ca0e0e8cb878c0aac4d795d6c29c309d63411c3b9ed9e9afc3ad3030aac61e02a6b7fb5866f8e77c0aefc0e3
-  data.tar.gz: fe25607005f012cc61d0ea4742e1806af91e72ef08432b1329dd871f243e944f1dc11693e965b32ddd5f58fe0ca75e6da1ccfc70701b4f7dbc1dfc7652bcb990
+  metadata.gz: 670f0a31adf9a2803446186ab2f88f0aa44118afc90ebf065d18a716d1c0ce540c05fd645bf540b2216ef3f0e92c94fa7bdf48c56686e6498e9def4cc4dcb32a
+  data.tar.gz: 25df2b589d08145b79f2691237599ea09ed46e0c325818c96e893cf776e63f71fdef8cb6ea519bddcdec6cdeab7e02c59bb2d3e29c31d6e20ad84e4928308d15

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format documentation
+--require spec_helper.rb

data/lib/sinatra/form_helpers.rb

@@ -22,7 +22,7 @@ module Sinatra
       end
       action = "/#{action}" if action.is_a? Symbol
 
-      out = tag(:form, nil, { action: action, method: method.to_s }.merge(options)) + method_input
+      out = tag(:form, nil, { action: action, method: method.to_s }.merge(options), false) + method_input
       out << fieldset(action, &block) + '</form>' if block_given?
       out
     end
@@ -168,10 +168,12 @@ module Sinatra
     # 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)}" : '') +
-        (content.nil? ? '>' : ">#{content}</#{name}>")
+    def tag(name, content, options = {}, close = true)
+      attributes = " #{ hash_to_html_attrs(options) }" if options.length > 0
+      open_tag   = "<#{ name }#{ attributes }>"
+      close_tag  = "</#{ name }>" if close
+
+      "#{ open_tag }#{ content }#{ close_tag }"
     end
 
     # Standard single closing tags

data/lib/sinatra/form_helpers/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module FormHelpers
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/sinatra-formhelpers-huii.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler',   '~> 1.5'
-  spec.add_development_dependency 'rake',      '~> 10.1'
+  spec.add_development_dependency 'bundler',   '~> 1.7'
+  spec.add_development_dependency 'rake',      '~> 10.3'
   spec.add_development_dependency 'rack-test', '~> 0.6'
-  spec.add_development_dependency 'rspec',     '~> 2.14'
-  spec.add_development_dependency 'simplecov', '~> 0.8'
+  spec.add_development_dependency 'rspec',     '~> 3.1'
+  spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'sinatra',   '~> 1.4'
-  # spec.add_development_dependency 'pry',       '~> 0.9'
+  # spec.add_development_dependency 'pry',       '~> 0.10'
 end

data/spec/integration/form_helpers_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe "Sinatra::FormHelpers in app" do
+RSpec.describe "Sinatra::FormHelpers in app" do
   it 'renders an anchor tag' do
     app.get '/link' do
       erb "<%= link 'google', 'http://www.google.com', title: 'Google' %>"
@@ -112,7 +110,17 @@ describe "Sinatra::FormHelpers in app" do
     expect( last_response.body ).to eq( %q(<textarea id="person_notes" name="person[notes]">This is a note</textarea>) )
   end
 
-  it 'renders a textarea tag with @params' do
+  it 'renders a textarea tag with nil @params' do
+    app.get '/notes3' do
+      @params = { person: {"notes" => nil}}
+      erb "<%= textarea :person, :notes %>"
+    end
+
+    get '/notes3'
+    expect( last_response.body ).to eq( %q(<textarea id="person_notes" name="person[notes]"></textarea>) )
+  end
+
+  it 'renders an img tag with @params' do
     app.get '/img' do
       erb "<%= image '/images/hello.png', alt: 'Lolcatz' %>"
     end

data/spec/units/form_helpers_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe "Sinatra::FormHelpers methods" do
+RSpec.describe "Sinatra::FormHelpers methods" do
   it 'renders an anchor tag' do
     expect( fh.form(:person, :create) ).to eq( '<form action="/person" method="post"><input type="hidden" name="_method" value="create" />' )
   end
@@ -58,6 +56,21 @@ describe "Sinatra::FormHelpers methods" do
     )
   end
 
+  it 'nests form elements arbitrarily with nil value' do
+    expect( fh.fieldset(:person) do |n|
+      # n.radio(:partners, 1..6)
+      n.textarea(:comments, nil)
+    end ).to eq( '<fieldset>' +
+      # '<input id="person_partners_1" name="person[partners]" type="radio" value="1" /> ' +
+      # '<input id="person_partners_2" name="person[partners]" type="radio" value="2" /> ' +
+      # '<input id="person_partners_3" name="person[partners]" type="radio" value="3" /> ' +
+      # '<input id="person_partners_4" name="person[partners]" type="radio" value="4" /> ' +
+      # '<input id="person_partners_5" name="person[partners]" type="radio" value="5" /> ' +
+      # '<input id="person_partners_6" name="person[partners]" type="radio" value="6" />' +
+      '<textarea id="person_comments" name="person[comments]"></textarea></fieldset>'
+    )
+  end
+
   it 'renders a fieldset tag with an input' do
     expect( fh.fieldset(:user) do |f|
       f.input(:last_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-formhelpers-huii
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - twilson63
@@ -11,90 +11,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 description: Simple, lightweight form helpers for Sinatra.
@@ -104,9 +104,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -128,17 +128,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Form helpers for Sinatra