autoforme 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 728834eb84059f820d99421609b8f274868fa06f
-  data.tar.gz: 497582c00ccd77bcb14f716ae5596d32210ae33e
+  metadata.gz: b02fdd6446457bcda7559cde3424ffe3cebeffc0
+  data.tar.gz: 830e5ab7011c6f853726f3406e46011e5a081c57
 SHA512:
-  metadata.gz: e71852cb6b1b049123b388d944789f8678b392724d299d776cd9ea43dd5ef3f6230d81135e11d6589a0610feb957e2838a1a3fd83181676f146089ec8832b837
-  data.tar.gz: ed0cecfc641fccdd7e1337421c3fdab68d38f4b1cbddbb470744924ffde7e9d35ab5e0c6b8205df8908bea8630a12ce392b9846fadb9f76166e0149495fe16cd
+  metadata.gz: ee758d94d0f5faca90f0f496140bed42ee4fb30a3dda54ab77ecc451151a02d336b8a369ac17b6ea4aff803ec1791b2a9255382199d494ed5c2c916c5dfd73ca
+  data.tar.gz: 119472906c1fff16ee74cc8babe3656151aadb7ee02cc71241c5263ae39e8fb6e1aeac7cd3b8b6e3785bfbe5474c93afcfd2e224a4191417feaefb72aef2ca95

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.2.0 (2015-05-21)
+
+* Add support for returning browse and search results in CSV format (jeremyevans)
+
 === 1.1.0 (2015-03-23)
 
 * Add Framework#register_by_name to allow autoforme to work better when using code reloading in development (jeremyevans)

data/Rakefile

@@ -10,53 +10,25 @@ end
 
 ### Specs
 
-begin
-  require "rspec/core/rake_task"
-
-  spec = lambda do |name, files, d|
-    lib_dir = File.join(File.dirname(File.expand_path(__FILE__)), 'lib')
-    ENV['RUBYLIB'] ? (ENV['RUBYLIB'] += ":#{lib_dir}") : (ENV['RUBYLIB'] = lib_dir)
-    desc d
-    RSpec::Core::RakeTask.new(name) do |t|
-      t.pattern= files
-    end
-  end
-
-  spec_with_cov = lambda do |name, files, d|
-    spec.call(name, files, d)
-    desc "#{d} with coverage"
-    task "#{name}_cov" do
-      ENV['COVERAGE'] = '1'
-      Rake::Task[name].invoke
-    end
-  end
-  
-  task :default => [:spec]
-  spec_with_cov.call("spec", Dir["spec/*_spec.rb"], "Run specs with sinatra/sequel")
+spec = proc do |env|
+  env.each{|k,v| ENV[k] = v}
+  sh "#{FileUtils::RUBY} -rubygems -I lib -e 'ARGV.each{|f| require f}' ./spec/*_spec.rb"
+  env.each{|k,v| ENV.delete(k)}
+end
+task :default => :roda_spec
 
-  desc "Run specs with roda/sequel"
-  task :roda_spec do
-    begin
-      ENV['FRAMEWORK'] = 'roda'
-      Rake::Task[:spec].invoke
-    ensure
-      ENV.delete('FRAMEWORK')
-    end
-  end
+desc "Run specs for all frameworks"
+task :spec => [:roda_spec, :sinatra_spec, :rails_spec]
 
-  desc "Run specs with rails/sequel"
-  task :rails_spec do
-    begin
-      ENV['FRAMEWORK'] = 'rails'
-      Rake::Task[:spec].invoke
-    ensure
-      ENV.delete('FRAMEWORK')
-    end
+%w'roda sinatra rails'.each do |framework|
+  desc "Run specs with for #{framework} with coverage"
+  task "#{framework}_spec" do
+    spec.call('FRAMEWORK'=>framework)
   end
 
-rescue LoadError
-  task :default do
-    puts "Must install rspec >=2.0 to run the default task (which runs specs)"
+  desc "Run specs with for #{framework}"
+  task "#{framework}_spec_cov" do
+    spec.call('FRAMEWORK'=>framework, 'COVERAGE'=>'1')
   end
 end
 

data/lib/autoforme/action.rb

@@ -1,3 +1,5 @@
+require 'enum_csv'
+
 module AutoForme
   # Represents an action on a model in response to a web request.
   class Action
@@ -20,6 +22,12 @@ module AutoForme
     # The type symbols related to the current action (e.g. :new, :create).
     attr_reader :type
 
+    # The type of output, currently nil for normal output, and 'csv' for csv output
+    attr_reader :output_type
+
+    # The filename to use for file output
+    attr_reader :output_filename
+
     # Array of strings for all action types currently supported
     ALL_SUPPORTED_ACTIONS = %w'new create show edit update delete destroy browse search mtm_edit mtm_update association_links autocomplete'.freeze
 
@@ -174,6 +182,17 @@ module AutoForme
       label
     end
 
+    # Return a string in CSV format with the results
+    def csv(meth)
+      @output_type = 'csv'
+      @output_filename = "#{model.link.downcase}_#{normalized_type}.csv"
+      columns = model.columns_for(type, request)
+      headers = columns.map{|column| column_label_for(type, request, model, column)}
+      EnumCSV.csv(model.send(meth, normalized_type, request, :all_results=>true), :headers=>headers) do |obj|
+        columns.map{|column| model.column_value(type, request, obj, column)}
+      end
+    end
+
     # HTML fragment for the default page header, which uses tabs for each supported action.
     def tabs
       content = '<ul class="nav nav-tabs">'
@@ -392,6 +411,7 @@ module AutoForme
         html << '<li class="disabled"><a href="#">Next</a></li>'
       end
       html << "</ul>"
+      html << "<p><a href=\"#{url_for("#{type}/csv?#{h request.query_string}")}\">CSV Format</a></p>"
     end
 
     # Show page used for browse/search pages.
@@ -403,13 +423,19 @@ module AutoForme
 
     # Handle browse action by showing a table containing model objects.
     def handle_browse
-      table_page(*model.browse(type, request))
+      if request.id == 'csv'
+        csv(:browse)
+      else
+        table_page(*model.browse(type, request))
+      end
     end
 
     # Handle browse action by showing a search form if no page is selected, or the correct page of search results
     # if there is a page selected.
     def handle_search
-      if request.id
+      if request.id == 'csv'
+        csv(:search_results)
+      elsif request.id
         table_page(*model.search_results(normalized_type, request))
       else
         page do

data/lib/autoforme/frameworks/rails.rb

@@ -48,8 +48,14 @@ module AutoForme
           if @autoforme_action = framework.action_for(Request.new(self))
             if redirect = catch(:redirect){@autoforme_text = @autoforme_action.handle; nil}
               redirect_to redirect
+            elsif @autoforme_action.output_type == 'csv'
+              response.headers['Content-Type'] = 'text/csv'
+              response.headers['Content-Disposition'] = "attachment; filename=#{@autoforme_action.output_filename}"
+              render :text=>@autoforme_text
+            elsif @autoforme_action.request.xhr?
+              render :text=>@autoforme_text
             else
-              render :inline=>"<%=raw @autoforme_text %>", :layout=>!@autoforme_action.request.xhr?
+              render :inline=>"<%=raw @autoforme_text %>", :layout=>true
             end
           else
             render :text=>'Unhandled Request', :status=>404

data/lib/autoforme/frameworks/roda.rb

@@ -61,9 +61,15 @@ module AutoForme
 
           r.on *current_matchers do
             @autoforme_text = @autoforme_action.handle
-            opts = {:content=>@autoforme_text}
-            opts[:layout] = false if @autoforme_action.request.xhr?
-            view opts
+            if @autoforme_action.output_type == 'csv'
+              response['Content-Type'] = 'text/csv'
+              response['Content-Disposition'] = "attachment; filename=#{@autoforme_action.output_filename}"
+              @autoforme_text
+            elsif @autoforme_action.request.xhr?
+              @autoforme_text
+            else
+              view(:content=>@autoforme_text)
+            end
           end
         end
       end

data/lib/autoforme/frameworks/sinatra.rb

@@ -40,9 +40,16 @@ module AutoForme
         block = lambda do
           if @autoforme_action = framework.action_for(Request.new(self))
             @autoforme_text = @autoforme_action.handle
-            opts = {}
-            opts[:layout] = false if @autoforme_action.request.xhr?
-            erb "<%= @autoforme_text %>", opts
+
+            if @autoforme_action.output_type == 'csv'
+              response['Content-Type'] = 'text/csv'
+              response['Content-Disposition'] = "attachment; filename=#{@autoforme_action.output_filename}"
+              @autoforme_text
+            elsif @autoforme_action.request.xhr?
+              @autoforme_text
+            else
+              erb "<%= @autoforme_text %>"
+            end
           else
             pass
           end

data/lib/autoforme/model.rb

@@ -76,12 +76,12 @@ module AutoForme
     
     # Whether an mtm_edit can be displayed for the given association
     def supported_mtm_edit?(assoc, request)
-      mtm_association_select_options(request).map{|x| x.to_s}.include?(assoc)
+      mtm_association_select_options(request).map(&:to_s).include?(assoc)
     end
 
     # Whether an mtm_update can occur for the given association
     def supported_mtm_update?(assoc, request)
-      supported_mtm_edit?(assoc, request) || inline_mtm_assocs(request).map{|x| x.to_s}.include?(assoc) 
+      supported_mtm_edit?(assoc, request) || inline_mtm_assocs(request).map(&:to_s).include?(assoc) 
     end
 
     # An array of many to many association symbols to handle inline on the edit forms.

data/lib/autoforme/models/sequel.rb

@@ -58,7 +58,7 @@ module AutoForme
       def association?(column)
         case column
         when String
-          model.associations.map{|x| x.to_s}.include?(column)
+          model.associations.map(&:to_s).include?(column)
         else
           model.association_reflection(column)
         end
@@ -103,7 +103,7 @@ module AutoForme
 
       # Array of association name strings for given association types
       def association_names(types=SUPPORTED_ASSOCIATION_TYPES)
-        model.all_association_reflections.select{|r| types.include?(r[:type])}.map{|r| r[:name]}.sort_by{|n| n.to_s}
+        model.all_association_reflections.select{|r| types.include?(r[:type])}.map{|r| r[:name]}.sort_by(&:to_s)
       end
 
       # Save the object, returning the object if successful, or nil if not.
@@ -142,7 +142,7 @@ module AutoForme
             columns[i] = reflection[:name]
           end
         end
-        columns.sort_by{|s| s.to_s}
+        columns.sort_by(&:to_s)
       end
 
       # Add a filter restricting access to only rows where the column name
@@ -158,7 +158,7 @@ module AutoForme
       end
 
       # Returning array of matching objects for the current search page using the given parameters.
-      def search_results(type, request)
+      def search_results(type, request, opts={})
         params = request.params
         ds = apply_associated_eager(:search, request, all_dataset_for(type, request))
         columns_for(:search_form, request).each do |c|
@@ -178,17 +178,18 @@ module AutoForme
             end
           end
         end
-        paginate(type, request, ds)
+        paginate(type, request, ds, opts)
       end
 
       # Return array of matching objects for the current page.
-      def browse(type, request)
-        paginate(type, request, apply_associated_eager(:browse, request, all_dataset_for(type, request)))
+      def browse(type, request, opts={})
+        paginate(type, request, apply_associated_eager(:browse, request, all_dataset_for(type, request)), opts)
       end
 
       # Do very simple pagination, by selecting one more object than necessary,
       # and noting if there is a next page by seeing if more objects are returned than the limit.
-      def paginate(type, request, ds)
+      def paginate(type, request, ds, opts={})
+        return ds.all if opts[:all_results]
         limit = limit_for(type, request)
         offset = ((request.id.to_i||1)-1) * limit
         objs = ds.limit(limit+1, (offset if offset > 0)).all

data/lib/autoforme/version.rb

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

data/spec/associations_spec.rb

@@ -38,17 +38,17 @@ describe AutoForme do
     click_link 'Show'
     select 'Album1'
     click_button 'Show'
-    page.html.should =~ /Name.+Album1b/m
-    page.html.should =~ /Artist.+Artist2/m
+    page.html.must_match /Name.+Album1b/m
+    page.html.must_match /Artist.+Artist2/m
 
     click_link 'Search'
     fill_in 'Name', :with=>'1b'
     select 'Artist2'
     click_button 'Search'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "Artist2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["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
@@ -68,7 +68,7 @@ describe AutoForme do
     fill_in 'Name', :with=>'Album1'
     fill_in 'Artist', :with=>a.id.to_s
     click_button 'Create'
-    Album.first.artist_id.should == a.id
+    Album.first.artist_id.must_equal a.id
 
     click_link 'Edit'
     select 'Album1'
@@ -76,13 +76,13 @@ describe AutoForme do
     fill_in 'Name', :with=>'Album1b'
     fill_in 'Artist', :with=>b.id.to_s
     click_button 'Update'
-    Album.first.artist_id.should == b.id
+    Album.first.artist_id.must_equal b.id
 
     click_link 'Search'
     fill_in 'Name', :with=>'1b'
     fill_in 'Artist', :with=>b.id.to_s
     click_button 'Search'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "TestArtist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "TestArtist2", "Show", "Edit", "Delete"]
   end
 
   it "should be able to used specified name formatting in other model" do
@@ -109,8 +109,8 @@ describe AutoForme do
     click_link 'Show'
     select 'Album1'
     click_button 'Show'
-    page.html.should =~ /Name.+Album1/m
-    page.html.should =~ /Artist.+A1A1/m
+    page.html.must_match /Name.+Album1/m
+    page.html.must_match /Artist.+A1A1/m
 
     click_link 'Edit'
     select 'Album1'
@@ -123,10 +123,10 @@ describe AutoForme do
     fill_in 'Name', :with=>'1b'
     select 'A2A2'
     click_button 'Search'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "A2A2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "A2A2", "Show", "Edit", "Delete"]
   end
 
   it "should be able to used specified name formatting for current association" do
@@ -152,8 +152,8 @@ describe AutoForme do
     click_link 'Show'
     select 'Album1'
     click_button 'Show'
-    page.html.should =~ /Name.+Album1/m
-    page.html.should =~ /Artist.+A1A1/m
+    page.html.must_match /Name.+Album1/m
+    page.html.must_match /Artist.+A1A1/m
 
     click_link 'Edit'
     select 'Album1'
@@ -166,10 +166,10 @@ describe AutoForme do
     fill_in 'Name', :with=>'1b'
     select 'A2A2'
     click_button 'Search'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "A2A2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "A2A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "A2A2", "Show", "Edit", "Delete"]
   end
 
   it "should be able to eager load associations when loading model" do
@@ -196,8 +196,8 @@ describe AutoForme do
     click_link 'Show'
     select 'A1-Album1'
     click_button 'Show'
-    page.html.should =~ /Name.+Album1/m
-    page.html.should =~ /Artist.+A1/m
+    page.html.must_match /Name.+Album1/m
+    page.html.must_match /Artist.+A1/m
 
     click_link 'Edit'
     select 'A1-Album1'
@@ -210,10 +210,10 @@ describe AutoForme do
     fill_in 'Name', :with=>'1b'
     select 'A2'
     click_button 'Search'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "A2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "A2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "A2", "Show", "Edit", "Delete"]
 
     click_link 'Delete', :match=>:first
     select 'A2-Album1b'
@@ -271,14 +271,14 @@ describe AutoForme do
     click_button 'Create'
 
     click_link 'Show'
-    page.all('select option').map{|s| s.text}.should == ['', 'A-Y', 'B-X', 'B-Z']
+    page.all('select option').map{|s| s.text}.must_equal ['', 'A-Y', 'B-X', 'B-Z']
     select 'B-X'
     click_button 'Show'
-    page.html.should =~ /Name.+X/m
-    page.html.should =~ /Artist.+B/m
+    page.html.must_match /Name.+X/m
+    page.html.must_match /Artist.+B/m
 
     click_link 'Edit'
-    page.all('select option').map{|s| s.text}.should == ['', 'X (B)', 'Y (A)', 'Z (B)']
+    page.all('select option').map{|s| s.text}.must_equal ['', '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'
-    page.all('tr td:first-child').map{|s| s.text}.should == %w'Y ZZ'
+    page.all('tr td:first-child').map{|s| s.text}.must_equal %w'Y ZZ'
 
     click_link 'Album'
-    page.all('tr td:first-child').map{|s| s.text}.should == %w'Y ZZ X'
+    page.all('tr td:first-child').map{|s| s.text}.must_equal %w'Y ZZ X'
 
     click_link 'Delete', :match=>:first
-    page.all('select option').map{|s| s.text}.should == ['', 'A-Y', 'A-ZZ', 'B-X']
+    page.all('select option').map{|s| s.text}.must_equal ['', 'A-Y', 'A-ZZ', 'B-X']
     select 'B-X'
     click_button 'Delete'
   end
@@ -325,42 +325,42 @@ describe AutoForme do
 
     visit("/Album/new")
     fill_in 'Name', :with=>'E'
-    page.all('select option').map{|s| s.text}.should == ['', 'X 0', 'Y 0', 'Z 0']
+    page.all('select option').map{|s| s.text}.must_equal ['', 'X 0', 'Y 0', 'Z 0']
     select 'X 0'
     click_button 'Create'
     fill_in 'Name', :with=>'D'
-    page.all('select option').map{|s| s.text}.should == ['', 'X 1', 'Y 0', 'Z 0']
+    page.all('select option').map{|s| s.text}.must_equal ['', 'X 1', 'Y 0', 'Z 0']
     select 'Y 0'
     click_button 'Create'
     fill_in 'Name', :with=>'C'
-    page.all('select option').map{|s| s.text}.should == ['', 'X 1', 'Y 1', 'Z 0']
+    page.all('select option').map{|s| s.text}.must_equal ['', 'X 1', 'Y 1', 'Z 0']
     select 'Y 1'
     click_button 'Create'
 
     click_link 'Show'
     select 'D'
     click_button 'Show'
-    page.html.should =~ /Name.+D/m
-    page.html.should =~ /Artist.+Y 2/m
+    page.html.must_match /Name.+D/m
+    page.html.must_match /Artist.+Y 2/m
 
     click_link 'Edit'
     select 'C'
     click_button 'Edit'
-    page.all('select option').map{|s| s.text}.should == ['', 'X 1', 'Y 2', 'Z 0']
+    page.all('select option').map{|s| s.text}.must_equal ['', 'X 1', 'Y 2', 'Z 0']
     select 'X 1'
     click_button 'Update'
 
     click_link 'Search'
-    page.all('select option').map{|s| s.text}.should == ['', 'X 2', 'Y 1', 'Z 0']
+    page.all('select option').map{|s| s.text}.must_equal ['', 'X 2', 'Y 1', 'Z 0']
     select 'X 2'
     click_button 'Search'
-    page.all('tr td:first-child').map{|s| s.text}.should == %w'C E'
+    page.all('tr td:first-child').map{|s| s.text}.must_equal %w'C E'
 
     click_link 'Album'
-    page.all('tr td:first-child').map{|s| s.text}.should == %w'C D E'
+    page.all('tr td:first-child').map{|s| s.text}.must_equal %w'C D E'
 
     click_link 'Delete', :match=>:first
-    page.all('select option').map{|s| s.text}.should == ['', 'C', 'D', 'E']
+    page.all('select option').map{|s| s.text}.must_equal ['', 'C', 'D', 'E']
     select 'C'
     click_button 'Delete'
     click_button 'Delete'
@@ -369,13 +369,13 @@ describe AutoForme do
     Artist.where(:name=>'Y').update(:name=>'A')
     fill_in 'Name', :with=>'F'
     select 'Y 1' 
-    proc{click_button 'Create'}.should raise_error(Sequel::NoMatchingRow)
+    proc{click_button 'Create'}.must_raise(Sequel::NoMatchingRow)
 
     visit("/Album/search")
     select 'X 1' 
     Artist.where(:name=>'X').update(:name=>'B')
     click_button 'Search'
-    page.all('tr td:first-child').map{|s| s.text}.should == []
+    page.all('tr td:first-child').map{|s| s.text}.must_equal []
   end
 
   it "should have working one to many and many to one association links on show and edit pages" do
@@ -404,21 +404,21 @@ describe AutoForme do
     select 'Album1'
     click_button 'Show'
     click_link 'Artist1'
-    page.current_path.should =~ %r{Artist/show/\d+}
+    page.current_path.must_match %r{Artist/show/\d+}
     click_link 'Album1'
-    page.current_path.should =~ %r{Album/show/\d+}
+    page.current_path.must_match %r{Album/show/\d+}
     click_link 'Artist'
-    page.current_path.should == '/Artist/browse'
+    page.current_path.must_equal '/Artist/browse'
 
     click_link 'Edit', :match=>:first
     select 'Artist1'
     click_button 'Edit'
     click_link 'Album1'
-    page.current_path.should =~ %r{Album/edit/\d+}
+    page.current_path.must_match %r{Album/edit/\d+}
     click_link 'Artist1'
-    page.current_path.should =~ %r{Artist/edit/\d+}
+    page.current_path.must_match %r{Artist/edit/\d+}
     click_link 'Albums'
-    page.current_path.should == '/Album/browse'
+    page.current_path.must_equal '/Album/browse'
   end
 
   it "should display but not link if the action is not supported " do
@@ -447,8 +447,8 @@ describe AutoForme do
     visit("/Artist/edit")
     select 'Artist1'
     click_button 'Edit'
-    page.html.should =~ /Album1/
-    page.html.should_not =~ />edit</
+    page.html.must_match /Album1/
+    page.html.wont_match />edit</
   end
 
   it "should support lazy loading association links on show and edit pages" do
@@ -471,7 +471,7 @@ describe AutoForme do
     click_link 'Edit'
     select 'Artist1'
     click_button 'Edit'
-    page.html.should_not =~ /create/
+    page.html.wont_match /create/
     click_link 'Show Associations'
     click_link 'create'
     fill_in 'Name', :with=>'Album1'
@@ -482,26 +482,26 @@ describe AutoForme do
     click_button 'Show'
     click_link 'Show Associations'
     click_link 'Artist1'
-    page.current_path.should =~ %r{Artist/show/\d+}
+    page.current_path.must_match %r{Artist/show/\d+}
     click_link 'Show Associations'
     click_link 'Album1'
-    page.current_path.should =~ %r{Album/show/\d+}
+    page.current_path.must_match %r{Album/show/\d+}
     click_link 'Show Associations'
     click_link 'Artist'
-    page.current_path.should == '/Artist/browse'
+    page.current_path.must_equal '/Artist/browse'
 
     click_link 'Edit', :match=>:first
     select 'Artist1'
     click_button 'Edit'
     click_link 'Show Associations'
     click_link 'Album1'
-    page.current_path.should =~ %r{Album/edit/\d+}
+    page.current_path.must_match %r{Album/edit/\d+}
     click_link 'Show Associations'
     click_link 'Artist1'
-    page.current_path.should =~ %r{Artist/edit/\d+}
+    page.current_path.must_match %r{Artist/edit/\d+}
     click_link 'Show Associations'
     click_link 'Albums'
-    page.current_path.should == '/Album/browse'
+    page.current_path.must_equal '/Album/browse'
   end
 end
 
@@ -545,17 +545,17 @@ describe AutoForme do
     click_link 'Show'
     select 'Album1'
     click_button 'Show'
-    page.html.should =~ /Name.+Album1b/m
-    page.html.should =~ /Artist.+Artist2/m
+    page.html.must_match /Name.+Album1b/m
+    page.html.must_match /Artist.+Artist2/m
 
     click_link 'Search'
     fill_in 'Name', :with=>'1b'
     select 'Artist2'
     click_button 'Search'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "Artist2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "Artist2", "Show", "Edit", "Delete"]
   end
 
   it "should have basic many to one associations working" do
@@ -589,17 +589,17 @@ describe AutoForme do
     click_link 'Show'
     select 'Album1'
     click_button 'Show'
-    page.html.should =~ /Name.+Album1b/m
-    page.html.should =~ /Artist.+Artist2/m
+    page.html.must_match /Name.+Album1b/m
+    page.html.must_match /Artist.+Artist2/m
 
     click_link 'Search'
     fill_in 'Name', :with=>'1b'
     select 'Artist2'
     click_button 'Search'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "Artist2", "Show", "Edit", "Delete"]
 
     click_link 'Album'
-    page.all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+    page.all('td').map{|s| s.text}.must_equal ["Album1b", "Artist2", "Show", "Edit", "Delete"]
   end
 end
 
@@ -624,9 +624,9 @@ describe AutoForme do
 
     %w'A1 E1 L1 N1'.each{|n| Artist.create(:name=>n)}
     visit("/Album/new")
-    page.all('select option').map{|s| s.text}.should == ["", "A1", "E1", "L1"]
+    page.all('select option').map{|s| s.text}.must_equal ["", "A1", "E1", "L1"]
 
     visit("/Album/edit/#{Album.create(:name=>'Album1').id}")
-    page.all('select option').map{|s| s.text}.should == ["", "L1", "E1"]
+    page.all('select option').map{|s| s.text}.must_equal ["", "L1", "E1"]
   end
 end