tshield 0.11.8.0 → 0.11.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f5af220b6e8aed08b79c006af7975d48416a651c24345b30d20ac7db67e5ca
-  data.tar.gz: a1cc446bac420e431ec099b027c624e33bb5bcd8291605bdd6876d5aaa04b0b7
+  metadata.gz: 8500d36e8b1861611e519cc93e40f176622a24d890f73615fa9852d83b12d530
+  data.tar.gz: e5e8dcccd4a31ba89cba70c328f533c1128fb7a8917fdcdec5bbb74cd6832b08
 SHA512:
-  metadata.gz: c4bcbfd8ce65cac9dfb6db41879f9237b6aa26b865b5fb9fee27423ea2352a81d5bf713812b2699d5656df933f2bfe96546ad5cd767b0177cf41226dfc7e2539
-  data.tar.gz: 18b671f8d124aa3237051ed9e516054ddb466510a192107c9016cdba8e11111d770e1603e788daa13218ec8f02dac13d73b14e6a4da7c19463805b0c9431758c
+  metadata.gz: 4780911e56839db9afd8a28dbc5759e3cd1d8a604c195c8f5921258cf0bcddf0d8042764e775b871088ac41b0791f14109ed8538c9ad5f991be35a225098c989
+  data.tar.gz: 65ce05ffd2f63a68de6e91d9f34d2fe057376f32cf860132d5aca54455a16f97987c90b8af0785d03006c0aaa72cf18f58bfe8e079e2571e8ba3d07e51ded190

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

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

data/lib/tshield/controllers/requests.rb

@@ -20,28 +20,10 @@ module TShield
           app.enable :logging
         end
 
-        app.get(PATHP) do
-          treat(params, request, response)
-        end
-
-        app.post(PATHP) do
-          treat(params, request, response)
-        end
-
-        app.put(PATHP) do
-          treat(params, request, response)
-        end
-
-        app.patch(PATHP) do
-          treat(params, request, response)
-        end
-
-        app.head(PATHP) do
-          treat(params, request, response)
-        end
-
-        app.delete(PATHP) do
-          treat(params, request, response)
+        %w[get post put patch head delete].each do |http_method|
+          app.send(http_method, PATHP) do
+            treat(params, request, response)
+          end
         end
       end
 
@@ -55,12 +37,14 @@ module TShield
 
         def treat(params, request, _response)
           path = params.fetch('captures', [])[0]
+          callid = "#{path}?#{request.env['QUERY_STRING']}"
 
           method = request.request_method
           request_content_type = request.content_type
+
           session_name = TShield::Controllers::Helpers::SessionHelpers.current_session_name(request)
           session_call = TShield::Controllers::Helpers::SessionHelpers
-                         .current_session_call(request, path, method)
+                         .current_session_call(request, callid, method)
 
           options = {
             method: method,
@@ -94,7 +78,7 @@ module TShield
             "content-type=#{request_content_type} "\
             "session=#{session_name} call=#{session_call}"
           )
-          TShield::Controllers::Helpers::SessionHelpers.update_session_call(request, path, method)
+          TShield::Controllers::Helpers::SessionHelpers.update_session_call(request, callid, method)
 
           status api_response.status
           headers api_response.headers
@@ -103,7 +87,7 @@ module TShield
 
         def add_headers(headers, path)
           (configuration.get_headers(domain(path)) || {}).each do |source, destiny|
-            headers[destiny] = request.env[source] unless request.env[source].nil?
+            headers[destiny] = request.env[source] if request.env[source]
           end
         end
 

data/lib/tshield/counter.rb

@@ -7,16 +7,16 @@ module TShield
       @requests = {}
     end
 
-    def add(path, method)
-      requests_to_path = @requests.fetch(path, {})
-      requests_to_method = requests_to_path.fetch(method, 0)
+    def add(callid, method)
+      requests_to_callid = @requests.fetch(callid, {})
+      requests_to_method = requests_to_callid.fetch(method, 0)
 
-      requests_to_path[method] = requests_to_method + 1
-      @requests[path] = requests_to_path
+      requests_to_callid[method] = requests_to_method + 1
+      @requests[callid] = requests_to_callid
     end
 
-    def current(path, method)
-      @requests.fetch(path, {}).fetch(method, 0)
+    def current(callid, method)
+      @requests.fetch(callid, {}).fetch(method, 0)
     end
 
     def to_json(options = {})

data/lib/tshield/server.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: false
 
 require 'sinatra'
-require 'haml'
 
 require 'tshield/options'
 require 'tshield/controllers/requests'

data/lib/tshield/version.rb

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

data/spec/tshield/controllers/requests_spec.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'tshield/controllers/requests'
+require 'spec_helper'
+
+# Class used to test helpers
+class MockController
+  include TShield::Controllers::Requests::Helpers
+  def initialize(mock_logger)
+    @mock_logger = mock_logger
+  end
+
+  def logger
+    @mock_logger
+  end
+
+  def status(_value); end
+
+  def headers(_value); end
+
+  def body(_value); end
+end
+
+describe TShield::Controllers::Requests do
+  before(:each) do
+    @mock_logger = double
+    @controller = MockController.new(@mock_logger)
+    allow(TShield::Controllers::Helpers::SessionHelpers).to receive(:current_session_call)
+  end
+  context 'on treat request' do
+    context 'on update session call' do
+      it 'should call update_session_call with query params' do
+        params = { 'captures' => ['/'] }
+
+        request = double
+        matcher = double
+        matched_response = double
+
+        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(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::Controllers::Helpers::SessionHelpers)
+          .to receive(:current_session_call).with(request, '/?a=b', 'GET')
+        expect(TShield::Controllers::Helpers::SessionHelpers)
+          .to receive(:update_session_call).with(request, '/?a=b', 'GET')
+
+        @controller.treat(params, request, nil)
+      end
+    end
+  end
+end

data/tshield.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.3'
 
   s.add_dependency('byebug', '~> 11.0', '>= 11.0.1')
-  s.add_dependency('haml', '~> 4.0', '>= 4.0.7')
   s.add_dependency('httparty', '~> 0.14', '>= 0.14.0')
   s.add_dependency('json', '~> 2.0', '>= 2.0')
   s.add_dependency('sinatra', '~> 1.4', '>= 1.4.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tshield
 version: !ruby/object:Gem::Version
-  version: 0.11.8.0
+  version: 0.11.9.0
 platform: ruby
 authors:
 - Diego Rubin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -31,26 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.0.1
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.7
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -381,6 +361,7 @@ files:
 - spec/spec_helper.rb
 - spec/tshield/after_filter_spec.rb
 - spec/tshield/configuration_spec.rb
+- spec/tshield/controllers/requests_spec.rb
 - spec/tshield/fixtures/config/tshield.yml
 - spec/tshield/fixtures/filters/example_filter.rb
 - spec/tshield/fixtures/matching/example.json
@@ -407,17 +388,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Proxy for mocks API responses
 test_files:
+- spec/spec_helper.rb
 - spec/tshield/options_spec.rb
 - spec/tshield/configuration_spec.rb
-- spec/tshield/request_matching_spec.rb
-- spec/tshield/fixtures/matching/example.json
-- spec/tshield/fixtures/config/tshield.yml
-- spec/tshield/fixtures/filters/example_filter.rb
 - spec/tshield/request_vcr_spec.rb
+- spec/tshield/controllers/requests_spec.rb
 - spec/tshield/after_filter_spec.rb
-- spec/spec_helper.rb
+- spec/tshield/fixtures/config/tshield.yml
+- spec/tshield/fixtures/matching/example.json
+- spec/tshield/fixtures/filters/example_filter.rb
+- spec/tshield/request_matching_spec.rb