hobbit-contrib 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d5577a3a973a53f5d608319d42f2f7bbe764277
-  data.tar.gz: 3571ca057d566d5c618bca565cb11a255fe0bba8
+  metadata.gz: 2087ac52abe5bb2c5c4569bcf8283c11ab8bf211
+  data.tar.gz: 1544e7a1465e520b9cd9390e922a02ea93e33348
 SHA512:
-  metadata.gz: 9d2c7435085e2359a06036dc9953382644398f59b865ed5a667f55081853873aca86609a16053655a2fb70c029109e0d339720f5278fe973dd623f3e7cdbd58d
-  data.tar.gz: fa1a182827742a465144c88e9c2e0a0bf8c64481ac8c49e9255452f63f2f2ffd5c9d150c6e3d648929ea7fa7951b813c014e88243e149aa26176858703179889
+  metadata.gz: 8f02bf743b5869c1d812ac4ea6063931d7c7165d725e1f9a778738c67689c548a456cd32dbffc955cbe42df2d9c4f5de5ba9f7cb734f07674e90d2e095b60c82
+  data.tar.gz: 4737a3d1692bbc5b180d327142d818ae0383b9cfae21db88bbbb7c5707e43500eb2aeb76f25527cd7433a9995ed5defd0d1bc4c8614a98067447c1b34dfe39e0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.1
+
+* Fix `Hobbit::ErrorHandling`. Now, when an exception is raised, the `error`
+block is executed in the context of the object, not the class.
+* Fix error handling and filter specs.
+
 # 0.4.0
 
 * Fix `Hobbit::Filter`. Now it works with `halt`, introduced in `hobbit` 0.4.0.

data/README.md

@@ -83,7 +83,8 @@ require 'hobbit/contrib'
 class App < Hobbit::Base
   include Hobbit::ErrorHandling
 
-  error Exception do |exception|
+  error Exception
+    exception = env['hobbit.error']
     exception.message
   end
 

data/lib/hobbit/contrib/version.rb

@@ -1,5 +1,5 @@
 module Hobbit
   module Contrib
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/lib/hobbit/error_handling.rb

@@ -15,7 +15,8 @@ module Hobbit
     rescue *self.class.errors.keys => e
       rescued = self.class.errors.keys.detect { |k| e.kind_of?(k) }
 
-      body = instance_eval { self.class.errors[rescued].call(e) }
+      env['hobbit.error'] = e
+      body = instance_eval &self.class.errors[rescued]
       response.body = [body]
       response.finish
     end

data/spec/error_handling_and_filter_spec.rb

@@ -10,8 +10,9 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
         include Hobbit::Filter
         include Hobbit::ErrorHandling
 
-        error Exception do |exc|
-          exc.message
+        error Exception do
+          exception = env['hobbit.error']
+          exception.message
         end
 
         before do
@@ -43,8 +44,9 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
         include Hobbit::Filter
         include Hobbit::ErrorHandling
 
-        error Exception do |exc|
-          exc.message
+        error Exception do
+          exception = env['hobbit.error']
+          exception.message
         end
 
         before do
@@ -75,8 +77,9 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
         include Hobbit::Filter
         include Hobbit::ErrorHandling
 
-        error Exception do |exc|
-          exc.message
+        error Exception do
+          exception = env['hobbit.error']
+          exception.message
         end
 
         before do
@@ -108,8 +111,9 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
           include Hobbit::ErrorHandling
           include Hobbit::Filter
 
-          error Exception do |exc|
-            exc.message
+          error Exception do
+            exception = env['hobbit.error']
+            exception.message
           end
 
           before do

data/spec/error_handling_spec.rb

@@ -7,6 +7,7 @@ describe Hobbit::ErrorHandling do
   class NotFoundException < Exception ; end
   class SpecificNotFoundException < NotFoundException ; end
   class UnknownException < Exception ; end
+  class MustUseResponseException < Exception ; end
 
   let(:app) do
     mock_app do
@@ -16,10 +17,14 @@ describe Hobbit::ErrorHandling do
         'Not Found'
       end
 
-      error StandardError do |exception|
+      error StandardError do
+        exception = env['hobbit.error']
         exception.message
       end
 
+      error MustUseResponseException do
+        response.redirect '/'
+      end
 
       get '/' do
         'hello'
@@ -44,6 +49,11 @@ describe Hobbit::ErrorHandling do
         response.write 'not this'
         raise UnknownException
       end
+
+      get '/must_use_response' do
+        response.write 'not this'
+        raise MustUseResponseException
+      end
     end
   end
 
@@ -76,11 +86,11 @@ describe Hobbit::ErrorHandling do
 
   describe 'when does raise an unknown exception class' do
     it 'must not halt default propagation of the unknown class' do
-      proc {get '/uncaught_raise'}.must_raise(UnknownException)
+      proc { get '/uncaught_raise' }.must_raise UnknownException
     end
   end
 
-  describe 'when raises an known exception class' do
+  describe 'when raises a known exception class' do
     it 'must call the block set in error' do
       get '/raises'
       last_response.must_be :ok?
@@ -115,5 +125,12 @@ describe Hobbit::ErrorHandling do
       last_response.must_be :ok?
       last_response.body.must_equal 'other handler!'
     end
+
+    it 'must use response object' do
+      get '/must_use_response'
+      last_response.must_be :redirection?
+      follow_redirect!
+      last_response.body.must_equal 'hello'
+    end
   end
 end

data/spec/filter_spec.rb

@@ -4,108 +4,110 @@ describe Hobbit::Filter do
   include Hobbit::Contrib::Mock
   include Rack::Test::Methods
 
-  let(:app) do
-    mock_app do
-      include Hobbit::Filter
+  describe 'basic specs' do
+    let(:app) do
+      mock_app do
+        include Hobbit::Filter
 
-      before do
-        env['hobbit.before'] = 'this is before'
-      end
+        before do
+          env['hobbit.before'] = 'this is before'
+        end
 
-      get '/' do
-        'GET /'
-      end
+        get '/' do
+          'GET /'
+        end
 
-      after do
-        env['hobbit.after'] = 'this is after'
+        after do
+          env['hobbit.after'] = 'this is after'
+        end
       end
     end
-  end
 
-  %w(after before).each do |kind|
-    str = <<EOS
-  describe '::#{kind}' do
-    specify do
-      p = Proc.new { 'do something' }
-      app = mock_app do
-        include Hobbit::Filter
-        #{kind}('', &p)
-      end
+    %w(after before).each do |kind|
+      str = <<EOS
+    describe '::#{kind}' do
+      specify do
+        p = Proc.new { 'do something' }
+        app = mock_app do
+          include Hobbit::Filter
+          #{kind}('', &p)
+        end
 
-      app.to_app.class.filters[:#{kind}].size.must_equal 1
-      app.to_app.class.filters[:#{kind}].first[:block].call.must_equal p.call
+        app.to_app.class.filters[:#{kind}].size.must_equal 1
+        app.to_app.class.filters[:#{kind}].first[:block].call.must_equal p.call
+      end
     end
-  end
 
-  describe 'when a filter matches' do
-    it "must call the filters' block" do
-      get '/'
-      last_response.must_be :ok?
-      last_request.env.must_include 'hobbit.#{kind}'
-      last_request.env['hobbit.#{kind}'].must_equal 'this is #{kind}'
+    describe 'when a filter matches' do
+      it "must call the filters' block" do
+        get '/'
+        last_response.must_be :ok?
+        last_request.env.must_include 'hobbit.#{kind}'
+        last_request.env['hobbit.#{kind}'].must_equal 'this is #{kind}'
+      end
     end
-  end
 EOS
-    class_eval str
-  end
+      class_eval str
+    end
 
-  describe '::filters' do
-    it 'must return a Hash' do
-      app.to_app.class.filters.must_be_kind_of Hash
+    describe '::filters' do
+      it 'must return a Hash' do
+        app.to_app.class.filters.must_be_kind_of Hash
+      end
     end
-  end
 
-  describe '::compile_filter' do
-    let(:block) { block = Proc.new { |env| [200, {}, []] } }
+    describe '::compile_filter' do
+      let(:block) { block = Proc.new { |env| [200, {}, []] } }
 
-    it 'must compile /' do
-      path = '/'
-      route = app.to_app.class.send :compile_filter, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/$/.to_s
-    end
+      it 'must compile /' do
+        path = '/'
+        route = app.to_app.class.send :compile_filter, path, &block
+        route[:block].call({}).must_equal block.call({})
+        route[:compiled_path].to_s.must_equal /^\/$/.to_s
+      end
 
-    it 'must compile with .' do
-      path = '/route.json'
-      route = app.to_app.class.send :compile_filter, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/route.json$/.to_s
-    end
+      it 'must compile with .' do
+        path = '/route.json'
+        route = app.to_app.class.send :compile_filter, path, &block
+        route[:block].call({}).must_equal block.call({})
+        route[:compiled_path].to_s.must_equal /^\/route.json$/.to_s
+      end
 
-    it 'must compile with -' do
-      path = '/hello-world'
-      route = app.to_app.class.send :compile_filter, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/hello-world$/.to_s
-    end
+      it 'must compile with -' do
+        path = '/hello-world'
+        route = app.to_app.class.send :compile_filter, path, &block
+        route[:block].call({}).must_equal block.call({})
+        route[:compiled_path].to_s.must_equal /^\/hello-world$/.to_s
+      end
 
-    it 'must compile with params' do
-      path = '/hello/:name'
-      route = app.to_app.class.send :compile_filter, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/hello\/([^\/?#]+)$/.to_s
+      it 'must compile with params' do
+        path = '/hello/:name'
+        route = app.to_app.class.send :compile_filter, path, &block
+        route[:block].call({}).must_equal block.call({})
+        route[:compiled_path].to_s.must_equal /^\/hello\/([^\/?#]+)$/.to_s
 
-      path = '/say/:something/to/:someone'
-      route = app.to_app.class.send :compile_filter, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/say\/([^\/?#]+)\/to\/([^\/?#]+)$/.to_s
-    end
+        path = '/say/:something/to/:someone'
+        route = app.to_app.class.send :compile_filter, path, &block
+        route[:block].call({}).must_equal block.call({})
+        route[:compiled_path].to_s.must_equal /^\/say\/([^\/?#]+)\/to\/([^\/?#]+)$/.to_s
+      end
 
-    it 'must compile with . and params' do
-      path = '/route/:id.json'
-      route = app.to_app.class.send :compile_filter, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/route\/([^\/?#]+).json$/.to_s
+      it 'must compile with . and params' do
+        path = '/route/:id.json'
+        route = app.to_app.class.send :compile_filter, path, &block
+        route[:block].call({}).must_equal block.call({})
+        route[:compiled_path].to_s.must_equal /^\/route\/([^\/?#]+).json$/.to_s
+      end
     end
-  end
 
-  it 'must call before and after filters' do
-    get '/'
-    last_response.must_be :ok?
-    last_request.env.must_include 'hobbit.before'
-    last_request.env['hobbit.before'].must_equal 'this is before'
-    last_request.env.must_include 'hobbit.after'
-    last_request.env['hobbit.after'].must_equal 'this is after'
+    it 'must call before and after filters' do
+      get '/'
+      last_response.must_be :ok?
+      last_request.env.must_include 'hobbit.before'
+      last_request.env['hobbit.before'].must_equal 'this is before'
+      last_request.env.must_include 'hobbit.after'
+      last_request.env['hobbit.after'].must_equal 'this is after'
+    end
   end
 
   describe 'when multiple filters are declared' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit-contrib
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Contributed Hobbit extensions