Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/extensions/couchrest.rb b/lib/extensions/couchrest.rb
index cc041e0..4578926 100644
--- a/lib/extensions/couchrest.rb
+++ b/lib/extensions/couchrest.rb
@@ -69,7 +69,7 @@ module CouchRest
 
         def prepare_directory(dir = '')
           dir = Rails.root + 'tmp' + 'designs' + dir
-          Dir.mkdir(dir) unless Dir.exists?(dir)
+          Dir.mkdir(dir) unless Dir.exist?(dir)
           return dir
         end
 
@@ -81,7 +81,7 @@ module CouchRest
   class ModelRailtie
     config.action_dispatch.rescue_responses.merge!(
       'CouchRest::Model::DocumentNotFound' => :not_found,
-      'RestClient::ResourceNotFound' => :not_found
+      'CouchRest::NotFound' => :not_found
     )
   end
 end