Merge pull request #9 from GetDutchie/0.5.2

v0.5.2

Author: evan-waters

lib/twirp/rails/helpers/hooks.rb

@@ -18,7 +18,13 @@ def initialize(service_wrapper, **options)
         end
 
         module ClassMethods
-          def attach(service_wrapper, **options)
+          def bypass?(env, only=[], except=[])
+            return true if only.present? && !only.include?(env[:ruby_method])
+            return true if except.present? && except.include?(env[:ruby_method])
+            false
+          end
+
+          def attach(service_wrapper, only: [], except: [], **options)
             hook_instance = self.new(service_wrapper, **options)
 
             unless HOOK_METHODS.any? {|method| hook_instance.respond_to?(method)}
@@ -29,24 +35,28 @@ def attach(service_wrapper, **options)
 
             if hook_instance.respond_to?(:before)
               service_wrapper.before do |rack_env, env|
+                next if bypass?(env, only, except)
                 hook_instance.before(rack_env, env)
               end
             end
 
             if hook_instance.respond_to?(:on_success)
               service_wrapper.on_success do |env|
+                next if bypass?(env, only, except)
                 hook_instance.on_success(env)
               end
             end
 
             if hook_instance.respond_to?(:on_error)
               service_wrapper.on_error do |twerr, env|
+                next if bypass?(env, only, except)
                 hook_instance.on_error(twerr, env)
               end
             end
 
             if hook_instance.respond_to?(:exception_raised)
               service_wrapper.exception_raised do |e, env|
+                next if bypass?(env, only, except)
                 hook_instance.exception_raised(e, env)
               end
             end

lib/twirp/rails/helpers/services.rb

@@ -42,7 +42,7 @@ def bind(service_klass, namespace: nil, context: nil, hooks: [])
               end
             end
 
-            hooks = hooks + all_base_hooks
+            hooks = all_base_hooks + hooks
 
             service_wrapper = Twirp::Rails::ServiceWrapper.new(service_klass.new(new))
 

lib/twirp/rails/routes.rb

@@ -71,8 +71,8 @@ def generate_routes!(mount_namespace, options)
       end
 
       def attach_service_hooks!(service_wrapper, hooks)
-        hooks.each do |hook_klass:, options: {}|
-          hook_klass.attach service_wrapper, options
+        hooks.each do |hook_klass:, only: [], except: [], options: {}|
+          hook_klass.attach(service_wrapper, only: only, except: except, **options)
         end
       end
     end

lib/twirp/rails/version.rb

@@ -1,5 +1,5 @@
 module Twirp
   module Rails
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end