hobbit-contrib 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 802654dd916d3a7a81d580faf85e0d5c1bf9eeb1
-  data.tar.gz: 769fec8b8f0a05d54ddb9e94481485642daa3186
+  metadata.gz: 185258fc6ea56da609487b2888247abdd6cde2cb
+  data.tar.gz: 23dffe0b7043f1ebd7fe4683100cd50a119e30dd
 SHA512:
-  metadata.gz: da0ff48b1b5d7f9682e149c6e056426f01c43ee03a2dbbb39417a7278778628e5a82c7b6b98a46050234a25c051fb2fefa2e2031526dbb3865cbfec8985cfdd9
-  data.tar.gz: f75f472b13d2b8bd52bcb1ccaf1650311a6fea541b97aff553ce001e8668c71e611e42016ecb926abf04ec0c169536a3ead2a4db2c4bd6b58e1d7dccf43e7b4b
+  metadata.gz: ebc8f6211e9c33a16d806060ed02cb03d03ea68403087d8db43701abaef761583db7404150bbe4d0251ae8c9a8a2684268672fb1c20ef5d33981502215ab50e7
+  data.tar.gz: b75286914679c427040fe57f20b51db83ab76c998764ebfd9641af6e5f04897ca18bd39d6066932e71c46620aaa0d2452c67bdf0046225ec2519f7d2f2fed694

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.7.0
+
+* `Hobbit::Filter`: call all matching filters instead of calling the first
+matching filter.
+
 # 0.6.0
 
 * Make it work with `hobbit` 0.6.0

data/lib/hobbit/contrib/version.rb

@@ -1,5 +1,5 @@
 module Hobbit
   module Contrib
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/hobbit/filter.rb

@@ -54,26 +54,20 @@ module Hobbit
     private
 
     def filter(kind)
-      filter = find_filter(kind)
-      if filter
-        instance_eval(&filter[:block])
-        response.finish if kind == :after
-      end
-    end
-
-    def find_filter(kind)
-      filter = self.class.filters[kind].detect do |f|
-        f[:compiled_path] =~ request.path_info || f[:compiled_path] =~ ''
-      end
-
-      if filter
-        $~.captures.each_with_index do |value, index|
-          param = filter[:extra_params][index]
-          request.params[param] = value
+      find_filters(kind).each do |filter|
+        if filter[:compiled_path] =~ request.path_info
+          $~.captures.each_with_index do |value, index|
+            param = filter[:extra_params][index]
+            request.params[param] = value
+          end
         end
+        instance_eval &filter[:block]
       end
+      response.finish if kind == :after
+    end
 
-      filter
+    def find_filters(kind)
+      self.class.filters[kind].select { |f| f[:compiled_path] =~ request.path_info || f[:compiled_path] =~ '' }
     end
   end
 end

data/test/filter_test.rb

@@ -21,31 +21,28 @@ scope Hobbit::Filter do
     end
 
     %w(after before).each do |kind|
-      str = <<EOS
-    scope '::#{kind}' do
-      test do
-        p = Proc.new { 'do something' }
-        app = mock_app do
-          include Hobbit::Filter
-          #{kind}('', &p)
+      scope "::#{kind}" do
+        test do
+          p = Proc.new { 'do something' }
+          app = mock_app do
+            include Hobbit::Filter
+            send kind, &p
+          end
+
+          assert app.to_app.class.filters[:"#{kind}"].size == 1
+          assert app.to_app.class.filters[:"#{kind}"].first[:block].call == p.call
         end
-
-        assert app.to_app.class.filters[:#{kind}].size == 1
-        assert app.to_app.class.filters[:#{kind}].first[:block].call == p.call
       end
-    end
 
-    scope 'when a filter matches' do
-      test "calls the filters' block" do
-        get '/'
-        assert last_response.ok?
-        assert last_request.env.include? 'hobbit.#{kind}'
-        assert last_request.env['hobbit.#{kind}'] == 'this is #{kind}'
+      scope 'when a filter matches' do
+        test "calls the filters' block" do
+          get '/'
+          assert last_response.ok?
+          assert last_request.env.include? "hobbit.#{kind}"
+          assert last_request.env["hobbit.#{kind}"] == "this is #{kind}"
+        end
       end
     end
-EOS
-      instance_eval str
-    end
 
     scope '::filters' do
       test 'returns a Hash' do
@@ -142,32 +139,32 @@ EOS
         include Hobbit::Filter
 
         before do
-          env['hobbit.before'] = 'this will match'
+          env['hobbit.before'] = ['this will match']
         end
 
         before '/' do
-          env['hobbit.before'] = 'this wont match'
+          env['hobbit.before'] << 'this will match too'
         end
 
         after do
-          env['hobbit.after'] = 'this will match'
+          env['hobbit.after'] = ['this will match']
         end
 
         after '/' do
-          env['hobbit.after'] = 'this wont match'
+          env['hobbit.after'] << 'this will match too'
         end
 
         get('/') { 'GET /' }
       end
     end
 
-    test 'calls the first that matches' do
+    test 'calls all matching filters' do
       get '/'
       assert last_response.ok?
       assert last_request.env.include? 'hobbit.before'
-      assert last_request.env['hobbit.before'] == 'this will match'
+      assert_equal ['this will match', 'this will match too'], last_request.env['hobbit.before']
       assert last_request.env.include? 'hobbit.after'
-      assert last_request.env['hobbit.after'] == 'this will match'
+      assert_equal ['this will match', 'this will match too'], last_request.env['hobbit.after']
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit-contrib
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler