tshield 0.11.17.0 → 0.11.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda6e0a319ccae57965e4fdf2e51445327dbc9ee74a0b7545b10304d28405051
-  data.tar.gz: 91a7ba920f3ccfecb2f1892fed014a196d2f53739a3e1dea592d5893b89aa6d6
+  metadata.gz: 36efe1ccd1ea061d66f046d338b76fcb0b9b6f30c740ecadabe6c774939dcd5b
+  data.tar.gz: 38559f053d082a577260aa94a115a66937ffb9ce45c52fee3a60339ade9ea32d
 SHA512:
-  metadata.gz: d0fb66877992d29835ab23279d1364f1a468f3d547160d25ea1cd0f8451d5516eeeae414d5c75c0176aaf8faac3ad55b1230949bec2d3d0e38a9cb940cdb4c79
-  data.tar.gz: ab7e413bf75bcf16edafa121c115e6457a794bdcdbb5c82bfe2b4678f976d97b01f245c4ca7bf7e88d62f329dd43d635d8d48a95c560d433f5c736e3b6f1dec4
+  metadata.gz: ba74b2c25265ef74b62b297db19795b387c1bfe4821dce609d17cf99b00d663d58f3f889e134d58a22b679b9f1781bf00c64117fdd1e097111c7fc2cfaab5069
+  data.tar.gz: ce7f58cb6bf00a942b56464235cd8fa002c6489aa6643c057f9d201eeebafe3e57be70724f8bca03f8068a5468caf3d62caea846869305d145edca2ed4d19322

data/lib/tshield/grpc.rb

@@ -3,16 +3,15 @@
 require 'grpc'
 
 require 'tshield/configuration'
-require 'tshield/sessions'
 require 'tshield/grpc/vcr'
 
 module TShield
   module Grpc
     module RequestHandler
       include TShield::Grpc::VCR
-      def handler(method_name, request)
+      def handler(method_name, request, parameters)
         options = self.class.options
-        handler_in_vcr_mode(method_name, request, options)
+        handler_in_vcr_mode(method_name, request, parameters, options)
       end
     end
     def self.run!
@@ -62,8 +61,8 @@ module TShield
         descriptions.each do |service_name, description|
           puts description
           method_name = service_name.to_s.underscore.to_sym
-          define_method(method_name) do |request, _unused_call|
-            handler(__method__, request)
+          define_method(method_name) do |request, parameters|
+            handler(__method__, request, parameters)
           end
         end
       end

data/lib/tshield/grpc/vcr.rb

@@ -1,65 +1,79 @@
 # frozen_string_literal: true
 
+require 'tshield/sessions'
+
 module TShield
   module Grpc
     module VCR
-      def handler_in_vcr_mode(method_name, request, options)
+      def handler_in_vcr_mode(method_name, request, parameters, options)
+        parameters.peer =~ /\[(.+?)\]/
+        @session = TShield::Sessions.current(Regexp.last_match(1))
+
+        TShield.logger.info("grpc using session #{@session || 'default'}")
         module_name = options['module']
 
-        response = saved_response(module_name, method_name, request)
-        return response if response
+        path = create_destiny(module_name, method_name, request)
+        response = saved_response(path)
+        if response
+          TShield.logger.info("returning saved response for request #{request.to_json} saved into #{hexdigest(request)}")
+          return response
+        end
 
+        TShield.logger.info("calling server to get response for #{request.to_json}")
         client_class = Object.const_get("#{module_name}::Stub")
         client_instance = client_class.new(options['hostname'], :this_channel_is_insecure)
         response = client_instance.send(method_name, request)
-        save_request_and_response(request, response)
+        save_request_and_response(path, request, response)
         response
       end
 
-      def saved_response(module_name, method_name, request)
-        create_destiny(module_name, method_name, request)
-        response_file = File.join(@complete_path, 'response')
+      def saved_response(path)
+        response_file = File.join(path, 'response')
         return false unless File.exist? response_file
 
         content = JSON.parse File.open(response_file).read
-        response_class = File.open(File.join(@complete_path, 'response_class')).read.strip
+        response_class = File.open(File.join(path, 'response_class')).read.strip
         Kernel.const_get(response_class).new(content)
       end
 
-      def save_request_and_response(request, response)
-        save_request(request)
-        save_response(response)
+      def save_request_and_response(path, request, response)
+        save_request(path, request)
+        save_response(path, response)
       end
 
-      def save_request(request)
-        file = File.open(File.join(@complete_path, 'original_request'), 'w')
+      def save_request(path, request)
+        file = File.open(File.join(path, 'original_request'), 'w')
         file.puts request.to_json
         file.close
       end
 
-      def save_response(response)
-        file = File.open(File.join(@complete_path, 'response'), 'w')
+      def save_response(path, response)
+        file = File.open(File.join(path, 'response'), 'w')
         file.puts response.to_json
         file.close
 
-        response_class = File.open(File.join(@complete_path, 'response_class'), 'w')
+        response_class = File.open(File.join(path, 'response_class'), 'w')
         response_class.puts response.class.to_s
         response_class.close
       end
 
       def complete_path(module_name, method_name, request)
-        return @complete_path if @complete_path
-
-        @complete_path = ['requests', 'grpc', module_name, method_name.to_s, hexdigest(request)]
+        @session_name = (@session || {})[:name]
+        path = ['requests', 'grpc', @session_name, module_name, method_name.to_s, hexdigest(request)].compact
+        path
       end
 
       def create_destiny(module_name, method_name, request)
         current_path = []
-        complete_path(module_name, method_name, request).each do |path|
+
+        path = complete_path(module_name, method_name, request)
+        TShield.logger.info("using path #{path}")
+        path.each do |path|
           current_path << path
           destiny = File.join current_path
           Dir.mkdir destiny unless File.exist? destiny
         end
+        path
       end
 
       def hexdigest(request)

data/lib/tshield/version.rb

@@ -5,7 +5,7 @@ module TShield
   class Version
     MAJOR = 0
     MINOR = 11
-    PATCH = 17
+    PATCH = 18
     PRE = 0
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tshield
 version: !ruby/object:Gem::Version
-  version: 0.11.17.0
+  version: 0.11.18.0
 platform: ruby
 authors:
 - Diego Rubin