rocketio 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a06971bd162cb331c81d8c86129fe0ff2ef4c907
-  data.tar.gz: 29cc243861c4edaba45394bb79c696e4369bd776
+  metadata.gz: c0737fe18f7374b3e25a8a4b7d60c138165b5bee
+  data.tar.gz: 8bb85a4305fda13a4e3bcc9cc385c365789d60f6
 SHA512:
-  metadata.gz: 045ea446cf4586b52d7d330dcb317e4682d5ed56778dc58a965d23b2fb986b758043a0d2c08722b2805aed53324e1673d3495ab47760bb27f939cb728b32bf7b
-  data.tar.gz: fdba8b6a904564d30e68cd1a1bc9ec3bf871e567d53fdad4960c6550980e4ba4a4946d42abfe990ab9b0910eb32cb54256b951e736e337802cb3f118370f66b7
+  metadata.gz: be167fe2a49f6063064358e0e6ff723b988a33f4e2f7191d8449a2a282c0a594234f8181b5bda15bcf17970b5dca5b1d3b5a862335d2e4fd94da30e8206f23c5
+  data.tar.gz: 526b21a00e3ee46532c6b502cf81d22fa4d3925c0d1c5ac0d29c67b3f5a6968e9c363e246b3c6cfeed02f0eae7567568e67e1927fc926db3b07f923a0a247029

data/lib/rocketio/controller/filters.rb

@@ -14,6 +14,8 @@ module RocketIO
     #       that's it, if defining `before {}` and `before(:index) {}` filters
     #       `index` method will run `before` filter then `before(:index)`
     #
+    # @note as of version 0.4.4 it is possible to exclude methods using :except option
+    #
     # @example run before any method
     #   before do
     #     # some logic here
@@ -50,30 +52,57 @@ module RocketIO
     #     # both @user and @photo variables available here
     #   end
     #
+    # @example except a single method
+    #   before except: :x do
+    #     ...
+    #   end
+    #
+    # @example except multiple methods
+    #   before except: [:x, :y] do
+    #     ...
+    #   end
+    #
     {
       before: proc {},
       around: proc {|app| app.call},
       after:  proc {}
     }.each_pair do |filter,default_block|
+
       define_methods = :"define_#{filter}_methods"
       var = :"@__#{filter}_filters__"
 
-      define_singleton_method filter do |*methods,&block|
+      define_singleton_method filter do |*methods, except: [], &block|
+
         instance_variable_get(var) || instance_variable_set(var, {})
         methods = [:*] if methods.empty?
+        except = [except.to_sym] unless except.is_a?(Array)
+
         methods.each do |meth|
-          instance_variable_get(var)[meth.to_sym] = block || default_block
+          instance_variable_get(var)[meth.to_sym] = {
+            proc: block || default_block,
+            except: Hash[except.zip(except)].freeze
+          }
         end
+
         __send__(define_methods)
       end
 
       define_singleton_method define_methods do |source = self|
-        filters = (source.instance_variable_get(var) || {}).each_with_object({}) do |(meth,block),o|
-          o[meth] = :"__#{filter}_#{meth}__"
-          api.delete define_method(o[meth], &block)
+        filters = (source.instance_variable_get(var) || {}).each_with_object({}) do |(meth,opts),o|
+
+          filter_meth = "__#{filter}_#{meth}__"
+          api.delete define_method(filter_meth, &opts[:proc])
+
+          o[meth] = filter_meth + '?'
+          api.delete define_method(o[meth]) {|*a|
+            __send__(filter_meth, *a) unless opts[:except][requested_method]
+          }
+
         end
+
         filters.update(allocate.__send__(filter))
         return unless filters.any?
+
         filters.freeze
         api.delete define_method(filter) {filters}
       end
@@ -88,7 +117,7 @@ module RocketIO
       __send__(before[method]) if before[method]
     end
 
-    # passing blocks somehow tends to add some overhead
+    # passing blocks tends to add some overhead
     # so passing the proc as a common argument
     def invoke_around_filter method = requested_method, block
       if around[:*]

data/lib/rocketio/version.rb

@@ -1,3 +1,3 @@
 module RocketIO
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.4.4'.freeze
 end

data/test/filters_test.rb

@@ -191,4 +191,32 @@ spec :Filters do
     get :a
     assert(buffer) == [:*, :a]
   end
+
+  it 'excepts a single method' do
+    calls = []
+    ctrl = mock_controller {
+      before(except: :x) {calls << requested_method}
+      def x; end
+      def y; end
+    }
+    app(ctrl)
+    get :x
+    get :y
+    assert(calls) == [:y]
+  end
+
+  it 'excepts multiple methods' do
+    calls = []
+    ctrl = mock_controller {
+      before(except: [:x, :y]) {calls << requested_method}
+      def x; end
+      def y; end
+      def z; end
+    }
+    app(ctrl)
+    get :x
+    get :y
+    get :z
+    assert(calls) == [:z]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketio
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -203,5 +203,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["rocketio-0.4.3", "Simple routing lib"]'
+summary: '["rocketio-0.4.4", "Simple routing lib"]'
 test_files: []