hobbit-contrib 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba27dac2bea807bb25e736cc7c7434195f88d923
-  data.tar.gz: 9c04e21b41ebea5084eccb794d0a76c2f986e8bd
+  metadata.gz: 29d73317a40a33d6fcf69c6ad49150fa70ef72b3
+  data.tar.gz: 8bf31d0dada2d170f0402aef0552d5beb53f906a
 SHA512:
-  metadata.gz: 250a1cc17556504c69ad5e0d43a751ae5a431bce48819d82bacccb2f5c5047fd3928f18c291c0e3c9f1ae9b753cf041f23e7737daa41d77c83a346ead1f98332
-  data.tar.gz: b50979f85f54764f2422419273407a46fec4f0ce9973a61ad4534e349f6c31ec407f1b11b6809042c8d062ed3a6260a052e66738f8cb7c07feb63879f6003547
+  metadata.gz: 1a0cca20cec9f5c7afb3050e76848ffb70d558a763a8715b6cc3039582c6c79dba10b5240fb24e206743b7b3a54f32927b39cd3a493124678fc9d317deb8fbc3
+  data.tar.gz: 498a8dbd9edca5dd63f45ac8b3e0111f71966af2f26b83ef2844da0430e347e82e402d6067862ba8dfbd0dfb3f42caa7ecf6ba454fd33069a7f2b51b3373667a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.5.0
+
+* Refactor `Hobbit::ErrorHandling` according to the recent changes on
+`Hobbit::Response`.
+* Fix tests.
+* Fix `Hobbit::Filter`. It wasn't filtering actions if an empty before (or
+after) filter was defined.
+
 # 0.4.2
 
 * Make `environment`, `development?`, `production?` and `test?` available

data/lib/hobbit/contrib/version.rb

@@ -1,5 +1,5 @@
 module Hobbit
   module Contrib
-    VERSION = '0.4.2'
+    VERSION = '0.5.0'
   end
 end

data/lib/hobbit/error_handling.rb

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

data/lib/hobbit/filter.rb

@@ -2,7 +2,7 @@ module Hobbit
   module Filter
     module ClassMethods
       %w(after before).each do |kind|
-        define_method(kind) { |path = '/', &block| filters[kind.to_sym] << compile_filter(path, &block) }
+        define_method(kind) { |path = '', &block| filters[kind.to_sym] << compile_filter(path, &block) }
       end
 
       def filters
@@ -39,7 +39,7 @@ module Hobbit
       @response.finish
     end
 
-    def halt(status, headers: {}, body: [])
+    def halt(*res)
       @halted = true
       super
     end
@@ -59,7 +59,7 @@ module Hobbit
 
     def find_filter(kind)
       filter = self.class.filters[kind].detect do |f|
-        f[:compiled_path] =~ request.path_info
+        f[:compiled_path] =~ request.path_info || f[:compiled_path] =~ ''
       end
 
       if filter

data/spec/error_handling_and_filter_spec.rb

@@ -91,7 +91,7 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
         end
 
         get '/' do
-          'this wont be the body'
+          'this is written in the body. '
         end
       end
     end
@@ -99,7 +99,7 @@ describe 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
     it 'must call the before filter' do
       get '/'
       last_response.must_be :ok?
-      last_response.body.must_equal 'Sorry'
+      last_response.body.must_equal 'this is written in the body. Sorry'
       last_request.env.must_include 'hobbit.before'
     end
   end

data/spec/error_handling_spec.rb

@@ -31,28 +31,28 @@ describe Hobbit::ErrorHandling do
       end
 
       get '/raises' do
-        'not this'
         raise StandardError, 'StandardError'
+        'not this'
       end
 
       get '/other_raises' do
-        response.write 'not this'
         raise NotFoundException
+        response.write 'not this'
       end
 
       get '/same_other_raises' do
-        response.write 'not this'
         raise SpecificNotFoundException
+        response.write 'not this'
       end
 
       get '/uncaught_raise' do
-        response.write 'not this'
         raise UnknownException
+        response.write 'not this'
       end
 
       get '/must_use_response' do
-        response.write 'not this'
         raise MustUseResponseException
+        response.write 'not this'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit-contrib
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler