hobbit-contrib 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 180341ee21296f6323f8956a60fed82f0d910c2a
-  data.tar.gz: 2bb527f0d3aefb60dd4ef4fbbd0a1ba80ac277da
+  metadata.gz: 5d5577a3a973a53f5d608319d42f2f7bbe764277
+  data.tar.gz: 3571ca057d566d5c618bca565cb11a255fe0bba8
 SHA512:
-  metadata.gz: 0339d6abdfe5e0fb02286798bd048e1ce42d64945ebd7221091223345371a69585e676a7d7d131d1f82a681a681654b565a828b087a66c6f74d1f0d5f0993043
-  data.tar.gz: e3dcedd00cac9be0677021242524b7657671638f3f2d38faba2148512a6a71974e5c8cebfbe46fe03fd8845494371552b1d285d63b88ecca6698fc0d2a4b4cfb
+  metadata.gz: 9d2c7435085e2359a06036dc9953382644398f59b865ed5a667f55081853873aca86609a16053655a2fb70c029109e0d339720f5278fe973dd623f3e7cdbd58d
+  data.tar.gz: fa1a182827742a465144c88e9c2e0a0bf8c64481ac8c49e9255452f63f2f2ffd5c9d150c6e3d648929ea7fa7951b813c014e88243e149aa26176858703179889

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.0
+
+* Fix `Hobbit::Filter`. Now it works with `halt`, introduced in `hobbit` 0.4.0.
+
 # 0.3.0
 
 * Fix `hobbit-contrib.gemspec`: add `erubis` and remove redundant dependencies.

data/lib/hobbit/contrib/version.rb

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

data/lib/hobbit/error_handling.rb

@@ -13,7 +13,7 @@ module Hobbit
     def _call(env)
       super
     rescue *self.class.errors.keys => e
-      rescued = self.class.errors.keys.detect { |k| e.kind_of?(k)}
+      rescued = self.class.errors.keys.detect { |k| e.kind_of?(k) }
 
       body = instance_eval { self.class.errors[rescued].call(e) }
       response.body = [body]

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
@@ -29,14 +29,21 @@ module Hobbit
       @env = env
       @request = Rack::Request.new(@env)
       @response = Hobbit::Response.new
-      filter :before
-      unless @response.status == 302
-        super
-        filter :after
+      catch :halt do
+        filter :before
+        unless @response.status == 302
+          super
+          filter :after unless @halted
+        end
       end
       @response.finish
     end
 
+    def halt(status, headers: {}, body: [])
+      @halted = true
+      super
+    end
+
     def self.included(othermod)
       othermod.extend ClassMethods
     end
@@ -44,14 +51,25 @@ module Hobbit
     private
 
     def filter(kind)
-      filter = self.class.filters[kind].detect { |f| f[:compiled_path] =~ request.path_info || f[:path] =~ // }
+      filter = find_filter(kind)
+      if filter
+        instance_eval(&filter[:block])
+      end
+    end
+
+    def find_filter(kind)
+      filter = self.class.filters[kind].detect do |f|
+        f[:compiled_path] =~ request.path_info
+      end
+
       if filter
         $~.captures.each_with_index do |value, index|
           param = filter[:extra_params][index]
           request.params[param] = value
         end
-        instance_eval(&filter[:block])
       end
+
+      filter
     end
   end
 end

data/spec/filter_spec.rb

@@ -170,4 +170,75 @@ EOS
       last_response.body.must_match /goodbye world/
     end
   end
+
+  describe 'when halting in a before filter' do
+    let :app do
+      mock_app do
+        include Hobbit::Filter
+
+        before do
+          halt 401
+        end
+
+        get '/' do
+          'hello world'
+        end
+      end
+    end
+
+    it 'wont execute the route' do
+      get '/'
+      last_response.status.must_equal 401
+      last_response.body.must_be :empty?
+    end
+  end
+
+  describe 'when halting in a route' do
+    let :app do
+      mock_app do
+        include Hobbit::Filter
+
+        before do
+          response.headers['Content-Type'] = 'text/plain'
+        end
+
+        after do
+          response.headers['Content-Type'] = 'application/json'
+        end
+
+        get '/' do
+          halt 401, body: 'Unauthenticated'
+        end
+      end
+    end
+
+    it 'wont execute the after filter' do
+      get '/'
+      last_response.status.must_equal 401
+      last_response.headers.wont_include 'Content-Type'
+      last_response.body.must_equal 'Unauthenticated'
+    end
+  end
+
+  describe 'when halting in an after filter' do
+    let :app do
+      mock_app do
+        include Hobbit::Filter
+
+        after do
+          halt 401
+        end
+
+        get '/' do
+          'hello world'
+        end
+      end
+    end
+
+    it 'wont execute the route' do
+      get '/'
+      last_response.status.must_equal 401
+      last_response.body.must_be :empty?
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit-contrib
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-01-11 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.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Contributed Hobbit extensions