From 9cbb5d2cf74410b5ac2f408a75b46be5708ee4fc Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Mon, 27 Mar 2023 18:37:50 -0600
Subject: [PATCH 01/15] Workaround issue using Box with union

Addresses issue found relating to https://gitlab.com/arctic-fox/spectator/-/issues/81
See https://github.com/crystal-lang/crystal/issues/11839
---
 CHANGELOG.md             |  2 ++
 src/spectator/wrapper.cr | 29 ++++++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17b7220..325b7c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fix memoized value (`let`) with a union type causing segfault. [#81](https://gitlab.com/arctic-fox/spectator/-/issues/81)
 
 ## [0.11.6] - 2023-01-26
 ### Added
diff --git a/src/spectator/wrapper.cr b/src/spectator/wrapper.cr
index 9874dec..76f6f44 100644
--- a/src/spectator/wrapper.cr
+++ b/src/spectator/wrapper.cr
@@ -13,18 +13,13 @@ module Spectator
 
     # Creates a wrapper for the specified value.
     def initialize(value)
-      @pointer = Box.box(value)
+      @pointer = Value.new(value).as(Void*)
     end
 
     # Retrieves the previously wrapped value.
     # The *type* of the wrapped value must match otherwise an error will be raised.
     def get(type : T.class) : T forall T
-      {% begin %}
-        {% if T.nilable? %}
-          @pointer.null? ? nil :
-        {% end %}
-        Box(T).unbox(@pointer)
-      {% end %}
+      @pointer.unsafe_as(Value(T)).get
     end
 
     # Retrieves the previously wrapped value.
@@ -39,12 +34,20 @@ module Spectator
     # type = wrapper.get { Int32 } # Returns Int32
     # ```
     def get(& : -> T) : T forall T
-      {% begin %}
-        {% if T.nilable? %}
-          @pointer.null? ? nil :
-        {% end %}
-        Box(T).unbox(@pointer)
-      {% end %}
+      @pointer.unsafe_as(Value(T)).get
+    end
+
+    # Wrapper for a value.
+    # Similar to `Box`, but doesn't segfault on nil and unions.
+    private class Value(T)
+      # Creates the wrapper.
+      def initialize(@value : T)
+      end
+
+      # Retrieves the value.
+      def get : T
+        @value
+      end
     end
   end
 end

From 04f151fddf7ea1c6b2479eee8c8a22461bc0b9f0 Mon Sep 17 00:00:00 2001
From: Stuart Frost <stuart.2.frost@bt.com>
Date: Fri, 19 May 2023 19:39:22 +0100
Subject: [PATCH 02/15] Fix mocking example in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 973b9a9..323b4ca 100644
--- a/README.md
+++ b/README.md
@@ -287,7 +287,7 @@ Spectator.describe Driver do
     # Call the mock method.
     subject.do_something(interface, dbl)
     # Verify everything went okay.
-    expect(interface).to have_received(:invoke).with(thing)
+    expect(interface).to have_received(:invoke).with(dbl)
   end
 end
 ```

From 4a630b1ebf1ea4324b3c4f0230376783ce5a92a1 Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Mon, 16 Oct 2023 17:34:49 -0600
Subject: [PATCH 03/15] Bump version to v0.11.7

---
 CHANGELOG.md | 5 +++--
 shard.yml    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 325b7c5..4e23272 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.11.7] - 2023-10-16
 ### Fixed
 - Fix memoized value (`let`) with a union type causing segfault. [#81](https://gitlab.com/arctic-fox/spectator/-/issues/81)
 
@@ -450,7 +450,8 @@ This has been changed so that it compiles and raises an error at runtime with a
 First version ready for public use.
 
 
-[Unreleased]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.6...master
+[Unreleased]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.7...master
+[0.11.7]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.6...v0.11.7
 [0.11.6]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.5...v0.11.6
 [0.11.5]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.4...v0.11.5
 [0.11.4]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.3...v0.11.4
diff --git a/shard.yml b/shard.yml
index 06ba936..78ab190 100644
--- a/shard.yml
+++ b/shard.yml
@@ -1,5 +1,5 @@
 name: spectator
-version: 0.11.6
+version: 0.11.7
 description: |
   Feature-rich testing framework for Crystal inspired by RSpec.
 

From 5520999b6d7619985a93935faf546667f54289ad Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Sat, 27 Jan 2024 11:16:57 -0700
Subject: [PATCH 04/15] Add spec for GitHub issue 55

https://github.com/icy-arctic-fox/spectator/issues/55
---
 spec/issues/github_issue_55_spec.cr | 48 +++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 spec/issues/github_issue_55_spec.cr

diff --git a/spec/issues/github_issue_55_spec.cr b/spec/issues/github_issue_55_spec.cr
new file mode 100644
index 0000000..92c2b42
--- /dev/null
+++ b/spec/issues/github_issue_55_spec.cr
@@ -0,0 +1,48 @@
+require "../spec_helper"
+
+Spectator.describe "GitHub Issue #55" do
+  GROUP_NAME = "CallCenter"
+
+  let(name) { "TimeTravel" }
+  let(source) { "my.time.travel.experiment" }
+
+  class Analytics(T)
+    property start_time = Time.local
+    property end_time = Time.local
+
+    def initialize(@brain_talker : T)
+    end
+
+    def instrument(*, name, source, &)
+      @brain_talker.send(payload: {
+        :group  => GROUP_NAME,
+        :name   => name,
+        :source => source,
+        :start  => start_time,
+        :end    => end_time,
+      }, action: "analytics")
+    end
+  end
+
+  double(:brain_talker, send: nil)
+
+  let(brain_talker) { double(:brain_talker) }
+  let(analytics) { Analytics.new(brain_talker) }
+
+  it "tracks the time it takes to run the block" do
+    analytics.start_time = expected_start_time = Time.local
+    expected_end_time = expected_start_time + 10.seconds
+    analytics.end_time = expected_end_time + 0.5.seconds # Offset to ensure non-exact match.
+
+    analytics.instrument(name: name, source: source) do
+    end
+
+    expect(brain_talker).to have_received(:send).with(payload: {
+      :group  => GROUP_NAME,
+      :name   => name,
+      :source => source,
+      :start  => expected_start_time,
+      :end    => be_within(1.second).of(expected_end_time),
+    }, action: "analytics")
+  end
+end

From b5fbc96195031cdcb2658dd0a324e4e73c0b6f9a Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Sat, 27 Jan 2024 11:17:19 -0700
Subject: [PATCH 05/15] Allow matchers to be used in case equality

---
 src/spectator/matchers/matcher.cr | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/spectator/matchers/matcher.cr b/src/spectator/matchers/matcher.cr
index e54e55e..05adb81 100644
--- a/src/spectator/matchers/matcher.cr
+++ b/src/spectator/matchers/matcher.cr
@@ -1,3 +1,4 @@
+require "../value"
 require "./match_data"
 
 module Spectator::Matchers
@@ -22,6 +23,19 @@ module Spectator::Matchers
     # A successful match with `#match` should normally fail for this method, and vice-versa.
     abstract def negated_match(actual : Expression(T)) : MatchData forall T
 
+    # Compares a matcher against a value.
+    # Enables composable matchers.
+    def ===(actual : Expression(T)) : Bool
+      match(actual).matched?
+    end
+
+    # Compares a matcher against a value.
+    # Enables composable matchers.
+    def ===(other) : Bool
+      expression = Value.new(other)
+      match(expression).matched?
+    end
+
     private def match_data_description(actual : Expression(T)) : String forall T
       match_data_description(actual.label)
     end

From 556d4783bf3669cba6fab53db3ea42edba7981f4 Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Sat, 27 Jan 2024 11:18:10 -0700
Subject: [PATCH 06/15] Support case equality of tuples, arrays, named tuples,
 and hashes in stub argument matching

---
 src/spectator/mocks/abstract_arguments.cr | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/spectator/mocks/abstract_arguments.cr b/src/spectator/mocks/abstract_arguments.cr
index 442c1d2..fd9bac9 100644
--- a/src/spectator/mocks/abstract_arguments.cr
+++ b/src/spectator/mocks/abstract_arguments.cr
@@ -7,7 +7,7 @@ module Spectator
     end
 
     # Utility method for comparing two tuples considering special types.
-    private def compare_tuples(a : Tuple, b : Tuple)
+    private def compare_tuples(a : Tuple | Array, b : Tuple | Array)
       return false if a.size != b.size
 
       a.zip(b) do |a_value, b_value|
@@ -18,14 +18,14 @@ module Spectator
 
     # Utility method for comparing two tuples considering special types.
     # Supports nilable tuples (ideal for splats).
-    private def compare_tuples(a : Tuple?, b : Tuple?)
+    private def compare_tuples(a : Tuple? | Array?, b : Tuple? | Array?)
       return false if a.nil? ^ b.nil?
 
       compare_tuples(a.not_nil!, b.not_nil!)
     end
 
     # Utility method for comparing two named tuples ignoring order.
-    private def compare_named_tuples(a : NamedTuple, b : NamedTuple)
+    private def compare_named_tuples(a : NamedTuple | Hash, b : NamedTuple | Hash)
       a.each do |k, v1|
         v2 = b.fetch(k) { return false }
         return false unless compare_values(v1, v2)
@@ -50,6 +50,18 @@ module Spectator
         else
           a == b
         end
+      when Tuple, Array
+        if b.is_a?(Tuple) || b.is_a?(Array)
+          compare_tuples(a, b)
+        else
+          a === b
+        end
+      when NamedTuple, Hash
+        if b.is_a?(NamedTuple) || b.is_a?(Hash)
+          compare_named_tuples(a, b)
+        else
+          a === b
+        end
       else
         a === b
       end

From 526a998e4183e3d24621d7413d44eae91003e8be Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Sat, 27 Jan 2024 11:25:25 -0700
Subject: [PATCH 07/15] Shorten compare_values case statements

---
 src/spectator/mocks/abstract_arguments.cr | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/spectator/mocks/abstract_arguments.cr b/src/spectator/mocks/abstract_arguments.cr
index fd9bac9..4a6f75f 100644
--- a/src/spectator/mocks/abstract_arguments.cr
+++ b/src/spectator/mocks/abstract_arguments.cr
@@ -45,23 +45,14 @@ module Spectator
       when Range
         # Ranges can only be matched against if their right side is comparable.
         # Ensure the right side is comparable, otherwise compare directly.
-        if b.is_a?(Comparable(typeof(b)))
-          a === b
-        else
-          a == b
-        end
+        return a === b if b.is_a?(Comparable(typeof(b)))
+        a == b
       when Tuple, Array
-        if b.is_a?(Tuple) || b.is_a?(Array)
-          compare_tuples(a, b)
-        else
-          a === b
-        end
+        return compare_tuples(a, b) if b.is_a?(Tuple) || b.is_a?(Array)
+        a === b
       when NamedTuple, Hash
-        if b.is_a?(NamedTuple) || b.is_a?(Hash)
-          compare_named_tuples(a, b)
-        else
-          a === b
-        end
+        return compare_named_tuples(a, b) if b.is_a?(NamedTuple) || b.is_a?(Hash)
+        a === b
       else
         a === b
       end

From edb20e5b2f2e57c4326bad7a0fca374342adc8c5 Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Sat, 27 Jan 2024 11:25:59 -0700
Subject: [PATCH 08/15] Additional handling when comparing ranges against
 unexpected types

---
 src/spectator/matchers/range_matcher.cr | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/spectator/matchers/range_matcher.cr b/src/spectator/matchers/range_matcher.cr
index 8c31810..8a9a307 100644
--- a/src/spectator/matchers/range_matcher.cr
+++ b/src/spectator/matchers/range_matcher.cr
@@ -29,7 +29,26 @@ module Spectator::Matchers
 
     # Checks whether the matcher is satisfied with the expression given to it.
     private def match?(actual : Expression(T)) : Bool forall T
-      expected.value.includes?(actual.value)
+      actual_value = actual.value
+      expected_value = expected.value
+      if expected_value.is_a?(Range) && actual_value.is_a?(Comparable)
+        return match_impl?(expected_value, actual_value)
+      end
+      return false unless actual_value.is_a?(Comparable(typeof(expected_value.begin)))
+      expected_value.includes?(actual_value)
+    end
+
+    private def match_impl?(expected_value : Range(B, E), actual_value : Comparable(B)) : Bool forall B, E
+      expected_value.includes?(actual_value)
+    end
+
+    private def match_impl?(expected_value : Range(B, E), actual_value : T) : Bool forall B, E, T
+      return false unless actual_value.is_a?(B) || actual_value.is_a?(Comparable(B))
+      expected_value.includes?(actual_value)
+    end
+
+    private def match_impl?(expected_value : Range(Number, Number), actual_value : Number) : Bool
+      expected_value.includes?(actual_value)
     end
 
     # Message displayed when the matcher isn't satisfied.

From 9b1d400ee1f0edf0b979b0d113ea618b16e0deed Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Sat, 27 Jan 2024 11:29:11 -0700
Subject: [PATCH 09/15] Update CHANGELOG

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e23272..7f7943a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Added
+- Added ability to use matchers for case equality. [#55](https://github.com/icy-arctic-fox/spectator/issues/55)
+- Added support for nested case equality when checking arguments with Array, Tuple, Hash, and NamedTuple.
+
+### Fixed
+- Fixed some issues with the `be_within` matcher when used with expected and union types.
+
 ## [0.11.7] - 2023-10-16
 ### Fixed
 - Fix memoized value (`let`) with a union type causing segfault. [#81](https://gitlab.com/arctic-fox/spectator/-/issues/81)

From f39ceb8eba897cf634fee1922543e8a7e7125f02 Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Sat, 3 Feb 2024 07:56:57 -0700
Subject: [PATCH 10/15] Release v0.12.0

---
 CHANGELOG.md | 5 +++--
 shard.yml    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f7943a..278c53c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.12.0] - 2024-02-03
 ### Added
 - Added ability to use matchers for case equality. [#55](https://github.com/icy-arctic-fox/spectator/issues/55)
 - Added support for nested case equality when checking arguments with Array, Tuple, Hash, and NamedTuple.
@@ -458,7 +458,8 @@ This has been changed so that it compiles and raises an error at runtime with a
 First version ready for public use.
 
 
-[Unreleased]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.7...master
+[Unreleased]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.12.0...master
+[0.12.0]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.7...v0.12.0
 [0.11.7]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.6...v0.11.7
 [0.11.6]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.5...v0.11.6
 [0.11.5]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.4...v0.11.5
diff --git a/shard.yml b/shard.yml
index 78ab190..559754f 100644
--- a/shard.yml
+++ b/shard.yml
@@ -1,5 +1,5 @@
 name: spectator
-version: 0.11.7
+version: 0.12.0
 description: |
   Feature-rich testing framework for Crystal inspired by RSpec.
 

From 287758e6af784200a4a51a60f364211fbd1ff6c4 Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Sat, 3 Feb 2024 08:05:02 -0700
Subject: [PATCH 11/15] Update README to point at v0.12.0

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 323b4ca..00b5eb9 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Add this to your application's `shard.yml`:
 development_dependencies:
   spectator:
     gitlab: arctic-fox/spectator
-    version: ~> 0.11.0
+    version: ~> 0.12.0
 ```
 
 Usage

From 73e16862191d821951d72120110c7bdca1062b6a Mon Sep 17 00:00:00 2001
From: Grant Birkinbine <grant.birkinbine@gmail.com>
Date: Sun, 11 Aug 2024 15:28:19 -0700
Subject: [PATCH 12/15] fix: `Error: expecting token 'CONST', not '::'`

---
 src/spectator/dsl/mocks.cr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/spectator/dsl/mocks.cr b/src/spectator/dsl/mocks.cr
index ab05636..18fe1fa 100644
--- a/src/spectator/dsl/mocks.cr
+++ b/src/spectator/dsl/mocks.cr
@@ -431,7 +431,7 @@ module Spectator::DSL
          # This isn't required, but new_mock() should still find this type.
          ::Spectator::DSL::Mocks::TYPES << {type.id.symbolize, @type.name(generic_args: false).symbolize, resolved.name.symbolize} %}
 
-      ::Spectator::Mock.inject({{base}}, ::{{resolved.name}}, {{**value_methods}}) {{block}}
+      ::Spectator::Mock.inject({{base}}, {{resolved.name}}, {{**value_methods}}) {{block}}
     end
 
     # Targets a stubbable object (such as a mock or double) for operations.

From a634046a86c689835de09f4fb96a488d6657c25a Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Tue, 13 Aug 2024 18:42:22 -0600
Subject: [PATCH 13/15] Conditionally insert top-level namespace (double colon)

---
 src/spectator/dsl/mocks.cr  | 4 ++--
 src/spectator/mocks/mock.cr | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/spectator/dsl/mocks.cr b/src/spectator/dsl/mocks.cr
index 18fe1fa..19645fc 100644
--- a/src/spectator/dsl/mocks.cr
+++ b/src/spectator/dsl/mocks.cr
@@ -226,7 +226,7 @@ module Spectator::DSL
 
          # Store information about how the mock is defined and its context.
          # This is important for constructing an instance of the mock later.
-         ::Spectator::DSL::Mocks::TYPES << {type.id.symbolize, @type.name(generic_args: false).symbolize, "::#{resolved.name}::#{mock_type_name}".id.symbolize}
+         ::Spectator::DSL::Mocks::TYPES << {type.id.symbolize, @type.name(generic_args: false).symbolize, "#{"::".id unless resolved.name.starts_with?("::")}#{resolved.name}::#{mock_type_name}".id.symbolize}
 
          base = if resolved.class?
                   :class
@@ -237,7 +237,7 @@ module Spectator::DSL
                 end %}
 
       {% begin %}
-        {{base.id}} ::{{resolved.name}}
+        {{base.id}} {{"::".id unless resolved.name.starts_with?("::")}}{{resolved.name}}
           ::Spectator::Mock.define_subtype({{base}}, {{type.id}}, {{mock_type_name}}, {{name}}, {{**value_methods}}) {{block}}
         end
       {% end %}
diff --git a/src/spectator/mocks/mock.cr b/src/spectator/mocks/mock.cr
index 87e8e23..d2a1fde 100644
--- a/src/spectator/mocks/mock.cr
+++ b/src/spectator/mocks/mock.cr
@@ -149,7 +149,7 @@ module Spectator
     macro inject(base, type_name, name = nil, **value_methods, &block)
       {% begin %}
         {% if name %}@[::Spectator::StubbedName({{name}})]{% end %}
-        {{base.id}} ::{{type_name.id}}
+        {{base.id}} {{"::".id unless type_name.id.starts_with?("::")}}{{type_name.id}}
           include ::Spectator::Mocked
           extend ::Spectator::StubbedType
 

From a93908d507977db1314f71a709a88444bf49191b Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Tue, 13 Aug 2024 18:51:00 -0600
Subject: [PATCH 14/15] Fix usage of deprecated double splat syntax in macros

---
 src/spectator/dsl/mocks.cr | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/spectator/dsl/mocks.cr b/src/spectator/dsl/mocks.cr
index 19645fc..5eff1a9 100644
--- a/src/spectator/dsl/mocks.cr
+++ b/src/spectator/dsl/mocks.cr
@@ -31,7 +31,7 @@ module Spectator::DSL
  ::Spectator::DSL::Mocks::TYPES << {name.id.symbolize, @type.name(generic_args: false).symbolize, double_type_name.symbolize} %}
 
       # Define the plain double type.
-      ::Spectator::Double.define({{double_type_name}}, {{name}}, {{**value_methods}}) do
+      ::Spectator::Double.define({{double_type_name}}, {{name}}, {{value_methods.double_splat}}) do
         # Returns a new double that responds to undefined methods with itself.
         # See: `NullDouble`
         def as_null_object
@@ -43,7 +43,7 @@ module Spectator::DSL
 
       {% begin %}
         # Define a matching null double type.
-        ::Spectator::NullDouble.define({{null_double_type_name}}, {{name}}, {{**value_methods}}) {{block}}
+        ::Spectator::NullDouble.define({{null_double_type_name}}, {{name}}, {{value_methods.double_splat}}) {{block}}
       {% end %}
     end
 
@@ -94,9 +94,9 @@ module Spectator::DSL
 
       begin
         %double = {% if found_tuple %}
-                    {{found_tuple[2].id}}.new({{**value_methods}})
+                    {{found_tuple[2].id}}.new({{value_methods.double_splat}})
                   {% else %}
-                    ::Spectator::LazyDouble.new({{name}}, {{**value_methods}})
+                    ::Spectator::LazyDouble.new({{name}}, {{value_methods.double_splat}})
                   {% end %}
         ::Spectator::Harness.current?.try(&.cleanup { %double._spectator_reset })
         %double
@@ -176,7 +176,7 @@ module Spectator::DSL
     # See `#def_double`.
     macro double(name, **value_methods, &block)
       {% begin %}
-        {% if @def %}new_double{% else %}def_double{% end %}({{name}}, {{**value_methods}}) {{block}}
+        {% if @def %}new_double{% else %}def_double{% end %}({{name}}, {{value_methods.double_splat}}) {{block}}
       {% end %}
     end
 
@@ -189,7 +189,7 @@ module Spectator::DSL
     # expect(dbl.foo).to eq(42)
     # ```
     macro double(**value_methods)
-      ::Spectator::LazyDouble.new({{**value_methods}})
+      ::Spectator::LazyDouble.new({{value_methods.double_splat}})
     end
 
     # Defines a new mock type.
@@ -238,7 +238,7 @@ module Spectator::DSL
 
       {% begin %}
         {{base.id}} {{"::".id unless resolved.name.starts_with?("::")}}{{resolved.name}}
-          ::Spectator::Mock.define_subtype({{base}}, {{type.id}}, {{mock_type_name}}, {{name}}, {{**value_methods}}) {{block}}
+          ::Spectator::Mock.define_subtype({{base}}, {{type.id}}, {{mock_type_name}}, {{name}}, {{value_methods.double_splat}}) {{block}}
         end
       {% end %}
     end
@@ -321,7 +321,7 @@ module Spectator::DSL
     macro mock(type, **value_methods, &block)
       {% raise "First argument of `mock` must be a type name, not #{type}" unless type.is_a?(Path) || type.is_a?(Generic) || type.is_a?(Union) || type.is_a?(Metaclass) || type.is_a?(TypeNode) %}
       {% begin %}
-        {% if @def %}new_mock{% else %}def_mock{% end %}({{type}}, {{**value_methods}}) {{block}}
+        {% if @def %}new_mock{% else %}def_mock{% end %}({{type}}, {{value_methods.double_splat}}) {{block}}
       {% end %}
     end
 
@@ -431,7 +431,7 @@ module Spectator::DSL
          # This isn't required, but new_mock() should still find this type.
          ::Spectator::DSL::Mocks::TYPES << {type.id.symbolize, @type.name(generic_args: false).symbolize, resolved.name.symbolize} %}
 
-      ::Spectator::Mock.inject({{base}}, {{resolved.name}}, {{**value_methods}}) {{block}}
+      ::Spectator::Mock.inject({{base}}, {{resolved.name}}, {{value_methods.double_splat}}) {{block}}
     end
 
     # Targets a stubbable object (such as a mock or double) for operations.

From dcaa05531a3bba4855b8801b6a30bbd6c4e85cbc Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Tue, 13 Aug 2024 19:00:30 -0600
Subject: [PATCH 15/15] Release v0.12.1

---
 CHANGELOG.md | 8 +++++++-
 shard.yml    | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 278c53c..f2d8d66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.12.1] - 2024-08-13
+### Fixed
+- Fixed some global namespace issues with Crystal 1.13. [#57](https://github.com/icy-arctic-fox/spectator/pull/57) Thanks @GrantBirki !
+- Remove usage of deprecated double splat in macros.
+
 ## [0.12.0] - 2024-02-03
 ### Added
 - Added ability to use matchers for case equality. [#55](https://github.com/icy-arctic-fox/spectator/issues/55)
@@ -458,7 +463,8 @@ This has been changed so that it compiles and raises an error at runtime with a
 First version ready for public use.
 
 
-[Unreleased]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.12.0...master
+[Unreleased]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.12.1...master
+[0.12.1]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.12.0...v0.12.1
 [0.12.0]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.7...v0.12.0
 [0.11.7]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.6...v0.11.7
 [0.11.6]: https://gitlab.com/arctic-fox/spectator/-/compare/v0.11.5...v0.11.6
diff --git a/shard.yml b/shard.yml
index 559754f..ac8b54f 100644
--- a/shard.yml
+++ b/shard.yml
@@ -1,5 +1,5 @@
 name: spectator
-version: 0.12.0
+version: 0.12.1
 description: |
   Feature-rich testing framework for Crystal inspired by RSpec.