uuid4 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd72b459e5ec7d4886de25f62bfe4804d10cc9b89a3353aabaa9fc866b88b5b1
-  data.tar.gz: 2e0b69300a1c2b1ce8aab2591565e71a9fa691ee294cdfbfb03733125ab5dce2
+  metadata.gz: 99f0b79a3986a53e256f938361c66ff0428f4566f943d7ebcb3270c59b48e9c2
+  data.tar.gz: a9ed439387f5ef681d6c2bc82358ded1c53c961062f3545d1504cb90223411d7
 SHA512:
-  metadata.gz: 4732a30f2fbca3e9732122cff2fc71484459c1f877534e69dc558251e3e4d667e555e7f5b52b2a40cd69497cd88df8343cdc7016083bb96cbfa4dbb305570693
-  data.tar.gz: 26610d164e801f0c15abcbf18a5dc4a18ce331e493ad8a09462306c4ed605fe4f75db578174b2731ff76f7277d99765f2718c1263bcb5a524d8d8044102952af
+  metadata.gz: fb757b4a2cc3424d3451799ffd1f8f5221820cf5c32e16191ab9b3f082f9896ac8f3f0e2a3813d48429763eae0dbf6359547a2f77f451b24641747960eadeef3
+  data.tar.gz: 520141a2ca687913081ecbc86d822742bda9f71d2a7abbe2e2585fcbbbee98d2db710859b12387e110c26cdd38ed8d025aa646a088d310aa501c966cabf99888

data/.github/workflows/maintenance-cache-wipe.yml

@@ -0,0 +1,13 @@
+---
+name: maintenance-cache-clear
+on:
+  schedule:
+    - cron: "0 0 1 * *"
+  workflow_dispatch:
+
+jobs:
+  cache-clear:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: easimon/wipe-cache@v2

data/.github/workflows/maintenance-workflow-cleanup.yml

@@ -0,0 +1,17 @@
+---
+name: maintenance-workflow-cleanup
+on:
+  schedule:
+    - cron: "0 0 1 * *"
+  workflow_dispatch:
+
+jobs:
+  delete-workflow-runs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 180
+          keep_minimum_runs: 50

data/.github/workflows/test.yml

@@ -0,0 +1,53 @@
+---
+name: test
+on: push
+jobs:
+  rspec:
+    name: "ruby-${{ matrix.ruby }}"
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.3"
+          - "3.2"
+          - "3.1"
+          - "3.0"
+          - "2.7"
+
+    env:
+      BUNDLE_WITHOUT: development
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+        env:
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+
+      - run: |
+          bundle exec rspec --color --format documentation
+
+  rubocop:
+    name: rubocop
+    runs-on: ubuntu-22.04
+
+    env:
+      BUNDLE_WITHOUT: development
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+          bundler-cache: true
+        env:
+          BUNDLE_WITHOUT: development
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+
+      - run: bundle exec rubocop --parallel --fail-level E

data/.rubocop.yml

@@ -0,0 +1,16 @@
+# .rubocop.yml
+
+inherit_gem:
+  rubocop-config: default.yml
+
+AllCops:
+  TargetRubyVersion: 2.7
+  SuggestExtensions: False
+  NewCops: enable
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+RSpec/NamedSubject:
+  Enabled: false
+RSpec/NestedGroups:
+  Enabled: false

data/CHANGELOG.md

@@ -3,8 +3,8 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Changelog](http://keepachangelog.com/).
 
-
 ## Unreleased
+
 ---
 
 ### New
@@ -15,48 +15,52 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
 
 ### Breaks
 
+## 1.4.0 - (2024-07-11)
+
+### New
+
+- Accept UUID v6/7/8 for parsing
 
 ## 1.3.4 - (2020-07-28)
----
 
 ### Fixes
-* Consider newlines when checking base62 format (#5)
 
+- Consider newlines when checking base62 format (#5)
 
 ## 1.3.3
 
-* Fix error message on type errors (#4)
+- Fix error message on type errors (#4)
 
 ## 1.3.2
 
-* Fix issue when parsing UUIDs (5e47b00)
+- Fix issue when parsing UUIDs (5e47b00)
 
 ## 1.3.1
 
-* Fix incompatibility with Rubies <2.2 introduced in #1
+- Fix incompatibility with Rubies <2.2 introduced in #1
 
 ## 1.3.0
 
-* Add `UUID#hash` and `UUID#eql?` for using UUIDs e.g. as hash keys
-* Add `UUID.try_convert` returning a UUID or `nil`
-* Add `UUID.valid?` to validate objects as UUIDs (#1)
+- Add `UUID#hash` and `UUID#eql?` for using UUIDs e.g. as hash keys
+- Add `UUID.try_convert` returning a UUID or `nil`
+- Add `UUID.valid?` to validate objects as UUIDs (#1)
 
 ## 1.2.1
 
-* Improve `#as_json` compatibility by swallowing arbitrary arguments passed by encoders.
+- Improve `#as_json` compatibility by swallowing arbitrary arguments passed by encoders.
 
 ## 1.2.0
 
-* Add JSON encoding support for ActiveSupport
+- Add JSON encoding support for ActiveSupport
 
 ## 1.1.1
 
-* Fix support for numerical small UUIDs
+- Fix support for numerical small UUIDs
 
 ## 1.1.0
 
-* Export `Kernel#UUID`.
+- Export `Kernel#UUID`.
 
 ## 1.0.0
 
-* Initial release.
+- Initial release.

data/Gemfile

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in uuid4.gemspec
 gemspec
 
 gem 'activesupport'
-gem 'rake-release', '~> 1.2'
 gem 'rake'
-gem 'rspec', '~> 3.0'
+gem 'rake-release', '~> 1.2'
+gem 'rspec', '~> 3.0'
+
+gem 'rubocop-config', github: 'jgraichen/rubocop-config', ref: 'v12', require: false

data/Rakefile

@@ -1,10 +1,12 @@
-require "rake/release/task"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
 
-task :default => :spec
+require 'rake/release/task'
+require 'rspec/core/rake_task'
+
+task default: :spec
 
 RSpec::Core::RakeTask.new(:spec)
 
 Rake::Release::Task.new do |spec|
   spec.sign_tag = true
-end
+end

data/lib/uuid4/formatter/base62.rb

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
+
 require 'base62-rb'
 
 class UUID4
   module Formatter
     class Base62
-      REGEXP = /\A[0-9A-Za-z]{14,22}\z/
+      REGEXP = /\A[0-9A-Za-z]{14,22}\z/.freeze
 
       def encode(uuid)
         ::Base62.encode(uuid.to_i)
       end
 
       def decode(value)
-        if value.respond_to?(:to_str) && (value = value.to_str) =~ REGEXP
-          if ::UUID4.valid_int?(int = ::Base62.decode(value))
-            int
-          end
-        end
+        return unless value.respond_to?(:to_str) && (value = value.to_str) =~ REGEXP
+        return unless ::UUID4.valid_int?(int = ::Base62.decode(value))
+
+        int
       end
     end
   end

data/lib/uuid4/formatter/compact.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class UUID4
   module Formatter
     class Compact
-      REGEXP = /^[\da-f]{12}[1-5][\da-f]{3}[89ab][\da-f]{15}$/i
-      FORMAT = '%032x'.freeze
+      REGEXP = /^[\da-f]{12}[1-8][\da-f]{3}[89ab][\da-f]{15}$/i.freeze
+      FORMAT = '%032x'
 
       def encode(uuid)
         FORMAT % uuid.to_int
       end
 
       def decode(value)
-        if value.respond_to?(:to_str) && (value = value.to_str) =~ REGEXP
-          value.hex
-        end
+        return unless value.respond_to?(:to_str) && (value = value.to_str) =~ REGEXP
+
+        value.hex
       end
     end
   end

data/lib/uuid4/formatter/default.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class UUID4
   module Formatter
     class Default
-      REGEXP = /^[\da-f]{8}-[\da-f]{4}-[1-5][\da-f]{3}-[89ab][\da-f]{3}-[\da-f]{12}$/i
-      FORMAT = '%08x-%04x-%04x-%04x-%012x'.freeze
+      REGEXP = /^[\da-f]{8}-[\da-f]{4}-[1-8][\da-f]{3}-[89ab][\da-f]{3}-[\da-f]{12}$/i.freeze
+      FORMAT = '%08x-%04x-%04x-%04x-%012x'
 
       def encode(uuid)
         FORMAT % uuid.components
       end
 
       def decode(value)
-        if value.respond_to?(:to_str) && (value = value.to_str) =~ REGEXP
-          value.tr('-', '').hex
-        end
+        return unless value.respond_to?(:to_str) && (value = value.to_str) =~ REGEXP
+
+        value.tr('-', '').hex
       end
     end
   end

data/lib/uuid4/formatter/urn.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class UUID4
   module Formatter
     class URN
-      REGEXP = /^urn:uuid:[\da-f]{8}-[\da-f]{4}-?[1-5][\da-f]{3}-[89ab][\da-f]{3}-[\da-f]{12}$/i
-      FORMAT = 'urn:uuid:%08x-%04x-%04x-%04x-%012x'.freeze
+      REGEXP = /^urn:uuid:[\da-f]{8}-[\da-f]{4}-?[1-8][\da-f]{3}-[89ab][\da-f]{3}-[\da-f]{12}$/i.freeze
+      FORMAT = 'urn:uuid:%08x-%04x-%04x-%04x-%012x'
 
       def encode(uuid)
         FORMAT % uuid.components
       end
 
       def decode(value)
-        if value.respond_to?(:to_str) && (value = value.to_str) =~ REGEXP
-          value[9..-1].tr('-', '').hex
-        end
+        return unless value.respond_to?(:to_str) && (value = value.to_str) =~ REGEXP
+
+        value[9..].tr('-', '').hex
       end
     end
   end

data/lib/uuid4/version.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class UUID4
   module VERSION
     MAJOR = 1
-    MINOR = 3
-    PATCH = 4
+    MINOR = 4
+    PATCH = 0
     STAGE = nil
-    STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
+    STRING = [MAJOR, MINOR, PATCH, STAGE].compact.join('.')
 
     def self.to_s
       STRING

data/lib/uuid4.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uuid4/version'
 
 class UUID4
@@ -12,18 +14,20 @@ class UUID4
     Formatter::Default.new,
     Formatter::Compact.new,
     Formatter::URN.new,
-    Formatter::Base62.new
-  ]
+    Formatter::Base62.new,
+  ].freeze
 
   def initialize(value)
     @value = value
   end
 
   def ==(other)
+    # rubocop:disable Style/CaseEquality
     return value === other.to_i if other.is_a?(UUID4)
     return other.to_uuid4 == self if other.respond_to?(:to_uuid4)
 
     self.class._parse(other) === value
+    # rubocop:enable Style/CaseEquality
   end
 
   def to_str(format: :default, formatter: nil)
@@ -37,14 +41,14 @@ class UUID4
       when :base62
         formatter = FORMATTERS[3]
       else
-        raise RuntimeError.new("Unknown format: #{format}")
+        raise "Unknown format: #{format}"
     end
 
     formatter.encode(self)
   end
 
-  alias_method :to_s, :to_str
-  alias_method :to_uuid, :to_str
+  alias to_s to_str
+  alias to_uuid to_str
 
   def as_json(*)
     to_str
@@ -58,18 +62,20 @@ class UUID4
     @value
   end
 
-  alias_method :to_i, :to_int
+  alias to_i to_int
 
   def hash
     @value.hash
   end
 
-  def eql?(object)
-    object.is_a?(::UUID4) && object.hash === hash
+  def eql?(other)
+    # rubocop:disable Style/CaseEquality
+    other.is_a?(::UUID4) && other.hash === hash
+    # rubocop:enable Style/CaseEquality
   end
 
   def inspect
-    "<UUID4:#{to_s}>"
+    "<UUID4:#{self}>"
   end
 
   def components
@@ -78,7 +84,7 @@ class UUID4
       (value >> 80) & 0xFFFF,
       (value >> 64) & 0xFFFF,
       (value >> 48) & 0xFFFF,
-      (value >> 0)  & 0xFFFFFFFFFFFF
+      (value >> 0)  & 0xFFFFFFFFFFFF,
     ]
   end
 
@@ -123,9 +129,9 @@ class UUID4
         value
       else
         # Return the result of the first formatter that can decode this value
-        FORMATTERS.lazy.map { |formatter|
+        FORMATTERS.lazy.map do |formatter|
           formatter.decode(value) if formatter.respond_to?(:decode)
-        }.find {|value| !value.nil? }
+        end.find {|value| !value.nil? } # rubocop:disable Style/MultilineBlockChain
       end
     end
 
@@ -136,11 +142,11 @@ class UUID4
 end
 
 module Kernel
-  def UUID4(value)
+  def UUID4(value) # rubocop:disable Naming/MethodName
     UUID4.new(value)
   end
 
-  def UUID(value)
+  def UUID(value) # rubocop:disable Naming/MethodName
     UUID4.new(value)
   end
 end

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>jgraichen/renovate-config"
+  ]
+}

data/uuid4.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'uuid4/version'
 
@@ -9,16 +10,17 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Jan Graichen']
   spec.email         = ['jg@altimos.de']
 
-  spec.summary       = %q{A UUIDv4 support library}
+  spec.summary       = 'A UUIDv4 support library'
   spec.homepage      = 'https://github.com/jgraichen/uuid4'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = %w(lib)
+  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.required_ruby_version = '>= 2.7.0'
 
-  spec.add_runtime_dependency 'base62-rb', '~> 0.3.0'
+  spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
+  spec.require_paths = %w[lib]
 
-  spec.add_development_dependency 'bundler'
+  spec.add_dependency 'base62-rb', '~> 0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuid4
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base62-rb
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - jg@altimos.de
@@ -45,9 +31,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/maintenance-cache-wipe.yml"
+- ".github/workflows/maintenance-workflow-cleanup.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -61,11 +50,13 @@ files:
 - lib/uuid4/formatter/default.rb
 - lib/uuid4/formatter/urn.rb
 - lib/uuid4/version.rb
+- renovate.json
 - uuid4.gemspec
 homepage: https://github.com/jgraichen/uuid4
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -74,14 +65,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: A UUIDv4 support library

data/.travis.yml

@@ -1,8 +0,0 @@
-dist: xenial
-language: ruby
-rvm:
-- 2.6.3
-- 2.5.5
-- 2.4.6
-- 2.3.8
-- jruby-9.2.7.0