autoforme 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdba8a6d624942582b3ca471ea9843bbb52cfc12
-  data.tar.gz: 8d01c8751490a15de34459e41b0ebf5440ee9f59
+  metadata.gz: 56859c9eb572815d56f455bc3427653ed4365c0c
+  data.tar.gz: 65f69c05fbb2a9b4a9836c0cd690faf4aa2ec2cf
 SHA512:
-  metadata.gz: 00fa2b89b05bde608fb09dc4dc54daadce1a8c622184e7a8ee18477eccc24a44be561ab3077b93327c060bf9f4c996b6a3cdacaa8025bc33d11e5026a4cf105c
-  data.tar.gz: f2d0e910488aefef9e4ffff4ec23bf9a050622b17c0f317a5d2b1ee71579dedca429b9181a25f77262c9e39fca0327d44151e038ceb28b9bb9cf9f7f3ca5a17a
+  metadata.gz: a539a998ae3809da0de0a4343b6401bd0cab87ba22e75874845e019ec7fcea48a79206aa1d80ba16a999a3d8b67cb61f1f733c175b86504694bd8547ab035a6a
+  data.tar.gz: 31781cf212c8cb7bdeff9359ddd643cb2647005d552b04c038cc91470345aa56130bd0b60c43b64091f31c6ea2fc8edd4b882a50754deeabff8b39b542106155

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 1.0.2 (2014-12-17)
+
+* Fix double escaping of & in inline mtm edit forms, fixing usage with rack 1.6.0 beta (jeremyevans)
+
+* Work with roda when using static_path_info plugin (jeremyevans)
+
+* Make sure the display name for an object always returns a string (jeremyevans)
+
 === 1.0.1 (2014-08-19)
 
 * Display BigDecimal values in float format on browse/search pages (jeremyevans)

data/lib/autoforme/action.rb

@@ -596,7 +596,7 @@ module AutoForme
 
       t = "<div class='inline_mtm_add_associations'>"
       assocs.each do |assoc|
-        form_attr = form_attributes(:action=>url_for("mtm_update/#{model.primary_key_value(obj)}?association=#{assoc}&amp;redir=edit"), :class => 'mtm_add_associations', 'data-remove' => "##{assoc}_remove_list")
+        form_attr = form_attributes(:action=>url_for("mtm_update/#{model.primary_key_value(obj)}?association=#{assoc}&redir=edit"), :class => 'mtm_add_associations', 'data-remove' => "##{assoc}_remove_list")
         t << Forme.form(obj, form_attr, form_opts) do |f|
           opts = model.column_options_for(:mtm_edit, request, assoc)
           add_opts = opts[:add] ? opts.merge(opts.delete(:add)) : opts.dup
@@ -628,7 +628,7 @@ module AutoForme
     def mtm_edit_remove(assoc, mc, obj, assoc_obj)
       t = "<li>"
       t << association_link(mc, assoc_obj)
-      form_attr = form_attributes(:action=>url_for("mtm_update/#{model.primary_key_value(obj)}?association=#{assoc}&amp;remove%5b%5d=#{model.primary_key_value(assoc_obj)}&amp;redir=edit"), :method=>'post', :class => 'mtm_remove_associations', 'data-add'=>"#add_#{assoc}")
+      form_attr = form_attributes(:action=>url_for("mtm_update/#{model.primary_key_value(obj)}?association=#{assoc}&remove%5b%5d=#{model.primary_key_value(assoc_obj)}&redir=edit"), :method=>'post', :class => 'mtm_remove_associations', 'data-add'=>"#add_#{assoc}")
       t << Forme.form(form_attr, form_opts) do |f|
         f.button(:value=>'Remove', :class=>'btn btn-mini btn-danger')
       end.to_s

data/lib/autoforme/frameworks/roda.rb

@@ -13,7 +13,12 @@ module AutoForme
           @model = captures[-2]
           @action_type = captures[-1]
           @path = path
-          @id = @params['id'] || ($1 if @env['PATH_INFO'] =~ %r{\A\/(\w+)\z})
+          remaining_path = if @request.respond_to?(:remaining_path)
+            @request.remaining_path
+          else
+            @env['PATH_INFO']
+          end
+          @id = @params['id'] || ($1 if remaining_path =~ %r{\A\/(\w+)\z})
         end
 
         # Redirect to the given path
@@ -47,11 +52,12 @@ module AutoForme
 
         @route_proc = lambda do 
           r = request
-          path = r.env['SCRIPT_NAME']
-          current_matchers = matchers.dup
-          current_matchers << lambda do
-            @autoforme_action = framework.action_for(Request.new(self, path))
+          path = if r.respond_to?(:matched_path)
+            r.matched_path
+          else
+            r.env['SCRIPT_NAME']
           end
+          current_matchers = matchers + [lambda{@autoforme_action = framework.action_for(Request.new(self, path))}]
 
           r.on *current_matchers do
             @autoforme_text = @autoforme_action.handle

data/lib/autoforme/model.rb

@@ -311,7 +311,7 @@ module AutoForme
 
     # A human readable string representing the object.
     def object_display_name(type, request, obj)
-      apply_name_method(display_name_for, obj, type, request)
+      apply_name_method(display_name_for, obj, type, request).to_s
     end
 
     # A human reable string for the associated object.
@@ -327,7 +327,7 @@ module AutoForme
         obj.name
       else
         primary_key_value(obj)
-      end
+      end.to_s
     end
 
     private

data/lib/autoforme/version.rb

@@ -1,6 +1,6 @@
 module AutoForme
   # Version constant, use <tt>AutoForme.version</tt> instead.
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 
   # Returns the version as a frozen string (e.g. '0.1.0')
   def self.version

data/spec/associations_spec.rb

@@ -45,10 +45,10 @@ describe AutoForme do
     fill_in 'Name', :with=>'1b'
     select 'Artist2'
     click_button 'Search'
-    all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
   end
 
   it "should use text boxes for associated objects on new/edit/search forms if associated model uses autocompleting" do
@@ -82,7 +82,7 @@ describe AutoForme do
     fill_in 'Name', :with=>'1b'
     fill_in 'Artist', :with=>b.id.to_s
     click_button 'Search'
-    all('td').map{|s| s.text}.should == ["Album1b", "TestArtist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "TestArtist2", "Show", "Edit", "Delete"]
   end
 
   it "should be able to used specified name formatting in other model" do
@@ -123,10 +123,10 @@ describe AutoForme do
     fill_in 'Name', :with=>'1b'
     select 'A2A2'
     click_button 'Search'
-    all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
   end
 
   it "should be able to used specified name formatting for current association" do
@@ -166,10 +166,10 @@ describe AutoForme do
     fill_in 'Name', :with=>'1b'
     select 'A2A2'
     click_button 'Search'
-    all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
   end
 
   it "should be able to eager load associations when loading model" do
@@ -210,10 +210,10 @@ describe AutoForme do
     fill_in 'Name', :with=>'1b'
     select 'A2'
     click_button 'Search'
-    all('td').map{|s| s.text}.should == ["Album1b", "A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "A2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    all('td').map{|s| s.text}.should == ["Album1b", "A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "A2", "Show", "Edit", "Delete"]
 
     click_link 'Delete'
     select 'A2-Album1b'
@@ -271,14 +271,14 @@ describe AutoForme do
     click_button 'Create'
 
     click_link 'Show'
-    all('select option').map{|s| s.text}.should == ['', 'A-Y', 'B-X', 'B-Z']
+    page.all('select option').map{|s| s.text}.should == ['', 'A-Y', 'B-X', 'B-Z']
     select 'B-X'
     click_button 'Show'
     page.html.should =~ /Name.+X/m
     page.html.should =~ /Artist.+B/m
 
     click_link 'Edit'
-    all('select option').map{|s| s.text}.should == ['', 'X (B)', 'Y (A)', 'Z (B)']
+    page.all('select option').map{|s| s.text}.should == ['', 'X (B)', 'Y (A)', 'Z (B)']
     select 'Z (B)'
     click_button 'Edit'
     fill_in 'Name', :with=>'ZZ'
@@ -288,13 +288,13 @@ describe AutoForme do
     click_link 'Search'
     select 'A'
     click_button 'Search'
-    all('tr td:first-child').map{|s| s.text}.should == %w'Y ZZ'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'Y ZZ'
 
     click_link 'Album'
-    all('tr td:first-child').map{|s| s.text}.should == %w'Y ZZ X'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'Y ZZ X'
 
     click_link 'Delete'
-    all('select option').map{|s| s.text}.should == ['', 'A-Y', 'A-ZZ', 'B-X']
+    page.all('select option').map{|s| s.text}.should == ['', 'A-Y', 'A-ZZ', 'B-X']
     select 'B-X'
     click_button 'Delete'
   end
@@ -325,15 +325,15 @@ describe AutoForme do
 
     visit("/Album/new")
     fill_in 'Name', :with=>'E'
-    all('select option').map{|s| s.text}.should == ['', 'X 0', 'Y 0', 'Z 0']
+    page.all('select option').map{|s| s.text}.should == ['', 'X 0', 'Y 0', 'Z 0']
     select 'X 0'
     click_button 'Create'
     fill_in 'Name', :with=>'D'
-    all('select option').map{|s| s.text}.should == ['', 'X 1', 'Y 0', 'Z 0']
+    page.all('select option').map{|s| s.text}.should == ['', 'X 1', 'Y 0', 'Z 0']
     select 'Y 0'
     click_button 'Create'
     fill_in 'Name', :with=>'C'
-    all('select option').map{|s| s.text}.should == ['', 'X 1', 'Y 1', 'Z 0']
+    page.all('select option').map{|s| s.text}.should == ['', 'X 1', 'Y 1', 'Z 0']
     select 'Y 1'
     click_button 'Create'
 
@@ -346,21 +346,21 @@ describe AutoForme do
     click_link 'Edit'
     select 'C'
     click_button 'Edit'
-    all('select option').map{|s| s.text}.should == ['', 'X 1', 'Y 2', 'Z 0']
+    page.all('select option').map{|s| s.text}.should == ['', 'X 1', 'Y 2', 'Z 0']
     select 'X 1'
     click_button 'Update'
 
     click_link 'Search'
-    all('select option').map{|s| s.text}.should == ['', 'X 2', 'Y 1', 'Z 0']
+    page.all('select option').map{|s| s.text}.should == ['', 'X 2', 'Y 1', 'Z 0']
     select 'X 2'
     click_button 'Search'
-    all('tr td:first-child').map{|s| s.text}.should == %w'C E'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'C E'
 
     click_link 'Album'
-    all('tr td:first-child').map{|s| s.text}.should == %w'C D E'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'C D E'
 
     click_link 'Delete'
-    all('select option').map{|s| s.text}.should == ['', 'C', 'D', 'E']
+    page.all('select option').map{|s| s.text}.should == ['', 'C', 'D', 'E']
     select 'C'
     click_button 'Delete'
     click_button 'Delete'
@@ -375,7 +375,7 @@ describe AutoForme do
     select 'X 1' 
     Artist.where(:name=>'X').update(:name=>'B')
     click_button 'Search'
-    all('tr td:first-child').map{|s| s.text}.should == []
+    page.all('tr td:first-child').map{|s| s.text}.should == []
   end
 
   it "should have working one to many and many to one association links on show and edit pages" do
@@ -421,6 +421,36 @@ describe AutoForme do
     page.current_path.should == '/Album/browse'
   end
 
+  it "should display but not link if the action is not supported " do
+    app_setup do
+      model Artist do
+        association_links :all
+      end
+      model Album do
+        association_links :all
+        supported_actions [:new]
+        display_name{|o| o.name.to_sym}
+      end
+    end
+
+    visit("/Artist/new")
+    fill_in 'Name', :with=>'Artist1'
+    click_button 'Create'
+
+    click_link 'Edit'
+    select 'Artist1'
+    click_button 'Edit'
+    click_link 'create'
+    fill_in 'Name', :with=>'Album1'
+    click_button 'Create'
+
+    visit("/Artist/edit")
+    select 'Artist1'
+    click_button 'Edit'
+    page.html.should =~ /Album1/
+    page.html.should_not =~ />edit</
+  end
+
   it "should support lazy loading association links on show and edit pages" do
     app_setup do
       model Artist do
@@ -522,10 +552,10 @@ describe AutoForme do
     fill_in 'Name', :with=>'1b'
     select 'Artist2'
     click_button 'Search'
-    all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
   end
 
   it "should have basic many to one associations working" do
@@ -566,10 +596,10 @@ describe AutoForme do
     fill_in 'Name', :with=>'1b'
     select 'Artist2'
     click_button 'Search'
-    all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
   end
 end
 
@@ -594,9 +624,9 @@ describe AutoForme do
 
     %w'A1 E1 L1 N1'.each{|n| Artist.create(:name=>n)}
     visit("/Album/new")
-    all('select option').map{|s| s.text}.should == ["", "A1", "E1", "L1"]
+    page.all('select option').map{|s| s.text}.should == ["", "A1", "E1", "L1"]
 
     visit("/Album/edit/#{Album.create(:name=>'Album1').id}")
-    all('select option').map{|s| s.text}.should == ["", "L1", "E1"]
+    page.all('select option').map{|s| s.text}.should == ["", "L1", "E1"]
   end
 end

data/spec/basic_spec.rb

@@ -38,26 +38,26 @@ describe AutoForme do
     page.find('title').text.should == 'Artist - Search'
     fill_in 'Name', :with=>'Upd'
     click_button 'Search'
-    all('th').map{|s| s.text}.should == ['Name', 'Show', 'Edit', 'Delete']
-    all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Show", "Edit", "Delete"]
+    page.all('th').map{|s| s.text}.should == ['Name', 'Show', 'Edit', 'Delete']
+    page.all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Show", "Edit", "Delete"]
 
     click_link 'Search'
     fill_in 'Name', :with=>'Foo'
     click_button 'Search'
-    all('td').map{|s| s.text}.should == []
+    page.all('td').map{|s| s.text}.should == []
 
     click_link 'Artist'
     page.find('title').text.should == 'Artist - Browse'
-    all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Show", "Edit", "Delete"]
 
-    all('td').last.find('a').click
+    page.all('td').last.find('a').click
     click_button 'Delete'
     page.find('title').text.should == 'Artist - Delete'
     page.html.should =~ /Deleted Artist/
     page.current_path.should == '/Artist/delete'
 
     click_link 'Artist'
-    all('td').map{|s| s.text}.should == []
+    page.all('td').map{|s| s.text}.should == []
   end
 
   it "should have basic functionality working in a subdirectory" do
@@ -85,24 +85,24 @@ describe AutoForme do
     click_link 'Search'
     fill_in 'Name', :with=>'Upd'
     click_button 'Search'
-    all('th').map{|s| s.text}.should == ['Name', 'Show', 'Edit', 'Delete']
-    all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Show", "Edit", "Delete"]
+    page.all('th').map{|s| s.text}.should == ['Name', 'Show', 'Edit', 'Delete']
+    page.all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Show", "Edit", "Delete"]
 
     click_link 'Search'
     fill_in 'Name', :with=>'Foo'
     click_button 'Search'
-    all('td').map{|s| s.text}.should == []
+    page.all('td').map{|s| s.text}.should == []
 
     click_link 'Artist'
-    all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Show", "Edit", "Delete"]
 
-    all('td').last.find('a').click
+    page.all('td').last.find('a').click
     click_button 'Delete'
     page.html.should =~ /Deleted Artist/
     page.current_path.should == '/prefix/Artist/delete'
 
     click_link 'Artist'
-    all('td').map{|s| s.text}.should == []
+    page.all('td').map{|s| s.text}.should == []
   end
 
   it "should have delete button on edit page" do
@@ -195,10 +195,10 @@ describe AutoForme do
     click_link 'Search'
     fill_in 'Search_form Artist Name', :with=>'Upd'
     click_button 'Search'
-    all('th').map{|s| s.text}.should == ["Search Artist Name", "Show", "Edit", "Delete"]
+    page.all('th').map{|s| s.text}.should == ["Search Artist Name", "Show", "Edit", "Delete"]
 
     click_link 'Artist'
-    all('th').map{|s| s.text}.should == ["Browse Artist Name", "Show", "Edit", "Delete"]
+    page.all('th').map{|s| s.text}.should == ["Browse Artist Name", "Show", "Edit", "Delete"]
   end
 
   it "should support specifying display names per type" do
@@ -306,26 +306,26 @@ describe AutoForme do
     5.times{|i| Artist.create(:name=>i.to_s)}
     visit("/Artist/browse")
     first('li.disabled a').text.should == 'Previous'
-    all('tr td:first-child').map{|s| s.text}.should == %w'0 1'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'0 1'
     click_link 'Next'
-    all('tr td:first-child').map{|s| s.text}.should == %w'2 3'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'2 3'
     click_link 'Next'
-    all('tr td:first-child').map{|s| s.text}.should == %w'4'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'4'
     first('li.disabled a').text.should == 'Next'
     click_link 'Previous'
-    all('tr td:first-child').map{|s| s.text}.should == %w'2 3'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'2 3'
     click_link 'Previous'
-    all('tr td:first-child').map{|s| s.text}.should == %w'0 1'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'0 1'
     first('li.disabled a').text.should == 'Previous'
 
     click_link 'Search'
     click_button 'Search'
-    all('tr td:first-child').map{|s| s.text}.should == %w'0 1 2'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'0 1 2'
     click_link 'Next'
-    all('tr td:first-child').map{|s| s.text}.should == %w'3 4'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'3 4'
     first('li.disabled a').text.should == 'Next'
     click_link 'Previous'
-    all('tr td:first-child').map{|s| s.text}.should == %w'0 1 2'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'0 1 2'
     first('li.disabled a').text.should == 'Previous'
   end
 
@@ -351,10 +351,10 @@ describe AutoForme do
     click_link 'Search'
     fill_in 'Name', :with=>'Upd'
     click_button 'Search'
-    all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Edit"]
+    page.all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Edit"]
 
     click_link 'Artist'
-    all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Edit"]
+    page.all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Edit"]
   end
 
   it "should have basic functionality working" do
@@ -376,9 +376,9 @@ describe AutoForme do
     page.html.should =~ /Updated FooArtist/
 
     click_link 'FooArtist'
-    all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["TestArtistUpdate", "Show", "Edit", "Delete"]
 
-    all('td').last.find('a').click
+    page.all('td').last.find('a').click
     click_button 'Delete'
     page.html.should =~ /Deleted FooArtist/
   end
@@ -466,10 +466,10 @@ describe AutoForme do
     fill_in 'N4', :with=>'V4'
     fill_in 'N5', :with=>'Q5'
     click_button 'Search'
-    all('td').map{|s| s.text}.should == ["Q1", "Q2", "Q3", "V4", "Q5", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Q1", "Q2", "Q3", "V4", "Q5", "Show", "Edit", "Delete"]
 
     click_link 'Artist'
-    all('td').map{|s| s.text}.should == ["Q0", "Q1", "Q3", "V4", "Q5", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.should == ["Q0", "Q1", "Q3", "V4", "Q5", "Show", "Edit", "Delete"]
   end
 
   it "should support specifying order per type" do
@@ -483,20 +483,20 @@ describe AutoForme do
     Artist.create(:n0=>'0', :n1=>'4', :n2=>'1', :n3=>'5', :n4=>'3')
 
     visit("/Artist/show")
-    all('option').map{|s| s.text}.should == ['', '2', '1', '0']
+    page.all('option').map{|s| s.text}.should == ['', '2', '1', '0']
 
     click_link 'Edit'
-    all('option').map{|s| s.text}.should == ['', '0', '1', '2']
+    page.all('option').map{|s| s.text}.should == ['', '0', '1', '2']
 
     click_link 'Delete'
-    all('option').map{|s| s.text}.should == ['', '2', '0', '1']
+    page.all('option').map{|s| s.text}.should == ['', '2', '0', '1']
 
     click_link 'Search'
     click_button 'Search'
-    all('tr td:first-child').map{|s| s.text}.should == ['0', '2', '1']
+    page.all('tr td:first-child').map{|s| s.text}.should == ['0', '2', '1']
 
     click_link 'Artist'
-    all('tr td:first-child').map{|s| s.text}.should == ['1', '2', '0']
+    page.all('tr td:first-child').map{|s| s.text}.should == ['1', '2', '0']
   end
 
   it "should support specifying filter per type" do
@@ -522,16 +522,16 @@ describe AutoForme do
     Artist.create(:n0=>'0', :n1=>'4', :n2=>'1', :n3=>'5', :n4=>'3')
 
     visit("/Artist/show")
-    all('option').map{|s| s.text}.should == ['', '0']
+    page.all('option').map{|s| s.text}.should == ['', '0']
 
     click_link 'Edit'
-    all('option').map{|s| s.text}.should == ['', '2']
+    page.all('option').map{|s| s.text}.should == ['', '2']
     select '2'
     click_button 'Edit'
     click_button 'Update'
 
     click_link 'Delete'
-    all('option').map{|s| s.text}.should == ['', '1']
+    page.all('option').map{|s| s.text}.should == ['', '1']
     select '1'
     click_button 'Delete'
     click_button 'Delete'
@@ -539,10 +539,10 @@ describe AutoForme do
 
     click_link 'Search'
     click_button 'Search'
-    all('tr td:first-child').map{|s| s.text}.should == %w'1'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'1'
 
     click_link 'Artist'
-    all('tr td:first-child').map{|s| s.text}.should == %w'1'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'1'
   end
 
   it "should support specifying filter per type using request params" do
@@ -569,19 +569,19 @@ describe AutoForme do
     Artist.create(:n0=>'0', :n1=>'4', :n2=>'1', :n3=>'5', :n4=>'3')
 
     visit("/Artist/show?f=3")
-    all('option').map{|s| s.text}.should == ['', '0']
+    page.all('option').map{|s| s.text}.should == ['', '0']
 
     visit("/Artist/edit?f=1")
-    all('option').map{|s| s.text}.should == ['', '2']
+    page.all('option').map{|s| s.text}.should == ['', '2']
 
     visit("/Artist/delete?f=2")
-    all('option').map{|s| s.text}.should == ['', '1']
+    page.all('option').map{|s| s.text}.should == ['', '1']
 
     visit("/Artist/search/1?f=4")
-    all('tr td:first-child').map{|s| s.text}.should == %w'1'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'1'
 
     visit("/Artist/browse?f=6")
-    all('tr td:first-child').map{|s| s.text}.should == %w'1'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'1'
   end
 
   it "should support specifying filter per type using request session" do
@@ -596,16 +596,16 @@ describe AutoForme do
     visit '/session/set?n1=2'
 
     visit("/Artist/show")
-    all('option').map{|s| s.text}.should == ['', '2', '1']
+    page.all('option').map{|s| s.text}.should == ['', '2', '1']
 
     click_link 'Edit'
-    all('option').map{|s| s.text}.should == ['', '2', '1']
+    page.all('option').map{|s| s.text}.should == ['', '2', '1']
     select '2'
     click_button 'Edit'
     click_button 'Update'
 
     click_link 'Delete'
-    all('option').map{|s| s.text}.should == ['', '2', '1']
+    page.all('option').map{|s| s.text}.should == ['', '2', '1']
     select '1'
     click_button 'Delete'
     click_button 'Delete'
@@ -613,10 +613,10 @@ describe AutoForme do
 
     click_link 'Search'
     click_button 'Search'
-    all('tr td:first-child').map{|s| s.text}.should == %w'2 1'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'2 1'
 
     click_link 'Artist'
-    all('tr td:first-child').map{|s| s.text}.should == %w'2 1'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'2 1'
   end
 
   it "should support session_value for restricting access by matching session variable to column value" do
@@ -638,23 +638,23 @@ describe AutoForme do
     click_button 'Create'
 
     click_link 'Show'
-    all('option').map{|s| s.text}.should == ['', '2', '1']
+    page.all('option').map{|s| s.text}.should == ['', '2', '1']
 
     click_link 'Edit'
-    all('option').map{|s| s.text}.should == ['', '2', '1']
+    page.all('option').map{|s| s.text}.should == ['', '2', '1']
     select '2'
     click_button 'Edit'
     click_button 'Update'
 
     click_link 'Search'
     click_button 'Search'
-    all('tr td:first-child').map{|s| s.text}.should == %w'2 1'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'2 1'
 
     click_link 'Artist'
-    all('tr td:first-child').map{|s| s.text}.should == %w'2 1'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'2 1'
 
     click_link 'Delete'
-    all('option').map{|s| s.text}.should == ['', '2', '1']
+    page.all('option').map{|s| s.text}.should == ['', '2', '1']
     select '1'
     click_button 'Delete'
   end
@@ -676,9 +676,9 @@ describe AutoForme do
     fill_in 'Num', :with=>'1.01'
     click_button 'Create'
     click_link 'Artist'
-    all('tr td:first-child').map{|s| s.text}.should == %w'1.01'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'1.01'
     click_link 'Search'
     click_button 'Search'
-    all('tr td:first-child').map{|s| s.text}.should == %w'1.01'
+    page.all('tr td:first-child').map{|s| s.text}.should == %w'1.01'
   end
 end

data/spec/mtm_spec.rb

@@ -41,23 +41,23 @@ describe AutoForme do
     click_button "Edit"
 
     find('h2').text.should == 'Edit Albums for Artist1'
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album1", "Album2", "Album3"]
-    all('select')[1].all('option').map{|s| s.text}.should == []
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album1", "Album2", "Album3"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == []
     select("Album1", :from=>"Associate With")
     click_button "Update"
     page.html.should =~ /Updated albums association for Artist/
     Artist.first.albums.map{|x| x.name}.should == %w'Album1'
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
-    all('select')[1].all('option').map{|s| s.text}.should == ["Album1"]
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == ["Album1"]
     select("Album2", :from=>"Associate With")
     select("Album3", :from=>"Associate With")
     select("Album1", :from=>"Disassociate From")
     click_button "Update"
     Artist.first.refresh.albums.map{|x| x.name}.should == %w'Album2 Album3'
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album1"]
-    all('select')[1].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album1"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
   end
 
   it "should have many to many association editing working with autocompletion" do
@@ -79,23 +79,23 @@ describe AutoForme do
     select("Artist1")
     click_button "Edit"
 
-    all('select')[0].all('option').map{|s| s.text}.should == []
+    page.all('select')[0].all('option').map{|s| s.text}.should == []
     fill_in "Associate With", :with=>a1.id
     click_button "Update"
     page.html.should =~ /Updated albums association for Artist/
     Artist.first.albums.map{|x| x.name}.should == %w'Album1'
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album1"]
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album1"]
     fill_in "Associate With", :with=>a2.id
     select("Album1", :from=>"Disassociate From")
     click_button "Update"
     Artist.first.refresh.albums.map{|x| x.name}.should == %w'Album2'
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album2"]
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album2"]
     select("Album2", :from=>"Disassociate From")
     click_button "Update"
     Artist.first.refresh.albums.map{|x| x.name}.should == []
-    all('select')[0].all('option').map{|s| s.text}.should == []
+    page.all('select')[0].all('option').map{|s| s.text}.should == []
   end
 
   it "should have inline many to many association editing working" do
@@ -219,22 +219,22 @@ describe AutoForme do
     select("Artist1")
     click_button "Edit"
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album1", "Album2", "Album3"]
-    all('select')[1].all('option').map{|s| s.text}.should == []
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album1", "Album2", "Album3"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == []
     select("Album1", :from=>"Associate With")
     click_button "Update"
     Artist.first.refresh.albums.map{|x| x.name}.should == %w'Album1'
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
-    all('select')[1].all('option').map{|s| s.text}.should == ["Album1"]
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == ["Album1"]
     select("Album2", :from=>"Associate With")
     select("Album3", :from=>"Associate With")
     select("Album1", :from=>"Disassociate From")
     click_button "Update"
     Artist.first.refresh.albums.map{|x| x.name}.should == %w'Album2 Album3'
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album1"]
-    all('select')[1].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album1"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
   end
 
   it "should use filter/order from associated class" do
@@ -257,21 +257,21 @@ describe AutoForme do
     select("Artist1")
     click_button "Edit"
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["B1", "E1"]
-    all('select')[1].all('option').map{|s| s.text}.should == []
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["B1", "E1"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == []
     select("E1", :from=>"Associate With")
     click_button "Update"
     Artist.first.albums.map{|x| x.name}.should == %w'E1'
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["B1"]
-    all('select')[1].all('option').map{|s| s.text}.should == ["E1"]
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["B1"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == ["E1"]
     select("B1", :from=>"Associate With")
     select("E1", :from=>"Disassociate From")
     click_button "Update"
     Artist.first.refresh.albums.map{|x| x.name}.should == %w'B1'
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["E1"]
-    all('select')[1].all('option').map{|s| s.text}.should == ["B1"]
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["E1"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == ["B1"]
 
     select("B1", :from=>"Disassociate From")
     Album.where(:name=>'B1').update(:name=>'Z1')
@@ -287,8 +287,8 @@ describe AutoForme do
     visit('/Artist/mtm_edit')
     select("Artist1")
     click_button "Edit"
-    all('select')[0].all('option').map{|s| s.text}.should == []
-    all('select')[1].all('option').map{|s| s.text}.should == []
+    page.all('select')[0].all('option').map{|s| s.text}.should == []
+    page.all('select')[1].all('option').map{|s| s.text}.should == []
   end
 
   it "should support column options on mtm_edit page" do
@@ -359,22 +359,22 @@ describe AutoForme do
     click_button "Edit"
 
     find('h2').text.should == 'Edit Albums for Artist1'
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album1", "Album2", "Album3"]
-    all('select')[1].all('option').map{|s| s.text}.should == []
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album1", "Album2", "Album3"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == []
     select("Album1", :from=>"Associate With")
     click_button "Update"
     page.html.should =~ /Updated albums association for Artist/
     Artist.first.albums.map{|x| x.name}.should == %w'Album1'
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
-    all('select')[1].all('option').map{|s| s.text}.should == ["Album1"]
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == ["Album1"]
     select("Album2", :from=>"Associate With")
     select("Album3", :from=>"Associate With")
     select("Album1", :from=>"Disassociate From")
     click_button "Update"
     Artist.first.refresh.albums.map{|x| x.name}.should == %w'Album2 Album3'
 
-    all('select')[0].all('option').map{|s| s.text}.should == ["Album1"]
-    all('select')[1].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
+    page.all('select')[0].all('option').map{|s| s.text}.should == ["Album1"]
+    page.all('select')[1].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
   end
 end

data/spec/roda_spec_helper.rb

@@ -22,7 +22,8 @@ HTML
   use Rack::Session::Cookie, :secret => '1'
   use Rack::Csrf
 
-  plugin :render, :layout=>{:inline=>LAYOUT}
+  plugin :static_path_info unless ENV['RODA_NO_STATIC_PATH_INFO']
+  plugin :render, :layout=>{:inline=>LAYOUT}, :opts=>{:default_encoding=>nil}
   plugin :not_found do
     'Unhandled Request'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forme
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Web Administrative Console for Sinatra/Rails and Sequel