sinatra_simple_router 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzdlNDVmMGY3OGYzYTU5NjZjYTk1YWFhZTFhZTYxNmYzNzY5NjY4OQ==
+    MzJlMzc1NjVhODRmODZmMDFiNTdjZGVkNDVjNzQxYzE2NDVkMGQyYg==
   data.tar.gz: !binary |-
-    YWU2ODZiZTZjZTZmMzIxOTBmNjIyZjU4MzIwZGJmZDBlN2Q0MzAzZA==
+    N2YwMDZkZGQxOTRmNTNlNDM5YmVhYzY2ZmQ0MTA4YWExMmI0MTQ2Ng==
 SHA512:
   metadata.gz: !binary |-
-    MDgxOTdhZmY3NDkzOTVjMTFiMjVmMzE1MmY0NzU2YjEzZDkwODQzZTY1Zjlk
-    ZTM5NzU4YjhmNGQ1NGY5Y2YyMDNjNjQ1ZGMzYmI5NDY3OTdkMDBmOGUzMDBl
-    ZGFhZGRlMDNjYmY2NzgyM2Q4MGY2NzBmZDA5Yjc1ZmVkNGJlMDQ=
+    OTZjOWE5NDU4NDUyNjlkZmUyYzAyOGI5MjhiOTQwYjVlODZhNzU5OWNiZDg1
+    ZjQwOWZhOTJhYTE0MmZmMjcyZDFiZDgzNzA2NDkzYTJhNzcyOTczZTMxMmQw
+    M2ZmMWIwOGIyZmZjY2M5NTJkZGJjNjFhZDQ3YjkwNDNhMGZiMTA=
   data.tar.gz: !binary |-
-    ODZkMTRhYzhlMjJkOTc0ZjAxMTVjM2I1ZjFlMzI2MTZkMGE1MDdjM2Y3Y2M4
-    MGI5Njk1OWFlMDMwNTEzMTQyYWMwN2RmNTk3OGMwNmQ4MjZjNjBlZmE3YjY4
-    OGQzZTQwZTFhYjc3OGQ5NzFlOTNkM2QzNmM5NDc3Yjg1YjFhNjg=
+    OWNjZDUxMzkyMWM1MGIxN2QzZTdiZTYwNjMzMDk1OTY5MDc5Mzg3NzY4M2Ew
+    MDQ5YTg5OGI0NWZhZTE1MmM2YzZhZjA3NWQ4MWJjZjZjZWRiOGFhZGFmYWRh
+    Y2FjYjc4ZTU4ZjFmZDFiY2FhZTE2OGFmMzljYmQ4YzkxYTE0MjY=

data/README.md

@@ -94,6 +94,28 @@ class Application < Sinatra::Base
 end
 ```
 
+### Rescue exceptions raised in controllers
+
+```ruby
+class ItemsController < SinatraSimpleRouter::Controller
+  def create
+    @item = Item.new(params[:item])
+    @item.save!
+    render json: @item
+  end
+end
+
+class Application < Sinatra::Base
+  include SinatraSimpleRouter
+
+  rescue_exception MongoMapper::DocumentNotValid do |exception, controller|
+    controller.render json: {error: exception.document.errors}, status: 400
+  end
+
+  match :post, "/items.json", ItemsController, :create
+end
+```
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -13,14 +13,16 @@ task :install => :build do
 end
 
 task :release => :build do
-  system "git tag -a v#{SinatraSimpleRouter::VERSION} -m 'Tagging #{SinatraSimpleRouter::VERSION}'"
-  system "git push --tags"
-  system "gem push sinatra_simple_router-#{SinatraSimpleRouter::VERSION}.gem"
-  system "rm *.gem"
+  cmds = []
+  cmds << "git tag -a v#{SinatraSimpleRouter::VERSION} -m 'Tagging #{SinatraSimpleRouter::VERSION}'"
+  cmds << "git push --tags"
+  cmds << "gem push sinatra_simple_router-#{SinatraSimpleRouter::VERSION}.gem"
+  cmds << "rm *.gem"
+  system cmds.join(' && ')
 end
 
 RSpec::Core::RakeTask.new("spec") do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-task :default => :spec
+task :default => :spec

data/lib/sinatra_simple_router.rb

@@ -11,14 +11,36 @@ module SinatraSimpleRouter
   end
 
   module ClassMethods
+    @@rescued_exceptions = {}
+
+    def rescue_exception(exception, &block)
+      exception_name = exception.name
+
+      if @@rescued_exceptions[exception_name]
+        @@rescued_exceptions[exception_name] << block
+      else
+        @@rescued_exceptions[exception_name] = [block]
+      end
+    end
+
     def match(method, path, klass, action)
       if @version
         path = "/#{@version}#{path}"
       end
 
-      puts "Registering: #{path}"
       send(method, path) do
-        klass.new(self).send(action)
+        begin
+          klass.new(self).send(action)
+        rescue => e
+          handlers = Array(@@rescued_exceptions[e.class.name])
+          if handlers.any?
+            handlers.map do |handler|
+              handler.call(e, klass.new(self))
+            end
+          else
+            raise e
+          end
+        end
       end
     end
 

data/lib/sinatra_simple_router/version.rb

@@ -1,3 +1,3 @@
 module SinatraSimpleRouter
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/sinatra_simple_router_spec.rb

@@ -32,5 +32,15 @@ module SinatraSimpleRouter
         expect(response.body).to eq("subscribe")
       end
     end
+
+    describe ".rescue_exception" do
+      it "calls the callback block" do
+        RescuedApplication.stub(:handle_exception)
+        request = Rack::MockRequest.new(RescuedApplication)
+        request.post("/subscribe")
+        arguments = [kind_of(ArgumentError), kind_of(SinatraSimpleRouter::UsersController)]
+        expect(RescuedApplication).to have_received(:handle_exception).with(*arguments)
+      end
+    end
   end
-end
+end

data/spec/spec_helper.rb

@@ -16,6 +16,14 @@ module SinatraSimpleRouter
     def subscribe
       "subscribe"
     end
+
+    def raise_argument_error
+      raise ArgumentError.new
+    end
+
+    def raise_runtime_error
+      raise RuntimeError.new
+    end
   end
 
   class ItemsController < Controller
@@ -34,6 +42,19 @@ module SinatraSimpleRouter
     end
   end
 
+  class RescuedApplication < Sinatra::Base
+    include SinatraSimpleRouter
+
+    def handle_exception(e, c)
+    end
+
+    rescue_exception ArgumentError do |exception, controller|
+      handle_exception(exception, controller)
+    end
+
+    match(:post, "/subscribe", UsersController, :raise_argument_error)
+  end
+
   class HasAncestor < Sinatra::Base
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra_simple_router
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - elvio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler