db/test.sqlite @@ -121,7 +121,7 @@ of SEO-friendly URLs and DRY controller code. == Tests -To run the tests, you must have the mocha and test-spec gems installed. +To run the tests, you must have the mocha, test-spec, and sqlite3 gems installed. rake test README @@ -20,4 +20,5 @@ Gem::Specification.new do |s| s.rdoc_options = ["--main", "README"] s.extra_rdoc_files = ["README"] s.add_dependency("actionpack", ["> 2.0.1"]) + s.add_dependency("sqlite3-ruby", ["> 1.2.1"]) end \ No newline at end of file finder_filter.gemspec @@ -33,6 +33,11 @@ module FinderFilter item = by ? klass.send("find_by_#{by}", params[param]) : klass.find(params[param]) end end + if item.nil? + flash[:error] = "The requested #{name} does not exist." + index_path = nested ? send("#{nested}_path", nested_item) : send("#{name.to_s.pluralize}_path") + redirect_to index_path + end instance_variable_set("@#{name}", item) end end lib/finder_filter.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper') -class BooksController < ActionController::Base; extend FinderFilter; def show; end; end +class BooksController < ActionController::Base; extend FinderFilter; end class Book < ActiveRecord::Base; end class Novel < ActiveRecord::Base; end class Tome < ActiveRecord::Base; def param_column; "foo"; end; end @@ -8,6 +8,12 @@ class Tome < ActiveRecord::Base; def param_column; "foo"; end; end describe FinderFilter do before do @books_controller = BooksController.new + @books_controller.stubs(:flash).returns({}) + @books_controller.stubs(:index_path) + @books_controller.stubs(:books_path) + @books_controller.stubs(:novels_path) + @books_controller.stubs(:tomes_path) + @books_controller.stubs(:redirect_to) end it "should call find on the model" do @@ -37,5 +43,4 @@ describe FinderFilter do Tome.expects(:from_param).with(7) @books_controller.find_tome end - end test/finder_filter_finding_test.rb @@ -3,5 +3,12 @@ require 'test/spec' require 'mocha' require 'action_controller' require 'active_record' +require 'sqlite3' -require File.expand_path(File.dirname(__FILE__) + '/../lib/finder_filter') \ No newline at end of file +require File.expand_path(File.dirname(__FILE__) + '/../lib/finder_filter') + +# connect to the database (sqlite in this case) +ActiveRecord::Base.establish_connection({ + :adapter => 'sqlite3', + :dbfile => File.expand_path(File.dirname(__FILE__) + '/../db/test.sqlite') +}) test/test_helper.rb b63df2d883be961d13d364ad8d49c7b8ed60ecbd Matthew Bass matt@anacreon.local http://github.com/pelargir/finder_filter/commit/97551021cd85be72f109e3d0aba6a0ffba05665c 97551021cd85be72f109e3d0aba6a0ffba05665c 2008-10-30T13:13:20-07:00 2008-10-30T13:13:20-07:00 fixed tests and added sqlite3 dependency e4b600d328bbb72c684d92a0d088195843530ba0 Matthew Bass matt@anacreon.local