rspec-uuid 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9734bb31d88892de3d5c141afbcdbd444b942f327863c4e87be0198b0cf0d3e9
-  data.tar.gz: 7672b8b47603a9f895fb4586af1141edd7b0693c492991a5fecc1847f7f42348
+  metadata.gz: 01a071e18425a466c1ad901fc015b3f683467d4b77ba7d1a151e57d0bf28b264
+  data.tar.gz: ee5776d8c999625c67a543bd3ecf40097a0983d9653fbc034505f0542137b51f
 SHA512:
-  metadata.gz: c59ae103abe71f91cb4902c2a98d33084cc5cfa5726c0c723fdb19267f85ff29f1f76ffc366d598743c740f49635b75490747f8a53a455b3bef84ffb14400262
-  data.tar.gz: c5cefea9b062dd117b02491684cc221b52651c56801975458519c222dac9152a8bfcbbb15dbe8d475dcdf2e94b304974cab9d8e47696f032be3cbb17828256f2
+  metadata.gz: c05681f2b05f9c78225f658b99f2fe96032660614cf32611cf1f5596e9d8869346a36d2762e53e0b41846e717ba1d6b0c5457779fc51058fc95f1c1fa8c50f57
+  data.tar.gz: 26cc496001d14ecb9829b21f1525f20e80ea7a139cfe24386700283946f9716269bb4bfefb86658059f09c59469581a8d3c08c1c4565efde0e897fcf515f355d

data/lib/rspec/uuid/version.rb

@@ -0,0 +1,5 @@
+module RSpec
+  module UUID
+    VERSION = "0.5.0"
+  end
+end

data/lib/rspec/uuid.rb

@@ -0,0 +1,45 @@
+require "rspec/expectations"
+
+RSpec::Matchers.define :be_a_uuid do |version: nil|
+  match do |actual|
+    raise ArgumentError if @version && version
+
+    return false unless actual.is_a?(String)
+
+    # https://www.uuidtools.com/what-is-uuid
+    matches = actual.match /^\h{8}-\h{4}-(\h{4})-\h{4}-\h{12}$/
+    return false unless matches
+
+    version ||= @version
+    if version
+      # 1st nibble of 3rd section
+      @actual_version = matches[1].to_i(16) >> 12
+
+      version == @actual_version
+    else
+      true
+    end
+  end
+
+  chain :of_version do |version|
+    @version = version
+  end
+
+  description do
+    version ? "a UUID v#{version}" : "a UUID"
+  end
+
+  failure_message do
+    if @actual_version
+      "expected #{description}, found a UUID v#{@actual_version}"
+    else
+      "expected #{description}"
+    end
+  end
+
+  failure_message_when_negated do
+    "did not expect #{description}"
+  end
+end
+
+RSpec::Matchers.alias_matcher :a_uuid, :be_a_uuid

data/lib/rspec-uuid.rb

@@ -1,38 +1 @@
-require "rspec/expectations"
-
-RSpec::Matchers.define :be_a_uuid do |version: nil|
-  match do |actual|
-    return false unless actual.is_a?(String)
-
-    # https://www.uuidtools.com/what-is-uuid
-    matches = actual.match /^\h{8}-\h{4}-(\h{4})-\h{4}-\h{12}$/
-    return false unless matches
-
-    if version
-      # 1st nibble of 3rd section
-      @actual_version = matches[1].to_i(16) >> 12
-
-      version == @actual_version
-    else
-      true
-    end
-  end
-
-  description do
-    version ? "a UUID v#{version}" : "a UUID"
-  end
-
-  failure_message do
-    if @actual_version
-      "expected #{description}, found a UUID v#{@actual_version}"
-    else
-      "expected #{description}"
-    end
-  end
-
-  failure_message_when_negated do
-    "did not expect #{description}"
-  end
-end
-
-RSpec::Matchers.alias_matcher :a_uuid, :be_a_uuid
+require "rspec/uuid"

data/spec/matchers_spec.rb

@@ -49,22 +49,40 @@ describe "be_a_uuid" do
         expect(uuid_v3).to be_a_uuid(version: 4)
       }.to fail_including("expected a UUID v4, found a UUID v3")
     end
+
+    describe ".of_version" do
+      it { expect(uuid_v3).to be_a_uuid.of_version(3) }
+
+      it { expect(uuid_v4).to be_a_uuid.of_version(4) }
+      it { expect(uuid_v4).not_to be_a_uuid.of_version(3) }
+
+      it "requires a version argument" do
+        expect {
+          expect(uuid_v4).to be_a_uuid.of_version
+        }.to raise_error(ArgumentError)
+      end
+
+      it "can not be used simultaneously with kwarg version" do
+        expect {
+          expect(uuid_v4).to be_a_uuid(version: 4).of_version(4)
+        }.to raise_error(ArgumentError)
+      end
+    end
   end
 
   it "is composable" do
     data = {
-      res: {
-        abc: { a: 1 },
-        uuid: SecureRandom.uuid,
-        uuid_v5: Digest::UUID.uuid_v5(Digest::UUID::OID_NAMESPACE, "123"),
-      },
-      foo: nil,
+      abc: { a: 1 },
+      uuid: SecureRandom.uuid,
+      uuid_v5: Digest::UUID.uuid_v5(Digest::UUID::OID_NAMESPACE, "123"),
     }
 
-    expect(data).to include(res: {
+    expect(data).to include(uuid: a_uuid)
+
+    expect(data).to match(
       abc: a_hash_including(:a),
       uuid: a_uuid,
       uuid_v5: a_uuid(version: 5),
-    })
+    )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-uuid
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
@@ -115,7 +115,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rspec-uuid.rb
-- lib/rspec-uuid/version.rb
+- lib/rspec/uuid.rb
+- lib/rspec/uuid/version.rb
 - spec/matchers_spec.rb
 homepage: https://github.com/dpep/rspec-uuid
 licenses:
@@ -139,6 +140,6 @@ requirements: []
 rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: RSpecUUID
+summary: Gem::Specification::RSpec::UUID
 test_files:
 - spec/matchers_spec.rb

data/lib/rspec-uuid/version.rb

@@ -1,3 +0,0 @@
-module RSpecUUID
-  VERSION = "0.4.0"
-end