forme 0.6.0 → 0.7.0

data/spec/sinatra_integration_spec.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'sequel_helper.rb')
 
 require 'rubygems'
 require 'sinatra/base'
@@ -6,7 +7,7 @@ require 'forme/sinatra'
 require(ENV['ERUBIS'] ? 'erubis' : 'erb')
 
 class FormeSinatraTest < Sinatra::Base
-  helpers(ENV['ERUBIS'] ? Forme::Sinatra::Erubis : Forme::Sinatra::ERB)
+  helpers(Forme::Sinatra::ERB)
   disable :show_exceptions
   enable :raise_errors
 
@@ -16,6 +17,27 @@ class FormeSinatraTest < Sinatra::Base
   <p>FBB</p>
   <%= f.input(:first) %>
   <%= f.input(:last) %>
+  <%= f.button('Save') %>
+<% end %>
+END
+  end
+
+  get '/inputs_block' do
+    erb <<END
+<% form([:foo, :bar], :action=>'/baz') do |f| %>
+  <% f.inputs(:legend=>'FBB') do %>
+    <%= f.input(:last) %>
+  <% end %>
+<% end %>
+END
+  end
+
+  get '/inputs_block_wrapper' do
+    erb <<END
+<% form([:foo, :bar], {:action=>'/baz'}, :inputs_wrapper=>:fieldset_ol) do |f| %>
+  <% f.inputs(:legend=>'FBB') do %>
+    <%= f.input(:last) %>
+  <% end %>
 <% end %>
 END
   end
@@ -33,6 +55,59 @@ END
 END
   end
 
+  get '/nest_sep' do
+    @nest = <<END
+  n1
+  <% f.tag(:div) do %>
+    n2
+    <%= f.input(:first) %>
+    <%= f.input(:last) %>
+    n3
+  <% end %>
+  n4
+  <%= f.inputs([:first, :last], :legend=>'Foo') %>
+  n5
+END
+    erb <<END
+0
+<% form([:foo, :bar], :action=>'/baz') do |f| %>
+  1
+  <%= f.tag(:p, {}, 'FBB') %>
+  2
+  <%= erb(@nest, :locals=>{:f=>f}) %>
+  3
+<% end %>
+4
+END
+  end
+
+  get '/nest_seq' do
+    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
+    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
+    @nest = <<END
+  n1
+  <% f.subform(:artist) do %>
+    n2
+    <%= f.input(:name2) %>
+    n3
+  <% end %>
+  n4
+  <%= f.subform(:artist, :inputs=>[:name3], :legend=>'Bar') %>
+  n5
+END
+    erb <<END
+0
+<% form(@album, :action=>'/baz') do |f| %>
+  1
+  <%= f.subform(:artist, :inputs=>[:name], :legend=>'Foo') %>
+  2
+  <%= erb(@nest, :locals=>{:f=>f}) %>
+  3
+<% end %>
+4
+END
+  end
+
   get '/hash' do
     erb "<% form({:action=>'/baz'}, :obj=>[:foo]) do |f| %> <%= f.input(:first) %> <% end %>"
   end
@@ -70,14 +145,31 @@ describe "Forme Sinatra ERB integration" do
     def o.puts(*) end
     @rack = {'rack.input'=>'', 'REQUEST_METHOD'=>'GET', 'rack.errors'=>o}
   end
+
   specify "#form should add start and end tags and yield Forme::Form instance" do
-    sin_get('/').should == '<form action="/baz"> <p>FBB</p> <input id="first" name="first" type="text" value="foo"/> <input id="last" name="last" type="text" value="bar"/> </form>'
+    sin_get('/').should == '<form action="/baz"> <p>FBB</p> <input id="first" name="first" type="text" value="foo"/> <input id="last" name="last" type="text" value="bar"/> <input type="submit" value="Save"/> </form>'
+  end
+
+  specify "#form should have inputs work with a block" do
+    sin_get('/inputs_block').should == '<form action="/baz"><fieldset class="inputs"><legend>FBB</legend> <input id="last" name="last" type="text" value="bar"/> </fieldset></form>'
+  end
+
+  specify "#form should have inputs with fieldset_ol wrapper work with block" do
+    sin_get('/inputs_block_wrapper').should == '<form action="/baz"><fieldset class="inputs"><legend>FBB</legend><ol> <input id="last" name="last" type="text" value="bar"/> </ol></fieldset></form>'
   end
 
   specify "#form should add start and end tags and yield Forme::Form instance" do
     sin_get('/nest').should == '<form action="/baz"> <p>FBB</p> <div> <input id="first" name="first" type="text" value="foo"/> <input id="last" name="last" type="text" value="bar"/> </div> </form>'
   end
 
+  specify "#form should correctly handle situation where multiple templates are used with same form object" do
+    sin_get('/nest_sep').should == "0 <form action=\"/baz\"> 1 <p>FBB</p> 2 n1 <div> n2 <input id=\"first\" name=\"first\" type=\"text\" value=\"foo\"/> <input id=\"last\" name=\"last\" type=\"text\" value=\"bar\"/> n3 </div> n4 <fieldset class=\"inputs\"><legend>Foo</legend><input id=\"first\" name=\"first\" type=\"text\" value=\"foo\"/><input id=\"last\" name=\"last\" type=\"text\" value=\"bar\"/></fieldset> n5 3 </form>4"
+  end
+
+  specify "#form should correctly handle situation Sequel integration with subforms where multiple templates are used with same form object" do
+    sin_get('/nest_seq').should == "0 <form action=\"/baz\" class=\"forme album\" method=\"post\"> 1 <input id=\"album_artist_attributes_id\" name=\"album[artist_attributes][id]\" type=\"hidden\" value=\"2\"/><fieldset class=\"inputs\"><legend>Foo</legend><label>Name: <input id=\"album_artist_attributes_name\" name=\"album[artist_attributes][name]\" type=\"text\" value=\"A\"/></label></fieldset> 2 n1 <input id=\"album_artist_attributes_id\" name=\"album[artist_attributes][id]\" type=\"hidden\" value=\"2\"/> n2 <label>Name2: <input id=\"album_artist_attributes_name2\" name=\"album[artist_attributes][name2]\" type=\"text\" value=\"A2\"/></label> n3 n4 <input id=\"album_artist_attributes_id\" name=\"album[artist_attributes][id]\" type=\"hidden\" value=\"2\"/><fieldset class=\"inputs\"><legend>Bar</legend><label>Name3: <input id=\"album_artist_attributes_name3\" name=\"album[artist_attributes][name3]\" type=\"text\" value=\"A3\"/></label></fieldset> n5 3 </form>4"
+  end
+
   specify "#form should accept two hashes instead of requiring obj as first argument" do
     sin_get('/hash').should == '<form action="/baz"> <input id="first" name="first" type="text" value="foo"/> </form>'
   end

metadata

@@ -1,42 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: forme
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-01 00:00:00 -07:00
-default_executable: 
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies: []
+description: ! 'Forme is a forms library with the following goals:
+
 
-description: |
-  Forme is a forms library with the following goals:
-  
   1) Have no external dependencies
+
   2) Have a simple API
+
   3) Support forms both with and without related objects
+
   4) Allow compiling down to different types of output
 
+'
 email: code@jeremyevans.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 - MIT-LICENSE
-files: 
+files:
 - MIT-LICENSE
 - CHANGELOG
 - README.rdoc
@@ -45,49 +39,42 @@ files:
 - spec/spec_helper.rb
 - spec/sequel_plugin_spec.rb
 - spec/sinatra_integration_spec.rb
+- spec/sequel_helper.rb
+- spec/rails_integration_spec.rb
 - lib/forme.rb
 - lib/forme/version.rb
 - lib/forme/sinatra.rb
+- lib/forme/rails.rb
 - lib/sequel/plugins/forme.rb
-has_rdoc: true
 homepage: http://gihub.com/jeremyevans/forme
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --quiet
 - --line-numbers
 - --inline-source
 - --title
-- "Forme: HTML forms library"
+- ! 'Forme: HTML forms library'
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: HTML forms library
 test_files: []
-