webspicy 0.20.19 → 0.20.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945c9e5371700999a464707064c86a64b7eba56efa9deb37583f6fc79bdbff08
-  data.tar.gz: e43c3f9b747e543925ae6a26ab618884b8811a883b155bbadd9546859fe7c962
+  metadata.gz: 81d8ffb7aa9875416729a3b6226e621ea4140d4f30cc4852444c43ca8fbe5eb3
+  data.tar.gz: 8fa3e5471c7d732d21668ec99dfad7aa9fdb820f2e6fb41d180076206848c697
 SHA512:
-  metadata.gz: f26bb8fe6e18a393d5510faae5d6e5ef75b22c59ea32e64679509895659ffa94f5fc061144de9f4738584451db9ccf0cee72180b64cc5a4da1e7890f0fd9d905
-  data.tar.gz: 3b1abd5001586434b8f79bd1d6f5edf79a4828273e155b528f49bc24f2c0eb5d866b5e9c60d825588e03c8e88c46d59337e31f26ad2a01af0cf3d8787a3bd083
+  metadata.gz: 07c62996f90df9ed4b7665712154edb3b0e9c59cdd25bea7c46520b0d4979a3e0c5cd127e0ac8bd2c08f060730d0f0f43609cc3d802b67a129e315eee0877568
+  data.tar.gz: a40f2056c7284919b4ef5aa520a7bafb07af8456737bf7944a51981fb44ac9d56389ea777ff51e0b8861bd2c8d43923bf6814784e80399775d9c123366d99f76

data/lib/webspicy/configuration/scope.rb

@@ -136,20 +136,13 @@ module Webspicy
 
         def expand_example(service, example)
           return example unless service.default_example
-          h1 = service.default_example.to_info
-          h2 = example.to_info
-          ex = config.factory.test_case(merge_maps(h1, h2), self)
-          ex.bind(service, example.counterexample?)
-        end
 
-        def merge_maps(h1, h2)
-          h1.merge(h2) do |k,v1,v2|
-            case v1
-            when Hash  then merge_maps(v1, v2)
-            when Array then v1 + v2
-            else v2
-            end
-          end
+          merged = Support::DeepMerge.deep_merge(
+            service.default_example.to_info,
+            example.to_info
+          )
+          ex = config.factory.test_case(merged, self)
+          ex.bind(service, example.counterexample?)
         end
 
         # Returns a proc that implements file_filter strategy according to the

data/lib/webspicy/support/deep_merge.rb

@@ -0,0 +1,36 @@
+module Webspicy
+  module Support
+    class DeepMerge
+      class << self
+
+        def deep_merge(h1, h2)
+          merge_maps(deep_dup(h1), deep_dup(h2))
+        end
+
+        def deep_dup(x)
+          case x
+          when Array
+            x.map{|y| deep_dup(y) }
+          when Hash
+            x.each_with_object({}){|(k,v),memo| memo[k] = deep_dup(v) }
+          else
+            x
+          end
+        end
+
+        private
+
+        def merge_maps(h1, h2)
+          h1.merge(h2) do |k,v1,v2|
+            case v1
+            when Hash  then merge_maps(v1, v2)
+            when Array then v1 + v2
+            else v2
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/webspicy/support.rb

@@ -28,6 +28,7 @@ module Webspicy
   end # module Support
 end # module Webspicy
 require_relative 'support/data_object'
+require_relative 'support/deep_merge'
 require_relative 'support/status_range'
 require_relative 'support/colorize'
 require_relative 'support/world'

data/lib/webspicy/tester/fakesmtp/email.rb

@@ -32,10 +32,10 @@ module Webspicy
         end
 
         def subject
-          @subject ||= data["headerLines"]
-            .select{|h| h["key"] == "subject" }
-            .map{|h| h["line"][/Subject:\s*(.*)$/, 1] }
-            .first
+          @subject ||= data["subject"] || data["headerLines"]
+              .select{|h| h["key"] == "subject" }
+              .map{|h| h["line"][/Subject:\s*(.*)$/, 1] }
+              .first
         end
 
         def headers

data/lib/webspicy/version.rb

@@ -2,7 +2,7 @@ module Webspicy
   module Version
     MAJOR = 0
     MINOR = 20
-    TINY  = 19
+    TINY  = 23
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/lib/webspicy/web/client/rack_test_client.rb

@@ -96,14 +96,16 @@ module Webspicy
         end
 
         def post(url, params = {}, headers = nil, body = nil)
-          handler = get_handler(headers)
-
           url = url + "?" + Rack::Utils.build_query(params) if body && !params.empty?
+          headers = {
+            "Content-Type" => "application/json"
+          }.merge(headers || {}) if body.nil?
+          handler = get_handler(headers)
 
           case body
           when NilClass
             info_request("POST", url, params, headers, body)
-            handler.post(url, params.to_json, {"CONTENT_TYPE" => "application/json"})
+            handler.post(url, params.to_json, headers)
           when FileUpload
             file = Rack::Test::UploadedFile.new(body.path, body.content_type)
             info_request("POST", url, params, headers, body)

data/spec/unit/support/test_deep_merge.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+module Webspicy
+  module Support
+    describe DeepMerge, 'deep_dup' do
+      it 'works on scalars' do
+        expect(DeepMerge.deep_dup(12)).to eql(12)
+      end
+
+      it 'works on arrays' do
+        xs = [1, 2, 3]
+        expect(DeepMerge.deep_dup(xs)).to eql(xs)
+        expect(DeepMerge.deep_dup(xs)).not_to be(xs)
+      end
+
+      it 'works on hashes' do
+        xs = { foo: "bar" }
+        expect(DeepMerge.deep_dup(xs)).to eql(xs)
+        expect(DeepMerge.deep_dup(xs)).not_to be(xs)
+      end
+
+      it 'works recursively' do
+        xs = { foo: { bar: [1, 2, 3] } }
+        got = DeepMerge.deep_dup(xs)
+        expect(got[:foo]).not_to be(xs[:foo])
+        expect(got[:foo][:bar]).not_to be(xs[:foo][:bar])
+      end
+    end
+    describe DeepMerge, 'deep_merge' do
+      it 'works as expected' do
+        h1 = { foo: { bar: "baz" }, times: [1, 2], only: { me: true } }
+        h2 = { foo: { bor: "boz" }, times: [3, 4], not: { you: false } }
+        expected = {
+          foo: { bar: "baz", bor: "boz" },
+          times: [1, 2, 3, 4],
+          only: { me: true },
+          not: { you: false }
+        }
+        got = DeepMerge.deep_merge(h1, h2)
+        expect(got).to eql(expected)
+        expect(got[:only]).not_to be(h1[:only])
+        expect(got[:not]).not_to be(h2[:not])
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.20.19
+  version: 0.20.23
 platform: ruby
 authors:
 - Bernard Lambeau
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,16 +84,22 @@ dependencies:
   name: finitio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +287,7 @@ files:
 - lib/webspicy/support.rb
 - lib/webspicy/support/colorize.rb
 - lib/webspicy/support/data_object.rb
+- lib/webspicy/support/deep_merge.rb
 - lib/webspicy/support/hooks.rb
 - lib/webspicy/support/status_range.rb
 - lib/webspicy/support/world.rb
@@ -348,6 +355,7 @@ files:
 - spec/unit/support/hooks/test_fire_after_each.rb
 - spec/unit/support/hooks/test_fire_around.rb
 - spec/unit/support/hooks/test_fire_before_each.rb
+- spec/unit/support/test_deep_merge.rb
 - spec/unit/support/test_status_range.rb
 - spec/unit/support/world/fixtures/array.json
 - spec/unit/support/world/fixtures/queue.rb
@@ -371,7 +379,7 @@ homepage: http://github.com/enspirit/webspicy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -386,8 +394,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.2.32
+signing_key: 
 specification_version: 4
 summary: Webspicy helps testing web services as software operation black boxes!
 test_files: []