webspicy 0.20.20 → 0.20.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1540c9120b24bed9351dc01d8906cad2f4ffac8ea478c4e5cdf23ec48e3439d
-  data.tar.gz: a188f120ff0bed71f12ed525916ccafdb89e1c62d9fe6e5fc8acc1e7576d1e40
+  metadata.gz: 358d398af31550346d16e0b0aea1fbdbbdb6d9b6097adc0f53642faf73605447
+  data.tar.gz: 73bbb61d76edb81151a2d201b51a8e509d79728145a524f04a33bb80696ced46
 SHA512:
-  metadata.gz: 582f993602ffec966ee10e7339806ce747acb5b6f93a89a9427687bb4ce098200a33fd99db9adf4fd70575177b25f07b2a3a9014f3513a17a261e0a62c797b3e
-  data.tar.gz: 1d42856145ee337d16bfdf85c2e94eaa8b144d8e089b9cadc4d71e607bf023ed9856d229169ca511f80111350255133f1c1c5e6c6a66cea490eff4e2d2ae5a49
+  metadata.gz: 641ccd34d62b106ac983ed192fb54f313dfd03a1a068a95018e84fdb840a0e54dfa3d410617a2fb357519eebd344e3f179e7cdac0cc7ae61b43b51a770f32284
+  data.tar.gz: f9ed1ae27dbaae00369437622f04610391225ce39c19636e430cb5e10f1606a52b50582aa01a83a611aee61aab673a4eb67f94d340f21906924409020713f886

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/reporter/documentation.rb

@@ -51,16 +51,14 @@ module Webspicy
         end
 
         def before_service
-          @spec_file_line_printed = false
+          @test_case_seen = false
         end
 
         def before_test_case
-          unless @spec_file_line_printed
-            io.puts spec_file_line(spec_file)
-            io.puts
-            io.flush
-            @spec_file_line_printed = true
-          end
+          @test_case_seen = true
+          io.puts spec_file_line(spec_file)
+          io.puts
+          io.flush
           io.puts service_line(service, test_case)
           io.flush
         end
@@ -86,10 +84,8 @@ module Webspicy
         end
 
         def service_done
-          unless @spec_file_line_printed
-            io.puts
-            io.flush
-          end
+          io.puts if @test_case_seen
+          io.flush
         end
 
       end # class Documentation

data/lib/webspicy/version.rb

@@ -2,7 +2,7 @@ module Webspicy
   module Version
     MAJOR = 0
     MINOR = 20
-    TINY  = 20
+    TINY  = 24
   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.20
+  version: 0.20.24
 platform: ruby
 authors:
 - Bernard Lambeau
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 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.4
-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: []