rescue-dog 0.0.3 → 0.1.0

data/README.md

@@ -1,6 +1,6 @@
 # Rescue Dog
 
-respond to an exception raised in Rails
+The Rescue-Dog responds HTTP status (the code and message) when raise the exception.
 
 ## Installation
 
@@ -18,27 +18,42 @@ Or install it yourself as:
 
 ## Usage
 
+1. Include `Rescue::Controller::Static` or `Rescue::Controller::Dynamic`.
+2. Call `rescue_associate` method. And then, the exception class is defined and added to `rescue_handlers`.
+3. Raise the exception or Call `response_status` method.
+
 ### Render Static Files
+Render /public/400(.:format) if you raise BadRequest exception.
+
     $ vim app/controllers/application_controller.rb
     class ApplicationController
    
       include Rescue::Controller::Static
-      define_errors ServerError: 500, NotFound: 404
+      rescue_associate :BadRequest   ,with: 400
+      rescue_associate :Unauthorized ,with: 401
+      rescue_associate :NotFound     ,with: 404
+      rescue_associate :ServerError  ,with: 500
 
 ### Render Template
+Render app/views/errors/404(.:format) if you raise NotFound exception.
+
     $ vim app/controllers/application_controller.rb
     class ApplicationController
    
       include Rescue::Controller::Dynamic
-      define_errors ServerError: 500, NotFound: 404
+      rescue_associate :BadRequest   ,with: 400
+      rescue_associate :Unauthorized ,with: 401
+      rescue_associate :NotFound     ,with: 404
+      rescue_associate :ServerError  ,with: 500
 
 ### Associated with the exceptions 
-Call the response method when raise an exception
+Call the response method when raise an exception.
 
 #### for ActiveRecord
-    rescue_from ActiveRecord::RecordNotFound, with: lambda {|e| respond_status 404 }
+    rescue_associate ActiveRecord::RecordNotFound ,with: 404
 #### for Mongoid
-    rescue_from Mongoid::Errors::DocumentNotFound, BSON::InvalidObjectId, with: lambda {|e| respond_status 404 }
+    rescue_associate Mongoid::Errors::DocumentNotFound, BSON::InvalidObjectId, with: 404
+
 
 ## Contributing
 

data/deploy_gem.sh

@@ -26,6 +26,6 @@ mv ${PKG_FILE} ./pkg
 echo "[RUN] gem push pkg/${PKG_FILE}"
 gem push pkg/${PKG_FILE}
 
-echo "[RUN] git tag -a version-${$1}"
-git tag -a version-$1
+echo "[RUN] git tag -a version-$1"
+git tag -a version-$1 -m ""
 git push --tags

data/lib/rescue/controller/dynamic.rb

@@ -3,21 +3,15 @@
 module Rescue
   module Controller
     module Dynamic
-      def self.included(base)
-        base.extend ClassMethods
-        base.extend Rescue::Controller::ClassMethods
-      end
 
-      module ClassMethods
-   
-        def define_respond_method name
-          return if method_defined?(name)
-          define_method name do |code, exception = nil|
+      def self.included(base)
+        base.class_eval do
+          define_method Rescue::Bind.respond_name do |code, exception = nil|
             e = {}
             e[:code]    = code
             e[:status]  = Rack::Utils::HTTP_STATUS_CODES[code]
             e[:message] = exception.message if exception
-
+  
             respond_to do |format|
               format.html { render status: code, template: "/errors/#{code}" }
               format.json { render status: code, json: { errors: [e] } }
@@ -25,8 +19,9 @@ module Rescue
             end
           end
         end
-
+        base.extend Rescue::Controller::ClassMethods
       end
+
     end
   end
 end

data/lib/rescue/controller/static.rb

@@ -3,21 +3,16 @@
 module Rescue
   module Controller
     module Static
+
       def self.included(base)
-        base.extend ClassMethods
-        base.extend Rescue::Controller::ClassMethods
-      end
-  
-      module ClassMethods
-  
-        def define_respond_method name
-          return if method_defined?(name)
-          define_method name do |code, exception = nil|
+        base.class_eval do
+          define_method Rescue::Bind.respond_name do |code, exception = nil|
             render status: code, file: "#{Rails.root}/public/#{code}", layout: false and return
           end
         end
-
+        base.extend Rescue::Controller::ClassMethods
       end
+  
     end
   end
 end

data/lib/rescue/controller.rb

@@ -7,16 +7,34 @@ module Rescue
 
     module ClassMethods
 
-      def define_errors statuses, superclass = StandardError
-        respond = :respond_status
-        define_respond_method respond
+      def rescue_associate *klasses, &block
+        options = klasses.extract_options!
 
-        statuses.each do |class_name, code|
-          Rescue::Bind.define_error_class class_name, superclass
-          rescue_from "#{class_name}".constantize, with: lambda {|e| send(respond, code, e) }
+        unless block_given?
+          if options.has_key?(:with)
+            if options[:with].is_a?(Integer)
+              block = lambda {|e| send(Rescue::Bind.respond_name, options[:with], e) }
+            elsif options[:with].is_a?(Proc)
+              block = options[:with]
+            end
+          else
+            raise ArgumentError, "Need a handler. Supply an options hash that has a :with key as the last argument."
+          end
+        end
+
+        klasses.each do |klass|
+          key = if klass.is_a?(Class) && klass <= Exception
+            klass.name
+          elsif klass.is_a?(String) || klass.is_a?(Symbol)
+            Rescue::Bind.define_error_class klass, StandardError
+            klass
+          else
+            raise ArgumentError, "#{klass} is neither an Exception nor a String"
+          end
+          self.rescue_handlers += [[key, block]]
         end
       end
-    end
 
+    end
   end
 end

data/lib/rescue/version.rb

@@ -1,3 +1,3 @@
 module Rescue
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/rescue-dog.rb

@@ -5,10 +5,16 @@ module Rescue
 
   class Bind
     class << self
+
+      def respond_name
+        :respond_status
+      end
+
       def define_error_class class_name, superclass = nil
         return if Object.const_defined?(class_name)
         Object.const_set(class_name, Class.new(superclass||StandardError))
       end
+
     end
   end
 end

data/spec/rails_spec_app.rb

@@ -31,7 +31,10 @@ class ApplicationController < ActionController::Base ; end
 
 class StaticController < ApplicationController
   include Rescue::Controller::Static
-  define_errors BadRequest: 400, Unauthorized: 401, NotFound: 404, ServerError: 500
+  rescue_associate :BadRequest   ,with: 400
+  rescue_associate :Unauthorized ,with: 401
+  rescue_associate :NotFound     ,with: 404
+  rescue_associate :ServerError  ,with: 500
 
   STATUSES.each do |name, code|
     class_name = "#{name}".classify
@@ -43,7 +46,10 @@ end
 
 class DynamicController < ApplicationController
   include Rescue::Controller::Dynamic
-  define_errors BadRequest: 400, Unauthorized: 401, NotFound: 404, ServerError: 500
+  rescue_associate :BadRequest   ,with: 400
+  rescue_associate :Unauthorized ,with: 401
+  rescue_associate :NotFound     ,with: 404
+  rescue_associate :ServerError  ,with: 500
 
   STATUSES.each do |name, code|
     class_name = "#{name}".classify

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rescue-dog
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails