tshield 0.11.17.0 → 0.13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: dda6e0a319ccae57965e4fdf2e51445327dbc9ee74a0b7545b10304d28405051
-  data.tar.gz: 91a7ba920f3ccfecb2f1892fed014a196d2f53739a3e1dea592d5893b89aa6d6
+SHA1:
+  metadata.gz: caa9310473bc1479ad6bc7db7ae67938b269bbd7
+  data.tar.gz: 34de8d7084f0eecb054f2b07b9950ef0dffbf32b
 SHA512:
-  metadata.gz: d0fb66877992d29835ab23279d1364f1a468f3d547160d25ea1cd0f8451d5516eeeae414d5c75c0176aaf8faac3ad55b1230949bec2d3d0e38a9cb940cdb4c79
-  data.tar.gz: ab7e413bf75bcf16edafa121c115e6457a794bdcdbb5c82bfe2b4678f976d97b01f245c4ca7bf7e88d62f329dd43d635d8d48a95c560d433f5c736e3b6f1dec4
+  metadata.gz: 41afa4ac6a4471ea700beaa32ddf4c664f7eeb4f7a61639853b883a5ee0b6dd8f4262f9e14198a186e89cece5bb158669587a00f80dc7bef6bb460a5f6f7c5a3
+  data.tar.gz: ef52b07f2bfc68d8ff0561c0676350493da7b7f16b26f1e61687f13a78929e4ec9659859a396dcb6bb51d5eab8c041cc15cbb2ca92fcecc8a5ed768101a2a7bd

data/README.md

@@ -13,7 +13,7 @@ TShield is an open source proxy for mocks API responses.
 *   REST
 *   SOAP
 *   Session manager to separate multiple scenarios (success, error, sucess variation, ...)
-    gRPC [EXPERIMENTAL]
+*   gRPC [EXPERIMENTAL]
 *   Lightweight
 *   MIT license
 
@@ -68,6 +68,17 @@ domains:
       - /users
 ```
 
+**Windows Compatibility:** If you need to use Tshield in Windows SO, change the config file and set the windows_compatibility to true.
+
+Eg:
+```yaml
+windows_compatibility: true
+request:
+  # wait time for real service
+  timeout: 8
+...
+```
+
 ## Config options for Pattern Matching
 
 An example of file to create a stub:
@@ -93,6 +104,10 @@ Optional request attributes:
 this stub will be returned if all headers are in request. 
 *   **query**: works like headers but use query params.
 
+Optional response attributes:
+
+*   **delay**: integer that represents time in seconds that the response will be delayed to return
+
 **Important**: If VCR config conflicts with Matching config Matching will be
 used. Matching config have priority.
 
@@ -155,6 +170,7 @@ To register stub into a session create an object with following attributes:
       "method": "GET",
       "path": "/matching/example",
       "response": {
+        "delay": 5,
         "body": "matching-example-response-in-session",
         "headers": {},
         "status": 200
@@ -195,6 +211,8 @@ domains:
       - transfer-encoding
     paths:
       - /secure
+    delay:
+      '/secure': 10
 
   'http://localhost:9092':
     name: 'my-other-service'
@@ -205,6 +223,8 @@ domains:
       - transfer-encoding
     paths:
       - /users
+    delay:
+      '/users': 5
 ```
 **request**
 *   **timeout**: wait time for real service in seconds
@@ -220,6 +240,7 @@ domains:
 *   **filters**: Implementation of before or after filters used in domain requests
 *   **excluded_headers**: <<some_description>>
 *   **paths**: Paths list of all services that will be called. Used to filter what domain will "receive the request"
+*   **delay**: List of times in seconds that the response will be delayed to return for an specific path defined above
 
 ## Manage Sessions
 
@@ -250,6 +271,16 @@ _DELETE_ to http://localhost:4567/sessions
 curl -X DELETE \
   http://localhost:4567/sessions
 ```
+### Append secondary TShield session
+**Append session. Secondary sessions will used only for read content in VCR mode, writes will be do in the main session. Append only works if exists a current session setted.**
+
+_POST_ to http://localhost:4567/sessions?name=<<same_name>>
+
+```
+curl -X POST \
+  'http://localhost:4567/sessions/append?name=my_valid'
+```
+
 ## [Experimental] Config options for gRPC
 
 ```yaml
@@ -265,7 +296,6 @@ grpc:
 
 ### Not Implemented Yet 
 
-- Sessions
 - Matching
 
 ### Configuration

data/config/tshield.yml

@@ -14,5 +14,6 @@ domains:
     skip_query_params:
       - b
     paths:
+      - /fake
       - /users
       - /resources

data/lib/tshield/configuration.rb

@@ -32,6 +32,7 @@ module TShield
     attr_reader :domains
     attr_reader :tcp_servers
     attr_reader :session_path
+    attr_reader :windows_compatibility
 
     def initialize(attributes)
       attributes.each { |key, value| instance_variable_set("@#{key}", value) }
@@ -103,6 +104,10 @@ module TShield
       session_path || '/sessions'
     end
 
+    def get_questionmark_char
+      windows_compatibility ? '%3f' : '?'
+    end
+
     def grpc
       defaults = { 'port' => 5678, 'proto_dir' => 'proto', 'services' => {} }
       defaults.merge(@grpc || {})
@@ -126,5 +131,10 @@ module TShield
       )
       raise 'Startup aborted'
     end
+
+    def get_delay(domain, path)
+      ((domains[domain] || {})['delay'] || {})[path] || 0
+    end
+
   end
 end

data/lib/tshield/controllers/helpers/session_helpers.rb

@@ -10,6 +10,11 @@ module TShield
           session[:name] if session
         end
 
+        def self.secondary_sessions(request)
+          session = TShield::Sessions.current(request.ip)
+          session[:secondary_sessions] if session
+        end
+
         def self.current_session_call(request, callid, method)
           session = TShield::Sessions.current(request.ip)
           session ? session[:counter].current(callid, method) : 0

data/lib/tshield/controllers/requests.rb

@@ -43,6 +43,7 @@ module TShield
           request_content_type = request.content_type
 
           session_name = TShield::Controllers::Helpers::SessionHelpers.current_session_name(request)
+          secondary_sessions = TShield::Controllers::Helpers::SessionHelpers.secondary_sessions(request)
           session_call = TShield::Controllers::Helpers::SessionHelpers
                          .current_session_call(request, callid, method)
 
@@ -51,6 +52,7 @@ module TShield
             headers: Helpers.build_headers(request),
             raw_query: request.env['QUERY_STRING'],
             session: session_name,
+            secondary_sessions: secondary_sessions,
             call: session_call,
             ip: request.ip
           }
@@ -67,12 +69,12 @@ module TShield
           unless api_response
             add_headers(options, path)
 
-            api_response ||= TShield::RequestVCR.new(path, options.clone).response
+            api_response ||= TShield::RequestVCR.new(path, options.clone).vcr_response
             api_response.headers.reject! do |key, _v|
               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} "\
@@ -80,6 +82,7 @@ module TShield
           )
           TShield::Controllers::Helpers::SessionHelpers.update_session_call(request, callid, method)
 
+          delay(path)
           status api_response.status
           headers api_response.headers
           body api_response.body
@@ -98,6 +101,13 @@ module TShield
         def domain(path)
           @domain ||= configuration.get_domain_for(path)
         end
+
+        def delay(path)
+          delay_in_seconds = configuration.get_delay(domain(path), path) || 0
+          logger.info("Response with delay of #{delay_in_seconds} seconds")
+          sleep delay_in_seconds
+        end
+
       end
     end
   end

data/lib/tshield/controllers/sessions.rb

@@ -23,6 +23,9 @@ module TShield
       end
 
       def self.register_post(app, session_path)
+        app.post "#{session_path}/append" do
+          TShield::Sessions.append(request.ip, params[:name]).to_json
+        end
         app.post session_path do
           TShield::Sessions.start(request.ip, params[:name]).to_json
         end

data/lib/tshield/errors.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class AppendSessionWithoutMainSessionError < RuntimeError
+end

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,82 @@
 # 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 =~ /ipv6:\[(.+?)\]|ipv4:(.+?):/
+        peer = Regexp.last_match(1) || Regexp.last_match(2)
+
+        TShield.logger.info("request from #{parameters.peer}")
+        @session = TShield::Sessions.current(peer)
+
+        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/matching/filters.rb

@@ -8,6 +8,14 @@ module TShield
         result = filter_stubs(stubs[@options[:session]] || {})
         return result if result
 
+        find_in_secondary_sessions(stubs, @options[:secondary_sessions] || [])
+      end
+
+      def find_in_secondary_sessions(stubs, sessions)
+        sessions.each do |session|
+          result = filter_stubs(stubs[session] || {})
+          return result if result
+        end
         filter_stubs(stubs[DEFAULT_SESSION] || {}) unless @options[:session] == DEFAULT_SESSION
       end
 

data/lib/tshield/request.rb

@@ -13,8 +13,8 @@ module TShield
 
     protected
 
-    def session_destiny(request_path)
-      session = @options[:session]
+    def session_destiny(request_path, current_session = nil)
+      session = current_session || @options[:session]
       return request_path unless session
 
       request_path = File.join(request_path, session)
@@ -22,19 +22,19 @@ module TShield
       request_path
     end
 
-    def content_destiny
-      "#{destiny}.content"
+    def content_destiny(current_session = nil)
+      "#{destiny(current_session)}.content"
     end
 
-    def headers_destiny
-      "#{destiny}.json"
+    def headers_destiny(current_session = nil)
+      "#{destiny(current_session)}.json"
     end
 
-    def destiny
+    def destiny(current_session = nil)
       request_path = File.join('requests')
       Dir.mkdir(request_path) unless File.exist?(request_path)
 
-      request_path = session_destiny(request_path)
+      request_path = session_destiny(request_path, current_session)
 
       name_path = File.join(request_path, name)
       Dir.mkdir(name_path) unless File.exist?(name_path)

data/lib/tshield/request_matching.rb

@@ -29,6 +29,7 @@ module TShield
 
       @matched = current_response
 
+      sleep matched['delay'] || 0
       TShield::Response.new(self.class.read_body(matched['body']),
                             matched['headers'],
                             matched['status'])

data/lib/tshield/request_vcr.rb

@@ -2,11 +2,11 @@
 
 require 'httparty'
 require 'json'
-require 'byebug'
 
 require 'digest/sha1'
 
 require 'tshield/configuration'
+require 'tshield/logger'
 require 'tshield/options'
 require 'tshield/request'
 require 'tshield/response'
@@ -14,6 +14,8 @@ require 'tshield/response'
 module TShield
   # Module to write and read saved responses
   class RequestVCR < TShield::Request
+    attr_reader :vcr_response
+
     def initialize(path, options = {})
       super()
       @path = path
@@ -35,27 +37,31 @@ module TShield
         _method, @url, @options = filter.new.filter(method, @url, @options)
       end
 
-      if exists
-        response.original = false
-        resp = response
+      in_session = find_in_sessions
+      if in_session
+        # TODO: create concept of global session in vcr
+        in_session = nil if in_session == 'global'
+        @vcr_response = response(in_session)
+        @vcr_response.original = false
       else
+        TShield.logger.info("calling original service for request with options #{@options}")
         raw = HTTParty.send(method.to_s, @url, @options)
 
         original_response = save(raw)
         original_response.original = true
-        resp = original_response
+        @vcr_response = original_response
       end
 
       configuration.get_after_filters(domain).each do |filter|
-        resp = filter.new.filter(resp)
+        @vcr_response = filter.new.filter(@vcr_response)
       end
-      resp
     end
 
-    def response
-      @response ||= TShield::Response.new(saved_content['body'],
-                                          saved_content['headers'] || [],
-                                          saved_content['status'] || 200)
+    def response(session)
+      response_content = saved_content(session)
+      TShield::Response.new(response_content['body'],
+                            response_content['headers'] || [],
+                            response_content['status'] || 200)
     end
 
     private
@@ -89,20 +95,27 @@ module TShield
       TShield::Response.new(raw_response.body, headers, raw_response.code)
     end
 
-    def saved_content
-      return @saved_content if @saved_content
-
-      @saved_content = JSON.parse(File.open(headers_destiny).read)
-      @saved_content['body'] = File.open(content_destiny).read unless @saved_content['body']
-      @saved_content
+    def saved_content(session)
+      content = JSON.parse(File.open(headers_destiny(session)).read)
+      content['body'] = File.open(content_destiny(session)).read unless content['body']
+      content
     end
 
-    def file_exists
-      File.exist?(content_destiny)
+    def file_exists(session)
+      File.exist?(content_destiny(session))
     end
 
-    def exists
-      file_exists && configuration.cache_request?(domain)
+    def find_in_sessions
+      in_session = nil
+
+      ([@options[:session]] + (@options[:secondary_sessions] || [])).each do |session|
+        if file_exists(session) && configuration.cache_request?(domain)
+          in_session = (session || 'global')
+          break
+        end
+        TShield.logger.info("saved response not found in #{session}")
+      end
+      in_session
     end
 
     def key
@@ -127,9 +140,9 @@ module TShield
       if url.size > 225
         path = url.gsub(/(\?.*)/, '')
         params = Digest::SHA1.hexdigest Regexp.last_match(1)
-        "#{path.gsub(%r{/}, '-').gsub(/^-/, '')}?#{params}"
+        "#{path.gsub(%r{/}, '-').gsub(/^-/, '')}#{configuration.get_questionmark_char}#{params}"
       else
-        url.gsub(%r{/}, '-').gsub(/^-/, '')
+        url.gsub(%r{/}, '-').gsub(/^-/, '').gsub('?', configuration.get_questionmark_char)
       end
     end
   end

data/lib/tshield/sessions.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'byebug'
+require 'tshield/logger'
 require 'tshield/counter'
+require 'tshield/errors'
 
 module TShield
   # Manage sessions
@@ -9,17 +10,34 @@ module TShield
   # Start and stop session for ip
   module Sessions
     def self.start(ip, name)
-      sessions[normalize_ip(ip)] = { name: name, counter: TShield::Counter.new }
+      TShield.logger.info("starting session #{name} for ip #{normalize_ip(ip)}")
+      sessions[normalize_ip(ip)] = {
+        name: name,
+        counter: TShield::Counter.new,
+        secondary_sessions: []
+      }
     end
 
     def self.stop(ip)
+      TShield.logger.info("stoping session for ip #{normalize_ip(ip)}")
       sessions[normalize_ip(ip)] = nil
     end
 
     def self.current(ip)
+      TShield.logger.info("fetching session for ip #{normalize_ip(ip)}")
       sessions[normalize_ip(ip)]
     end
 
+    def self.append(ip, name)
+      TShield.logger.info("appeding session #{name} for ip #{normalize_ip(ip)}")
+
+      current_session = sessions[normalize_ip(ip)]
+      raise AppendSessionWithoutMainSessionError, "not found main session for #{ip}" unless current_session
+
+      current_session[:secondary_sessions] << name
+      current_session
+    end
+
     def self.sessions
       @sessions ||= {}
     end

data/lib/tshield/version.rb

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

data/spec/tshield/configuration_spec.rb

@@ -64,6 +64,33 @@ describe TShield::Configuration do
         expect(@configuration.get_domain_for('/api/four')).to be_nil
       end
     end
+
+    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 })
+        TShield::Configuration.clear
+        @configuration = TShield::Configuration.singleton
+
+        expect(@configuration.get_questionmark_char).to eq('%3f')
+      end
+
+      it 'should be compatible with Unix when configuration is false' do
+        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('?')
+      end
+
+      it 'should be compatible with Unix when configuration is missing' do
+        allow(YAML).to receive(:safe_load).and_return({})
+        TShield::Configuration.clear
+        @configuration = TShield::Configuration.singleton
+
+        expect(@configuration.get_questionmark_char).to eq('?')
+      end
+
+    end
   end
   context 'on config not exist' do
     before :each do

data/spec/tshield/fixtures/matching/example.json

@@ -99,5 +99,17 @@
         "body": "body content in session"
       }
     }]
+  },
+  {
+    "session": "second-session",
+    "stubs": [{
+      "method": "GET",
+      "path": "/matching/second-example",
+      "response": {
+        "status": 200,
+        "headers": {},
+        "body": "body content in second-session"
+      }
+    }]
   }
 ]

data/spec/tshield/request_matching_spec.rb

@@ -235,6 +235,18 @@ describe TShield::RequestMatching do
           expect(@response.headers).to eql({})
           expect(@response.status).to eql(201)
         end
+        context 'with secondary session' do
+          it 'should return response object from session settings' do
+            @request_matching = TShield::RequestMatching.new('/matching/second-example',
+                                                             method: 'GET',
+                                                             session: 'a-session',
+                                                             secondary_sessions: ['second-session'])
+            @response = @request_matching.match_request
+            expect(@response.body).to eql('body content in second-session')
+            expect(@response.headers).to eql({})
+            expect(@response.status).to eql(200)
+          end
+        end
       end
     end
   end

data/spec/tshield/request_vcr_spec.rb

@@ -62,6 +62,8 @@ describe TShield::RequestVCR do
           }
         )
 
+        allow(@configuration).to receive(:get_questionmark_char).and_return('?')
+
         allow(HTTParty).to receive(:send).and_return(RawResponse.new)
         file_double = double
 
@@ -83,6 +85,53 @@ describe TShield::RequestVCR do
                                 method: 'GET',
                                 call: 0
       end
+
+      it 'should create response directory in windows standard' do
+
+        allow(@configuration).to receive(:domains).and_return(
+            'example.org' => {
+                'skip_query_params' => []
+            }
+        )
+
+        allow(@configuration).to receive(:get_questionmark_char).and_return('%3f')
+
+        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')
+        allow(File).to receive(:join)
+                           .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')
+
+        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)
+
+        expect(File).to receive('open')
+                            .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}")
+        expect(file_double).to receive(:close)
+        expect(file_double).to receive(:close)
+
+        TShield::RequestVCR.new '/',
+                                raw_query: 'param=value',
+                                method: 'GET',
+                                call: 0
+      end
+
+
     end
   end
 

data/spec/tshield/sessions_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'tshield/sessions'
+require 'spec_helper'
+
+describe TShield::Sessions do
+  context 'on append session' do
+    it 'should raise error if not has a main session' do
+      expect { TShield::Sessions.append 'ip', 'secondary-session' }
+        .to raise_error(AppendSessionWithoutMainSessionError)
+    end
+    it 'should append if has main session' do
+      TShield::Sessions.start 'ip', 'main-session'
+      result = TShield::Sessions.append 'ip', 'secondary-session'
+      expect(result[:secondary_sessions]).to include('secondary-session')
+    end
+  end
+end

data/tshield.gemspec

@@ -22,19 +22,18 @@ Gem::Specification.new do |s|
 
   s.test_files = Dir['spec/**/*']
 
-  s.required_ruby_version = '>= 2.3'
+  s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency('byebug', '~> 11.0', '>= 11.0.1')
   s.add_dependency('grpc', '~> 1.28', '>= 1.28.0')
   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('sinatra', '~> 1.4', '>= 1.4.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')
+  s.add_development_dependency('coveralls', '~> 0.8', '>= 0.8.23')
   s.add_development_dependency('cucumber', '~> 3.1', '>= 3.1.2')
-  s.add_development_dependency('guard', '~> 2.15', '>= 2.15.0')
+  s.add_development_dependency('guard', '~> 2.16', '>= 2.16.2')
   s.add_development_dependency('guard-rspec', '~> 4.7', '>= 4.7.3')
   s.add_development_dependency('rake', '>= 10.0', '~> 13.0')
   s.add_development_dependency('rdoc', '~> 6.0', '>= 6.0')
@@ -42,6 +41,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 3.5', '>= 3.5.0')
   s.add_development_dependency('rubocop', '~> 0.73.0', '>= 0.73.0')
   s.add_development_dependency('rubocop-rails', '~> 2.2.0', '>= 2.2.1')
-  s.add_development_dependency('simplecov', '~> 0.12', '>= 0.12.0')
+  s.add_development_dependency('simplecov', '~> 0.16', '>= 0.16.1')
   s.add_development_dependency('webmock', '~> 2.1', '>= 2.1.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tshield
 version: !ruby/object:Gem::Version
-  version: 0.11.17.0
+  version: 0.13.0.0
 platform: ruby
 authors:
 - Diego Rubin
@@ -9,106 +9,86 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '1.28'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.0.1
+        version: 1.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.0.1
-- !ruby/object:Gem::Dependency
-  name: grpc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !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.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.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.28'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.28.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.28'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.28.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !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
@@ -135,56 +115,62 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.23
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -209,22 +195,22 @@ dependencies:
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.15.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '2.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.16.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.15.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '2.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.16.2
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -269,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.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 - !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
@@ -369,42 +355,42 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 description: Proxy for mocks API responses
 email: rubin.diego@gmail.com
 executables:
@@ -426,6 +412,7 @@ files:
 - lib/tshield/controllers/requests.rb
 - lib/tshield/controllers/sessions.rb
 - lib/tshield/counter.rb
+- lib/tshield/errors.rb
 - lib/tshield/extensions/string_extensions.rb
 - lib/tshield/grpc.rb
 - lib/tshield/grpc/vcr.rb
@@ -452,6 +439,7 @@ files:
 - spec/tshield/options_spec.rb
 - spec/tshield/request_matching_spec.rb
 - spec/tshield/request_vcr_spec.rb
+- spec/tshield/sessions_spec.rb
 - tshield.gemspec
 homepage: https://github.com/diegorubin/tshield
 licenses:
@@ -465,28 +453,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Proxy for mocks API responses
 test_files:
 - spec/spec_helper.rb
-- spec/tshield/request_matching_spec.rb
-- spec/tshield/grpc_spec.rb
-- spec/tshield/configuration_spec.rb
 - spec/tshield/request_vcr_spec.rb
+- spec/tshield/sessions_spec.rb
 - spec/tshield/controllers/requests_spec.rb
+- spec/tshield/request_matching_spec.rb
+- spec/tshield/grpc_spec.rb
 - spec/tshield/options_spec.rb
-- spec/tshield/after_filter_spec.rb
-- spec/tshield/fixtures/matching/example.json
 - spec/tshield/fixtures/proto/test_services_pb.rb
 - spec/tshield/fixtures/filters/example_filter.rb
+- spec/tshield/fixtures/matching/example.json
 - spec/tshield/fixtures/config/tshield.yml
 - spec/tshield/fixtures/config/tshield-without-grpc.yml
+- spec/tshield/configuration_spec.rb
+- spec/tshield/after_filter_spec.rb