ismasan-sluggable_finder 2.0.2 → 2.0.3

data/README.markdown

@@ -63,6 +63,18 @@ The idea is that you keep your controller actions clean and handle Not Found err
 		end  
 	end
 
+### Merb and custom NotFound exception
+
+In merb it would be nice to raise a NotFound exception instead of ActiveRecord's RecordNotFoundm so we don't need to clutter our controller with exception-handling code and we let the framework handle them.
+
+   	SluggableFinder.not_found_exception = Merb::ControllerExceptions::NotFound
+
+You can configure this to raise any exception you want.
+
+    class CustomException < StandardError; end
+
+    SluggableFinder.not_found_exception = CustomException
+
 ### Links
 
 Link generation remains the same, because the plugin overwrites your model's to_param method

data/lib/sluggable_finder/finder.rb

@@ -7,7 +7,7 @@ module SluggableFinder
       if (args.first.is_a?(String) and !(args.first =~ /\A\d+\Z/))#only contain digits
           options = {:conditions => ["#{ sluggable_finder_options[:to]} = ?", args.first]}
           first(options) or 
-            raise ActiveRecord::RecordNotFound.new("There is no #{sluggable_finder_options[:sluggable_type]} with #{sluggable_finder_options[:to]} '#{args.first}'")
+            raise SluggableFinder.not_found_exception.new("There is no #{sluggable_finder_options[:sluggable_type]} with #{sluggable_finder_options[:to]} '#{args.first}'")
       else
         find_without_slug(*args)
       end

data/lib/sluggable_finder.rb

@@ -2,7 +2,17 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module SluggableFinder
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
+  
+  @@not_found_exception = nil
+  
+  def self.not_found_exception=(ex)
+    @@not_found_exception = ex
+  end
+  
+  def self.not_found_exception
+    @@not_found_exception || ActiveRecord::RecordNotFound
+  end
   
   class << self
     

data/spec/sluggable_finder_spec.rb

@@ -98,6 +98,23 @@ describe SimpleItem, 'encoding permalinks' do
   end
 end
 
+# Raising custom not found exceptions allows us to use this with merb's NotFound exception
+# or any framework
+describe "with custom exception" do
+  it "should raise custom exception if configured that way" do
+    class CustomException < StandardError;end
+    
+    SluggableFinder.not_found_exception = CustomException
+    lambda {
+      SimpleItem.find 'non-existing-slug'
+    }.should raise_error(CustomException)
+  end
+  
+  after(:all) do
+    SluggableFinder.not_found_exception = ActiveRecord::RecordNotFound
+  end
+end
+
 describe SimpleItem, "with non-english characters" do
   before(:each) do
     @item = SimpleItem.create!(:title => "Un ñandú super ñoño I've seen")

data/tasks/db.rake

@@ -1,10 +1,15 @@
-ActiveRecord::Base.establish_connection(
+db = {
   :adapter=>'sqlite3',
   :dbfile=> File.join(File.dirname(__FILE__),'..','spec','db','test.db')
-)
+}
+ActiveRecord::Base.establish_connection( db )
 # define a migration
 class TestSchema < ActiveRecord::Migration
   def self.up
+    create_table :categories do |t|
+      t.string :name
+      t.timestamps
+    end
     create_table :items do |t|
       t.string :title
       t.string :slug
@@ -23,8 +28,10 @@ end
 
 namespace :db do
   desc "Create test schema"
-  task :create => :destroy do
+  task :create do
     # run the migration
+    File.unlink(db[:dbfile]) if File.exists?(db[:dbfile])
+    ActiveRecord::Base.connection
     TestSchema.migrate(:up)
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ismasan-sluggable_finder
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Ismael Celis