tshield 0.13.4.0 → 0.13.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66ce1246fb18f0ac3ca8988aa3dcbdaf6ac93f3605181bffd79ad0b831bf94c5
-  data.tar.gz: a640d69531493ef2c8513377b1671e51b9f2d231a0eeaf158b175526a42f45f9
+  metadata.gz: ab5c5057fe81ae295f572912c6955ce0ea0bd9be6b42fb515a7832fe3451459a
+  data.tar.gz: 9c785dc23adb245fdfcc416698c551f7a45eaa32b5892a2cabea708f16fa2859
 SHA512:
-  metadata.gz: ec4005538a4fdbe3352874f7485e8e60303ab2e8a51441621cd181d73dd236267d08d03363052632e794f1701e6de0eafaa9448a6ca8cabec7680505e1902234
-  data.tar.gz: 319ccdbccc47a05d783403de7fff5022f928520f18d1aedb06929de0b40f1d6a74e6db94219835f8e8edd15636acbc0ff3f3d2999a787446420fdda916e3bf12
+  metadata.gz: 58fd33ddf9e466af5882e6522612b2b0fa05c95f728578fe50b014dca0777357bf5ccfa17605a86309c5742cb828dd2e52eb9bb2839096f594e1e75fef80e81b
+  data.tar.gz: f085f1dcc7a3d861da1b28a0d07f3338f03dd5b27cdd234c283cecf0bce8a0dc66f26193755ea8f5b442cbf4953fb2bd4ce295f90257b76121ac7fdbcbdd38b0

data/lib/tshield/configuration.rb

@@ -65,6 +65,10 @@ module TShield
       nil
     end
 
+    def windows_compatibility?
+      windows_compatibility || false
+    end
+
     def get_headers(domain)
       (domains[domain] || {})['headers'] || {}
     end
@@ -109,10 +113,6 @@ 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 || {})

data/lib/tshield/grpc/vcr.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require 'tshield/configuration'
 require 'tshield/sessions'
 
 module TShield
   module Grpc
     module VCR
+      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)
@@ -31,6 +35,10 @@ module TShield
         response
       end
 
+      def encode_colon(value)
+        value.gsub(':','%3a')
+      end
+
       def saved_response(path)
         response_file = File.join(path, 'response')
         return false unless File.exist? response_file
@@ -58,6 +66,7 @@ module TShield
 
       def complete_path(module_name, method_name, request)
         @session_name = (@session || {})[:name]
+        module_name = @configuration.windows_compatibility? ? encode_colon(module_name) : module_name
         path = ['requests', 'grpc', @session_name, module_name, method_name.to_s, hexdigest(request)].compact
         path
       end

data/lib/tshield/request_vcr.rb

@@ -155,14 +155,23 @@ 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/version.rb

@@ -5,7 +5,7 @@ module TShield
   class Version
     MAJOR = 0
     MINOR = 13
-    PATCH = 4
+    PATCH = 5
     PRE = 0
 
     class << self

data/spec/tshield/configuration_spec.rb

@@ -71,7 +71,7 @@ describe TShield::Configuration do
         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
@@ -79,7 +79,7 @@ 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
 
       it 'should be compatible with Unix when configuration is missing' do
@@ -87,7 +87,7 @@ 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

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,14 +106,13 @@ 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' => []
             }
         )
 
-        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
@@ -150,7 +149,6 @@ describe TShield::RequestVCR do
                                 call: 0
       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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tshield
 version: !ruby/object:Gem::Version
-  version: 0.13.4.0
+  version: 0.13.5.0
 platform: ruby
 authors:
 - Diego Rubin
 - Eduardo Garcia
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -95,22 +95,22 @@ dependencies:
   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
@@ -435,9 +435,7 @@ files:
 - spec/tshield/fixtures/config/tshield-without-grpc.yml
 - spec/tshield/fixtures/config/tshield.yml
 - spec/tshield/fixtures/filters/example_filter.rb
-- spec/tshield/fixtures/matching/empty.json
 - spec/tshield/fixtures/matching/example.json
-- spec/tshield/fixtures/matching/invalid_matching_file.json
 - spec/tshield/fixtures/proto/test_services_pb.rb
 - spec/tshield/grpc_spec.rb
 - spec/tshield/options_spec.rb
@@ -449,7 +447,7 @@ homepage: https://github.com/diegorubin/tshield
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -464,26 +462,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Proxy for mocks API responses
 test_files:
-- spec/tshield/options_spec.rb
 - spec/tshield/controllers/requests_spec.rb
-- spec/tshield/configuration_spec.rb
 - spec/tshield/after_filter_spec.rb
-- spec/tshield/request_vcr_spec.rb
-- spec/tshield/sessions_spec.rb
-- spec/tshield/request_matching_spec.rb
-- spec/tshield/grpc_spec.rb
+- spec/tshield/configuration_spec.rb
+- spec/tshield/fixtures/proto/test_services_pb.rb
 - spec/tshield/fixtures/config/tshield-without-grpc.yml
-- spec/tshield/fixtures/config/tshield.yml
 - spec/tshield/fixtures/config/tshield-with-send-content-type-header_as_false.yml
+- spec/tshield/fixtures/config/tshield.yml
 - spec/tshield/fixtures/config/tshield-with-send-content-type-header.yml
-- spec/tshield/fixtures/proto/test_services_pb.rb
-- spec/tshield/fixtures/filters/example_filter.rb
-- spec/tshield/fixtures/matching/empty.json
-- spec/tshield/fixtures/matching/invalid_matching_file.json
 - spec/tshield/fixtures/matching/example.json
+- spec/tshield/fixtures/filters/example_filter.rb
+- spec/tshield/request_vcr_spec.rb
+- spec/tshield/sessions_spec.rb
+- spec/tshield/grpc_spec.rb
+- spec/tshield/options_spec.rb
+- spec/tshield/request_matching_spec.rb
 - spec/spec_helper.rb

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

@@ -1 +0,0 @@
-[]