tshield 0.11.4.0 → 0.11.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afd27837ea8b2aca8d06eea8726227d469761c386747df55befa5e0f27b01063
-  data.tar.gz: 5cf7e45011c49c97d27cdb71ad44c806aac90d3d7fd33c95163599293cf47c92
+  metadata.gz: 7581fed92c9b0af76120edc8d9a4b9eff62e1f37c8eafa6a33a5712e918382d6
+  data.tar.gz: '018a8ca426a9af1bc6e374461e6f4748673cecf24358b332fd6c30a5ec433028'
 SHA512:
-  metadata.gz: c029918be75df5ad240b64f96bf96538ec2f8625c13c8129622ed97ffc9d767dd7d32c719327c17d42e6aab159451dbe4100f59b0963f9ae304eadf3ad061c38
-  data.tar.gz: 56bb5d05bf3fce5d0b1cd18dbf814a45eb9335e5458f9d2df501fa7fce101ab3bb92507343150403b33dd598d26366e5a824a95c28bb0dc902628a9b5af313ef
+  metadata.gz: 8afb34fe21d6e9d8813c46c42e2c8d64908d9f72badd51bd11e1c92ea4b37b23e159cc03f2ad85932cceda146446db351f32b3167f5a52200df5af8df7cbaf59
+  data.tar.gz: 5bf25b51e864b9f4b89a05158e5532582f86f21ceca0e24e2dafce2c2eb37235867686ecd8514ee6cecc061f4dd3247d83113f11f24eca25b89e9027103a1519

data/lib/tshield/controllers/requests.rb

@@ -81,6 +81,9 @@ module TShield
             add_headers(headers, path)
 
             api_response ||= TShield::RequestVCR.new(path, options).response
+            api_response.headers.reject! do |key, _v|
+              configuration.get_excluded_headers(domain(path)).include?(key)
+            end
           end
 
           logger.info(
@@ -90,7 +93,7 @@ module TShield
           )
 
           status api_response.status
-          headers api_response.headers.reject { |k, _v| configuration.get_excluded_headers(domain(path)).include?(k) }
+          headers api_response.headers
           body api_response.body
         end
 

data/lib/tshield/matching/filters.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module TShield
+  module Matching
+    # Filters used in request matching
+    module Filters
+      def find_stub(stubs)
+        result = filter_stubs(stubs[@options[:session]] || {})
+        return result if result
+
+        filter_stubs(stubs[DEFAULT_SESSION] || {}) unless @options[:session] == DEFAULT_SESSION
+      end
+
+      def filter_by_method(stubs)
+        stubs.select { |stub| stub['method'] == @options[:method] }
+      end
+
+      def filter_by_headers(stubs)
+        stubs.select { |stub| Filters.include_headers(stub['headers'], @options[:headers]) }
+      end
+
+      def filter_by_query(stubs)
+        stubs.select { |stub| Filters.include_query(stub['query'], @options[:raw_query] || '') }
+      end
+
+      def filter_stubs(stubs)
+        result = filter_by_query(filter_by_headers(filter_by_method(stubs[@path] || [])))
+        result[0]['response'] unless result.empty?
+      end
+
+      def self.include_headers(stub_headers, request_headers)
+        request_headers ||= {}
+        stub_headers ||= {}
+        result = stub_headers.reject { |key, value| request_headers[key.to_rack_name] == value }
+        result.empty? || stub_headers.empty?
+      end
+
+      def self.include_query(stub_query, raw_query)
+        request_query = Filters.build_query_hash(raw_query)
+        stub_query ||= {}
+        result = stub_query.reject { |key, value| request_query[key] == value.to_s }
+        result.empty? || stub_query.empty?
+      end
+
+      def self.build_query_hash(raw_query)
+        params = {}
+        raw_query.split('&').each do |query|
+          key, value = query.split('=')
+          params[key] = value
+        end
+
+        params
+      end
+    end
+  end
+end

data/lib/tshield/request_matching.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'tshield/matching/filters'
 require 'tshield/request'
 
 DEFAULT_SESSION = 'no-session'
@@ -7,6 +8,8 @@ DEFAULT_SESSION = 'no-session'
 module TShield
   # Class to check request matching
   class RequestMatching
+    include TShield::Matching::Filters
+
     attr_reader :matched
 
     def initialize(path, options = {})
@@ -21,41 +24,14 @@ module TShield
     end
 
     def match_request
-      @matched = find_stub
+      @matched = find_stub(self.class.stubs)
       return unless matched
 
-      TShield::Response.new(matched['body'],
+      TShield::Response.new(self.class.read_body(matched['body']),
                             matched['headers'],
                             matched['status'])
     end
 
-    private
-
-    def find_stub
-      stubs = self.class.stubs
-      result = filter_stubs(stubs[@options[:session]] || {})
-      return result if result
-
-      filter_stubs(stubs[DEFAULT_SESSION] || {}) unless @options[:session] == DEFAULT_SESSION
-    end
-
-    def filter_by_method(stubs)
-      stubs.select { |stub| stub['method'] == @options[:method] }
-    end
-
-    def filter_by_headers(stubs)
-      stubs.select { |stub| self.class.include_headers(stub['headers'], @options[:headers]) }
-    end
-
-    def filter_by_query(stubs)
-      stubs.select { |stub| self.class.include_query(stub['query'], @options[:raw_query] || '') }
-    end
-
-    def filter_stubs(stubs)
-      result = filter_by_query(filter_by_headers(filter_by_method(stubs[@path] || [])))
-      result[0]['response'] unless result.empty?
-    end
-
     class << self
       attr_reader :stubs
 
@@ -98,28 +74,10 @@ module TShield
         stubs[session_name][item['path']] << item
       end
 
-      def include_headers(stub_headers, request_headers)
-        request_headers ||= {}
-        stub_headers ||= {}
-        result = stub_headers.reject { |key, value| request_headers[key.to_rack_name] == value }
-        result.empty? || stub_headers.empty?
-      end
-
-      def include_query(stub_query, raw_query)
-        request_query = build_query_hash(raw_query)
-        stub_query ||= {}
-        result = stub_query.reject { |key, value| request_query[key] == value.to_s }
-        result.empty? || stub_query.empty?
-      end
-
-      def build_query_hash(raw_query)
-        params = {}
-        raw_query.split('&').each do |query|
-          key, value = query.split('=')
-          params[key] = value
-        end
+      def read_body(content)
+        return content.to_json if content.is_a? Hash
 
-        params
+        content
       end
     end
   end

data/lib/tshield/version.rb

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

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

@@ -19,6 +19,19 @@
       "body": "body content"
     }
   },
+  {
+    "method": "GET",
+    "path": "/matching/example.json",
+    "response": {
+      "status": 200,
+      "headers": {
+        "Content-Type": "application/json"
+      },
+      "body": {
+        "json": "content"
+      }
+    }
+  },
   {
     "method": "POST",
     "path": "/matching/example",

data/spec/tshield/request_matching_spec.rb

@@ -102,6 +102,18 @@ describe TShield::RequestMatching do
           expect(@response.status).to eql(201)
         end
       end
+      context 'on match by path and returns json' do
+        before :each do
+          @request_matching = TShield::RequestMatching
+                              .new('/matching/example.json', method: 'GET')
+        end
+        it 'should return response object' do
+          @response = @request_matching.match_request
+          expect(@response.body).to eql('{"json":"content"}')
+          expect(@response.headers).to eql('Content-Type' => 'application/json')
+          expect(@response.status).to eql(200)
+        end
+      end
       context 'on match by path and method and query' do
         before :each do
           @request_matching = TShield::RequestMatching

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tshield
 version: !ruby/object:Gem::Version
-  version: 0.11.4.0
+  version: 0.11.5.0
 platform: ruby
 authors:
 - Diego Rubin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -354,6 +354,7 @@ files:
 - lib/tshield/counter.rb
 - lib/tshield/extensions/string_extensions.rb
 - lib/tshield/logger.rb
+- lib/tshield/matching/filters.rb
 - lib/tshield/options.rb
 - lib/tshield/request.rb
 - lib/tshield/request_matching.rb