tshield 0.13.2.0 → 0.14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 87b26d114e278df9af5848487fbe41a5783b69e9
-  data.tar.gz: 36fd3d713a4c30d82631d7141c83154c90659281
+SHA256:
+  metadata.gz: 83eb12f572bdfd5f6fade21d83ee7d4883253aa9e42cad7fe0e9feac380d7ae6
+  data.tar.gz: c1718a13671ee6899321dcda86c6d6dbaad23c1389cc24c0b6ea3b684024c725
 SHA512:
-  metadata.gz: 5bd5f43cc13647026b199ad55ab149b842d6bbedae8dcfccb9a345dcc99abb72c132641ede6cd80bff36bd7e5e9123deb8dde882c4573b2d441a8c9c3e430df9
-  data.tar.gz: 956d0f30dcf1c57ba98e3488deb0d8d80367c8c5ffa6c5b6c383eed282bf17f679463df5403e93ba17033ca1dcb8bfc69afe3deeff778a44b9431b47089c7f47
+  metadata.gz: 003b70dbe21e80655ebfe6eae9e0260137a3f6e3e478200c04eefbc238ae72d8d172b62c4d980a934fd56a08eb7d2ad59d93b4d762a3c019e88d3e2e6cc39d46
+  data.tar.gz: 6c4ada87361e89edff1b8fe7353389861c3748986631ad9693d01f148c71fb2dbe06547b318d94c3247dc584081c047fc915f5d1d014d6026172b8cf406b5753

data/README.md

@@ -192,6 +192,7 @@ domains:
     headers:
       HTTP_AUTHORIZATION: Authorization
       HTTP_COOKIE: Cookie
+    send_header_content_type: true  
     not_save_headers:
       - transfer-encoding
     cache_request: <<value>>
@@ -235,6 +236,7 @@ domains:
 *   Define Base URI of service
 *   **name**: Name to identify the domain in the generated files
 *   **headers**: github-issue #17
+*   **send_header_content_type**: Boolean domain config to send header 'Content-Type' when requesting this domain  
 *   **not_save_headers**: List of headers that should be ignored in generated file
 *   **skip_query_params**: List of query params that should be ignored in generated file
 *   **cache_request**: <<some_description>>

data/lib/tshield/configuration.rb

@@ -29,10 +29,7 @@ module TShield
     #                          generated directory
     #
     attr_reader :request
-    attr_reader :domains
-    attr_reader :tcp_servers
-    attr_reader :session_path
-    attr_reader :windows_compatibility
+    attr_reader :domains, :tcp_servers, :session_path, :windows_compatibility
 
     def initialize(attributes)
       attributes.each { |key, value| instance_variable_set("@#{key}", value) }
@@ -65,6 +62,10 @@ module TShield
       nil
     end
 
+    def windows_compatibility?
+      windows_compatibility || false
+    end
+
     def get_headers(domain)
       (domains[domain] || {})['headers'] || {}
     end
@@ -100,12 +101,14 @@ module TShield
       domains[domain]['not_save_headers'] || []
     end
 
-    def read_session_path
-      session_path || '/sessions'
+    def send_header_content_type(domain)
+      return domains[domain]['send_header_content_type'] != false if domains[domain]
+
+      true
     end
 
-    def get_questionmark_char
-      windows_compatibility ? '%3f' : '?'
+    def read_session_path
+      session_path || '/sessions'
     end
 
     def grpc
@@ -135,6 +138,5 @@ module TShield
     def get_delay(domain, path)
       ((domains[domain] || {})['delay'] || {})[path] || 0
     end
-
   end
 end

data/lib/tshield/controllers/requests.rb

@@ -57,6 +57,8 @@ module TShield
             ip: request.ip
           }
 
+          treat_headers_by_domain(options, path)
+
           if %w[POST PUT PATCH].include? method
             result = request.body.read.encode('UTF-8',
                                               invalid: :replace,
@@ -74,7 +76,7 @@ module TShield
               configuration.get_excluded_headers(domain(path)).include?(key)
             end
           end
-          
+
           logger.info(
             "original=#{api_response.original} method=#{method} path=#{path} "\
             "content-type=#{request_content_type} "\
@@ -94,6 +96,11 @@ module TShield
           end
         end
 
+        def treat_headers_by_domain(options, path)
+          @send_header_content_type = configuration.send_header_content_type(domain(path))
+          options[:headers].delete('Content-Type') unless @send_header_content_type
+        end
+
         def configuration
           @configuration ||= TShield::Configuration.singleton
         end
@@ -107,7 +114,6 @@ module TShield
           logger.info("Response with delay of #{delay_in_seconds} seconds")
           sleep delay_in_seconds
         end
-
       end
     end
   end

data/lib/tshield/grpc/grpc_counter.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module TShield
+  # Increment counter for sessions requests
+  class GrpcCounter
+    def initialize
+      @requests = {}
+    end
+
+    def add(hexdigest)
+      count = @requests.fetch(hexdigest, 0)
+      count += 1
+      @requests[hexdigest] = count
+    end
+
+    def current(hexdigest)
+      @requests.fetch(hexdigest, 0)
+    end
+
+    def to_json(options = {})
+      @requests.to_json(options)
+    end
+  end
+end

data/lib/tshield/grpc/vcr.rb

@@ -1,74 +1,131 @@
 # frozen_string_literal: true
 
+require 'tshield/configuration'
 require 'tshield/sessions'
 
 module TShield
   module Grpc
+    # Grpc vcr module
     module VCR
+      # Path file to save Grpc request/response
+      class FilePath
+        attr_reader :path, :count
+
+        def initialize(path, count)
+          @path = path
+          @count = count
+        end
+      end
+
+      def initialize
+        @configuration = TShield::Configuration.singleton
+      end
+
       def handler_in_vcr_mode(method_name, request, parameters, options)
         parameters.peer =~ /ipv6:\[(.+?)\]|ipv4:(.+?):/
         peer = Regexp.last_match(1) || Regexp.last_match(2)
 
         TShield.logger.info("request from #{parameters.peer}")
         @session = TShield::Sessions.current(peer)
+        @digest = hexdigest(request)
+        counter = @session ? request_count.current(@digest) : 0
 
         TShield.logger.info("grpc using session #{@session || 'default'}")
         module_name = options['module']
 
-        path = create_destiny(module_name, method_name, request)
-        save_request(path, request)
-        response = saved_response(path)
-        if response
-          TShield.logger.info("returning saved response for request #{request.to_json} saved into #{hexdigest(request)}")
-          return response
+        path = create_destiny(module_name, method_name)
+        @file_path = FilePath.new(path, counter)
+        save_request(request)
+        response = {}
+        saved_error
+        begin
+          response = saved_response
+          if response
+            TShield.logger.info("returning saved response for request #{request.to_json} saved into #{@digest}")
+            request_count.add(@digest) if @session
+            return response
+          end
+
+          response = send_request(request, module_name, options, method_name)
+          save_response(response)
+        rescue GRPC::BadStatus => e
+          save_error({ code: e.code, details: e.details })
+          raise e
         end
+        request_count.add(@digest) if @session
+        response
+      end
 
+      def send_request(request, module_name, options, method_name)
         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_response(path, response)
-        response
+        client_instance.send(method_name, request)
       end
 
-      def saved_response(path)
-        response_file = File.join(path, 'response')
+      def request_count
+        @session[:grpc_counter]
+      end
+
+      def encode_colon(value)
+        value.gsub(':', '%3a')
+      end
+
+      def saved_response
+        response_file = File.join(@file_path.path, "#{@file_path.count}.response")
         return false unless File.exist? response_file
 
         content = JSON.parse File.open(response_file).read
-        response_class = File.open(File.join(path, 'response_class')).read.strip
+        response_class = File.open(File.join(@file_path.path, "#{@file_path.count}.response_class")).read.strip
         Kernel.const_get(response_class).new(content)
       end
 
-      def save_request(path, request)
-        file = File.open(File.join(path, 'original_request'), 'w')
+      def saved_error
+        error_file = File.join(@file_path.path, "#{@file_path.count}.error")
+        return false unless File.exist? error_file
+
+        request_count.add(@digest) if @session
+        content = JSON.parse File.open(error_file).read
+        grpc_error = GRPC::BadStatus.new(content['code'], content['details'])
+        raise grpc_error
+      end
+
+      def save_request(request)
+        file = File.open(File.join(@file_path.path, "#{@file_path.count}.original_request"), 'w')
         file.puts request.to_json
         file.close
       end
 
-      def save_response(path, response)
-        file = File.open(File.join(path, 'response'), 'w')
+      def save_error(error)
+        file = File.open(File.join(@file_path.path, "#{@file_path.count}.error"), 'w')
+        file.puts error.to_json
+        file.close
+        request_count.add(@digest) if @session
+      end
+
+      def save_response(response)
+        file = File.open(File.join(@file_path.path, "#{@file_path.count}.response"), 'w')
         file.puts response.to_json
         file.close
 
-        response_class = File.open(File.join(path, 'response_class'), 'w')
+        response_class = File.open(File.join(@file_path.path, "#{@file_path.count}.response_class"), 'w')
         response_class.puts response.class.to_s
         response_class.close
       end
 
-      def complete_path(module_name, method_name, request)
+      def complete_path(module_name, method_name)
         @session_name = (@session || {})[:name]
-        path = ['requests', 'grpc', @session_name, module_name, method_name.to_s, hexdigest(request)].compact
-        path
+        module_name = @configuration.windows_compatibility? ? encode_colon(module_name) : module_name
+        ['requests', @session_name, module_name, method_name.to_s, @digest].compact
       end
 
-      def create_destiny(module_name, method_name, request)
+      def create_destiny(module_name, method_name)
         current_path = []
 
-        path = complete_path(module_name, method_name, request)
+        path = complete_path(module_name, method_name)
         TShield.logger.info("using path #{path}")
-        path.each do |path|
-          current_path << path
+        path.each do |inner_path|
+          current_path << inner_path
           destiny = File.join current_path
           Dir.mkdir destiny unless File.exist? destiny
         end

data/lib/tshield/grpc.rb

@@ -4,7 +4,6 @@ require 'grpc'
 
 require 'tshield/configuration'
 require 'tshield/grpc/vcr'
-
 module TShield
   module Grpc
     module RequestHandler
@@ -14,6 +13,7 @@ module TShield
         handler_in_vcr_mode(method_name, request, parameters, options)
       end
     end
+
     def self.run!
       @configuration = TShield::Configuration.singleton.grpc
 
@@ -41,6 +41,7 @@ module TShield
       handlers = []
       number_of_handlers = 0
       services.each do |file, options|
+
         require file
 
         base = Object.const_get("#{options['module']}::Service")
@@ -55,8 +56,7 @@ module TShield
     def self.build_handler(base, descriptions, number_of_handlers, options)
       handler = Class.new(base) do
         class << self
-          attr_writer :options
-          attr_reader :options
+          attr_accessor :options
         end
         descriptions.each do |service_name, description|
           puts description

data/lib/tshield/logger.rb

@@ -5,6 +5,6 @@ require 'logger'
 # Logger instance for application
 module TShield
   def self.logger
-    @logger ||= Logger.new(STDOUT)
+    @logger ||= Logger.new($stdout)
   end
 end

data/lib/tshield/request_matching.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'tshield/logger'
 require 'tshield/matching/filters'
 require 'tshield/request'
 
@@ -59,15 +60,38 @@ module TShield
       end
 
       def load_stub(file)
-        content = JSON.parse File.open(file).read
+        content = read_stub_file(file)
         content.each do |stub|
-          stub_session_name = init_stub_session(stub)
+          next unless valid_stub?(file, stub)
 
-          if stub['stubs']
-            load_items(stub['stubs'] || [], stub_session_name)
-          else
-            load_item(stub, stub_session_name)
-          end
+          load_valid_stub(stub)
+        end
+      end
+
+      def read_stub_file(file)
+        JSON.parse File.open(file).read
+      rescue StandardError
+        TShield.logger.error "error in loading matching file #{file}"
+        []
+      end
+
+      def valid_stub?(file, stub)
+        is_valid = stub.is_a?(Hash) && mandatory_attributes?(stub)
+        TShield.logger.info "loading matching file #{file}" if is_valid
+        is_valid
+      end
+
+      def mandatory_attributes?(stub)
+        (stub['method'] && stub['path'] && stub['response']) || (stub['session'] && stub['stubs'])
+      end
+
+      def load_valid_stub(stub)
+        stub_session_name = init_stub_session(stub)
+
+        if stub['stubs']
+          load_items(stub['stubs'] || [], stub_session_name)
+        else
+          load_item(stub, stub_session_name)
         end
       end
 

data/lib/tshield/request_vcr.rb

@@ -79,7 +79,6 @@ module TShield
     end
 
     def apply_set_cookie_header_values(raw_response, headers = {})
-
       headers_clone = headers.clone
 
       field = raw_response.get_fields('Set-Cookie')
@@ -98,6 +97,7 @@ module TShield
 
       raw_response.headers.each do |k, v|
         next if k == 'set-cookie'
+
         headers[k] = v unless configuration.not_save_headers(domain).include? k
       end
 
@@ -155,14 +155,24 @@ module TShield
       content[:body] = body
     end
 
+    def encode_for_windows_dir(directory)
+      replace = [['<', '%3c'], ['>', '%3e'], [':', '%3a'], ['"', '%22'], ['?', '%3f'], [' ', '%20'], ['*', '%2a'],
+                 ['/', '%2f']]
+      replace.each do |value|
+        directory = directory.gsub(value.first, value.last)
+      end
+      directory
+    end
+
     def safe_dir(url)
       if url.size > 225
         path = url.gsub(/(\?.*)/, '')
         params = Digest::SHA1.hexdigest Regexp.last_match(1)
-        "#{path.gsub(%r{/}, '-').gsub(/^-/, '')}#{configuration.get_questionmark_char}#{params}"
+        directory = "#{path.gsub(%r{/}, '-').gsub(/^-/, '')}?#{params}"
       else
-        url.gsub(%r{/}, '-').gsub(/^-/, '').gsub('?', configuration.get_questionmark_char)
+        directory = url.gsub(%r{/}, '-').gsub(/^-/, '')
       end
+      configuration.windows_compatibility? ? encode_for_windows_dir(directory) : directory
     end
   end
 end

data/lib/tshield/sessions.rb

@@ -2,6 +2,7 @@
 
 require 'tshield/logger'
 require 'tshield/counter'
+require 'tshield/grpc/grpc_counter'
 require 'tshield/errors'
 
 module TShield
@@ -14,6 +15,7 @@ module TShield
       sessions[normalize_ip(ip)] = {
         name: name,
         counter: TShield::Counter.new,
+        grpc_counter: TShield::GrpcCounter.new,
         secondary_sessions: []
       }
     end

data/lib/tshield/version.rb

@@ -4,8 +4,8 @@ module TShield
   # Control version of gem
   class Version
     MAJOR = 0
-    MINOR = 13
-    PATCH = 2
+    MINOR = 14
+    PATCH = 0
     PRE = 0
 
     class << self

data/spec/tshield/configuration_spec.rb

@@ -67,19 +67,19 @@ describe TShield::Configuration do
 
     describe 'SO compatibility' do
       it 'should be compatible with windows when configuration is true' do
-        allow(YAML).to receive(:safe_load).and_return({:windows_compatibility => true })
+        allow(YAML).to receive(:safe_load).and_return({ windows_compatibility: true })
         TShield::Configuration.clear
         @configuration = TShield::Configuration.singleton
 
-        expect(@configuration.get_questionmark_char).to eq('%3f')
+        expect(@configuration.windows_compatibility?).to eq(true)
       end
 
       it 'should be compatible with Unix when configuration is false' do
-        allow(YAML).to receive(:safe_load).and_return({:windows_compatibility => false })
+        allow(YAML).to receive(:safe_load).and_return({ windows_compatibility: false })
         TShield::Configuration.clear
         @configuration = TShield::Configuration.singleton
 
-        expect(@configuration.get_questionmark_char).to eq('?')
+        expect(@configuration.windows_compatibility?).to eq(false)
       end
 
       it 'should be compatible with Unix when configuration is missing' do
@@ -87,9 +87,8 @@ describe TShield::Configuration do
         TShield::Configuration.clear
         @configuration = TShield::Configuration.singleton
 
-        expect(@configuration.get_questionmark_char).to eq('?')
+        expect(@configuration.windows_compatibility?).to eq(false)
       end
-
     end
   end
   context 'on config not exist' do
@@ -108,14 +107,42 @@ describe TShield::Configuration do
 
   context 'on config exists without grpc entry' do
     before :each do
-      options_instance = double
-      allow(options_instance).to receive(:configuration_file)
-        .and_return('spec/tshield/fixtures/config/tshield-without-grpc.yml')
-      allow(TShield::Options).to receive(:instance).and_return(options_instance)
-      @configuration = TShield::Configuration.singleton
+      @configuration = generate_configuration_from_file('spec/tshield/fixtures/config/tshield-without-grpc.yml')
+      TShield::Configuration.clear
     end
     it 'should set default value for port' do
       expect(@configuration.grpc).to eql('port' => 5678, 'proto_dir' => 'proto', 'services' => {})
     end
   end
+
+  context 'on config property request.domains.domain.send_header_content_type does not exists' do
+    before :each do
+      @configuration = generate_configuration_from_file('spec/tshield/fixtures/config/tshield-without-grpc.yml')
+      TShield::Configuration.clear
+    end
+    it 'should return send_header_content_type as true when property is not set' do
+      expect(@configuration.send_header_content_type('example.org')).to be true
+    end
+  end
+
+  context 'on config property request.domains.domain.send_header_content_type does exists' do
+    before :each do
+      TShield::Configuration.clear
+    end
+    it 'should return send_header_content_type as true when property is true' do
+      @configuration = generate_configuration_from_file('spec/tshield/fixtures/config/tshield-with-send-content-type-header.yml')
+      expect(@configuration.send_header_content_type('example.org')).to be true
+    end
+    it 'should return send_header_content_type as false when property is false' do
+      @configuration = generate_configuration_from_file('spec/tshield/fixtures/config/tshield-with-send-content-type-header_as_false.yml')
+      expect(@configuration.send_header_content_type('example.org')).to be false
+    end
+  end
+end
+
+def generate_configuration_from_file(file)
+  options_instance = double
+  allow(options_instance).to receive(:configuration_file).and_return(file)
+  allow(TShield::Options).to receive(:instance).and_return(options_instance)
+  TShield::Configuration.singleton
 end

data/spec/tshield/controllers/requests_spec.rb

@@ -58,3 +58,93 @@ describe TShield::Controllers::Requests do
     end
   end
 end
+
+describe TShield::Controllers::Requests do
+  before :each do
+    @configuration = double
+    allow(TShield::Configuration)
+      .to receive(:singleton).and_return(@configuration)
+    allow(@configuration).to receive(:get_before_filters).and_return([])
+    allow(@configuration).to receive(:not_save_headers).and_return([])
+    allow(@configuration).to receive(:get_after_filters).and_return([])
+    allow(@configuration).to receive(:get_headers).and_return([])
+    allow(@configuration).to receive(:request).and_return('timeout' => 10)
+    allow(@configuration).to receive(:get_name).and_return('example.org')
+    allow(@configuration).to receive(:get_domain_for).and_return('example.org')
+    allow(@configuration).to receive(:get_delay).and_return(0)
+
+    allow(TShield::Options).to receive_message_chain(:instance, :break?)
+    @mock_logger = double
+    @controller = MockController.new(@mock_logger)
+  end
+  context 'when send_header_content_type is false for a single domain' do
+    it 'should remove application/json header when making a request' do
+      params = { 'captures' => ['/'] }
+      request = double
+      matcher = double
+      matched_response = double
+
+      allow(@configuration).to receive(:send_header_content_type).and_return(false)
+      allow(request).to receive(:request_method).and_return('GET')
+      allow(request).to receive(:content_type).and_return('application/json')
+      allow(request).to receive(:ip).and_return('0.0.0.0')
+      allow(request).to receive(:env).and_return('QUERY_STRING' => 'a=b')
+      allow(TShield::RequestMatching).to receive(:new).and_return(matcher)
+      allow(matcher).to receive(:match_request).and_return(nil)
+      allow(TShield::RequestVCR).to receive(:new).and_return(matcher)
+      allow(matcher).to receive(:vcr_response).and_return(matched_response)
+      allow(matched_response).to receive(:original).and_return(false)
+      allow(matched_response).to receive(:status).and_return(200)
+      allow(matched_response).to receive(:headers).and_return({})
+      allow(matched_response).to receive(:body).and_return('')
+      allow(@mock_logger).to receive(:info)
+
+      expect(TShield::RequestVCR).to receive(:new).with('/', {
+                                                          call: 0,
+                                                          headers: {},
+                                                          ip: '0.0.0.0',
+                                                          method: 'GET',
+                                                          raw_query: 'a=b',
+                                                          secondary_sessions: nil,
+                                                          session: nil
+                                                        })
+      @controller.treat(params, request, nil)
+    end
+  end
+
+  context 'when send_header_content_type is true for a single domain' do
+    it 'should NOT remove application/json header when making a request' do
+      params = { 'captures' => ['/'] }
+      request = double
+      matcher = double
+      matched_response = double
+
+      allow(@configuration).to receive(:send_header_content_type).and_return(true)
+      allow(request).to receive(:request_method).and_return('GET')
+      allow(request).to receive(:content_type).and_return('application/json')
+      allow(request).to receive(:ip).and_return('0.0.0.0')
+      allow(request).to receive(:env).and_return('QUERY_STRING' => 'a=b')
+      allow(TShield::RequestMatching).to receive(:new).and_return(matcher)
+      allow(matcher).to receive(:match_request).and_return(nil)
+      allow(TShield::RequestVCR).to receive(:new).and_return(matcher)
+      allow(matcher).to receive(:vcr_response).and_return(matched_response)
+      allow(matched_response).to receive(:original).and_return(false)
+      allow(matched_response).to receive(:status).and_return(200)
+      allow(matched_response).to receive(:headers).and_return({})
+      allow(matched_response).to receive(:body).and_return('')
+      allow(@mock_logger).to receive(:info)
+
+      expect(TShield::RequestVCR).to receive(:new).with('/', {
+                                                          call: 0,
+                                                          headers: { 'Content-Type' => 'application/json' },
+                                                          ip: '0.0.0.0',
+                                                          method: 'GET',
+                                                          raw_query: 'a=b',
+                                                          secondary_sessions: nil,
+                                                          session: nil
+                                                        })
+
+      @controller.treat(params, request, nil)
+    end
+  end
+end

data/spec/tshield/fixtures/config/tshield-with-send-content-type-header.yml

@@ -0,0 +1,18 @@
+---
+request:
+  timeout: 0
+domains:
+  'example.org':
+    name: 'example.org'
+    send_header_content_type: true
+    filters:
+      - 'ExampleFilter'
+    paths:
+      - '/api/one'
+      - '/api/two'
+    skip_query_params:
+      - 'a'
+  'example.com':
+    name: 'example.com'
+    paths:
+      - '/api/three'

data/spec/tshield/fixtures/config/tshield-with-send-content-type-header_as_false.yml

@@ -0,0 +1,18 @@
+---
+request:
+  timeout: 0
+domains:
+  'example.org':
+    name: 'example.org'
+    send_header_content_type: false
+    filters:
+      - 'ExampleFilter'
+    paths:
+      - '/api/one'
+      - '/api/two'
+    skip_query_params:
+      - 'a'
+  'example.com':
+    name: 'example.com'
+    paths:
+      - '/api/three'

data/spec/tshield/request_matching_spec.rb

@@ -36,6 +36,38 @@ describe TShield::RequestMatching do
     end
   end
 
+  context 'invalid matching file' do
+    before :each do
+      allow(Dir).to receive(:glob)
+        .and_return(['spec/tshield/fixtures/matching/invalid_matching_file.json'])
+    end
+
+    context 'on loading stubs' do
+      before :each do
+        @request_matching = TShield::RequestMatching.new('/')
+      end
+      it 'should stubs be empty' do
+        expect(@request_matching.class.stubs[DEFAULT_SESSION]).to be_nil
+      end
+    end
+  end
+
+  context 'empty matching file' do
+    before :each do
+      allow(Dir).to receive(:glob)
+        .and_return(['spec/tshield/fixtures/matching/empty.json'])
+    end
+
+    context 'on loading stubs' do
+      before :each do
+        @request_matching = TShield::RequestMatching.new('/')
+      end
+      it 'should stubs be empty' do
+        expect(@request_matching.class.stubs[DEFAULT_SESSION]).to be_nil
+      end
+    end
+  end
+
   context 'matching path' do
     before :each do
       allow(Dir).to receive(:glob)

data/spec/tshield/request_vcr_spec.rb

@@ -81,7 +81,7 @@ describe TShield::RequestVCR do
           }
         )
 
-        allow(@configuration).to receive(:get_questionmark_char).and_return('?')
+        allow(@configuration).to receive(:windows_compatibility?).and_return(false)
 
         allow(HTTParty).to receive(:send).and_return(RawResponse.new)
         file_double = double
@@ -106,41 +106,40 @@ describe TShield::RequestVCR do
       end
 
       it 'should create response directory in windows standard' do
-
         allow(@configuration).to receive(:domains).and_return(
-            'example.org' => {
-                'skip_query_params' => []
-            }
+          'example.org' => {
+            'skip_query_params' => []
+          }
         )
 
-        allow(@configuration).to receive(:get_questionmark_char).and_return('%3f')
+        allow(@configuration).to receive(:windows_compatibility?).and_return(true)
 
         allow(HTTParty).to receive(:send).and_return(RawResponse.new)
         file_double = double
 
         allow(File).to receive(:join)
-                           .with('./requests/example.org', '%3fparam=value')
-                           .and_return('./requests/example.org/%3fparam=value')
+          .with('./requests/example.org', '%3fparam=value')
+          .and_return('./requests/example.org/%3fparam=value')
         allow(File).to receive(:join)
-                           .with('./requests/example.org/%3fparam=value', 'get')
-                           .and_return('./requests/example.org/%3fparam=value/get')
+          .with('./requests/example.org/%3fparam=value', 'get')
+          .and_return('./requests/example.org/%3fparam=value/get')
         allow(File).to receive(:join)
-                           .with('./requests/example.org/%3fparam=value/get', '0')
-                           .and_return('./requests/example.org/%3fparam=value/get/0')
+          .with('./requests/example.org/%3fparam=value/get', '0')
+          .and_return('./requests/example.org/%3fparam=value/get/0')
 
         allow(file_double).to receive(:read).and_return('{}')
 
         expect(File).to receive('open')
-                            .with('./requests/example.org/%3fparam=value/get/0.content', 'w')
-                            .and_return(file_double)
+          .with('./requests/example.org/%3fparam=value/get/0.content', 'w')
+          .and_return(file_double)
 
         expect(File).to receive('open')
-                            .with('./requests/example.org/%3fparam=value/get/0.json', 'w')
-                            .and_return(file_double)
+          .with('./requests/example.org/%3fparam=value/get/0.json', 'w')
+          .and_return(file_double)
 
         expect(file_double).to receive(:write).ordered.with('this is the body')
         expect(file_double).to receive(:write)
-                                   .with("{\n  \"status\": 200,\n  \"headers\": {\n  }\n}")
+          .with("{\n  \"status\": 200,\n  \"headers\": {\n  }\n}")
         expect(file_double).to receive(:close)
         expect(file_double).to receive(:close)
 
@@ -149,8 +148,6 @@ describe TShield::RequestVCR do
                                 method: 'GET',
                                 call: 0
       end
-
-
     end
   end
 
@@ -163,7 +160,7 @@ describe TShield::RequestVCR do
       'this is the body'
     end
 
-    def get_fields(field = "")
+    def get_fields(_field = '')
       []
     end
 
@@ -174,22 +171,19 @@ describe TShield::RequestVCR do
 
   class RawResponseCookiesMultipleValues
     def headers
-     {'Set-Cookie' => ['FirstCookie=An Value', 'SecondCookie=An Value']}
+      { 'Set-Cookie' => ['FirstCookie=An Value', 'SecondCookie=An Value'] }
     end
 
     def body
       'this is the body'
     end
 
-    def get_fields(field = "")
-      self.headers[filed] unless self.headers.key?(field)
+    def get_fields(field = '')
+      headers[filed] unless headers.key?(field)
     end
 
     def code
       200
     end
   end
-
 end
-
-

data/tshield.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency('grpc-tools', '~> 1.28', '>= 1.28.0')
   s.add_dependency('httparty', '~> 0.14', '>= 0.14.0')
   s.add_dependency('json', '~> 2.0', '>= 2.0')
-  s.add_dependency('puma', '~> 4.3', '>= 4.3.3')
+  s.add_dependency('puma', '>= 4.3.3', '< 6.0')
   s.add_dependency('sinatra', '~> 2.1', '>= 2.1.0')
   s.add_dependency('sinatra-cross_origin', '~> 0.4.0', '>= 0.4')
   s.add_development_dependency('coveralls', '~> 0.8', '>= 0.8.23')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tshield
 version: !ruby/object:Gem::Version
-  version: 0.13.2.0
+  version: 0.14.0.0
 platform: ruby
 authors:
 - Diego Rubin
@@ -9,148 +9,148 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.28'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.28.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.28'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.28.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.28'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.28.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.28'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.28.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -255,80 +255,80 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.4.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.4.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.73.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.73.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.73.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.73.0
 - !ruby/object:Gem::Dependency
@@ -375,22 +375,22 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Proxy for mocks API responses
 email: rubin.diego@gmail.com
 executables:
@@ -415,6 +415,7 @@ files:
 - lib/tshield/errors.rb
 - lib/tshield/extensions/string_extensions.rb
 - lib/tshield/grpc.rb
+- lib/tshield/grpc/grpc_counter.rb
 - lib/tshield/grpc/vcr.rb
 - lib/tshield/logger.rb
 - lib/tshield/matching/filters.rb
@@ -430,6 +431,8 @@ files:
 - spec/tshield/after_filter_spec.rb
 - spec/tshield/configuration_spec.rb
 - spec/tshield/controllers/requests_spec.rb
+- spec/tshield/fixtures/config/tshield-with-send-content-type-header.yml
+- spec/tshield/fixtures/config/tshield-with-send-content-type-header_as_false.yml
 - spec/tshield/fixtures/config/tshield-without-grpc.yml
 - spec/tshield/fixtures/config/tshield.yml
 - spec/tshield/fixtures/filters/example_filter.rb
@@ -460,23 +463,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Proxy for mocks API responses
 test_files:
 - spec/spec_helper.rb
-- spec/tshield/fixtures/matching/example.json
+- spec/tshield/request_matching_spec.rb
+- spec/tshield/sessions_spec.rb
+- spec/tshield/request_vcr_spec.rb
+- spec/tshield/after_filter_spec.rb
+- spec/tshield/grpc_spec.rb
+- spec/tshield/options_spec.rb
 - spec/tshield/fixtures/config/tshield-without-grpc.yml
+- spec/tshield/fixtures/config/tshield-with-send-content-type-header_as_false.yml
+- spec/tshield/fixtures/config/tshield-with-send-content-type-header.yml
 - spec/tshield/fixtures/config/tshield.yml
-- spec/tshield/fixtures/filters/example_filter.rb
 - spec/tshield/fixtures/proto/test_services_pb.rb
-- spec/tshield/options_spec.rb
-- spec/tshield/configuration_spec.rb
-- spec/tshield/sessions_spec.rb
-- spec/tshield/request_matching_spec.rb
+- spec/tshield/fixtures/matching/example.json
+- spec/tshield/fixtures/filters/example_filter.rb
 - spec/tshield/controllers/requests_spec.rb
-- spec/tshield/grpc_spec.rb
-- spec/tshield/request_vcr_spec.rb
-- spec/tshield/after_filter_spec.rb
+- spec/tshield/configuration_spec.rb