uuid4 1.2.1 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 40dd0f2af493ca5b0bbe31e4ff0b78b4eef6b173
-  data.tar.gz: a85b9447fafed6c5983b2eddcc85d8e2da91406a
+SHA256:
+  metadata.gz: cd72b459e5ec7d4886de25f62bfe4804d10cc9b89a3353aabaa9fc866b88b5b1
+  data.tar.gz: 2e0b69300a1c2b1ce8aab2591565e71a9fa691ee294cdfbfb03733125ab5dce2
 SHA512:
-  metadata.gz: 9f9baf2e30e8d2473cab8599b1cb845541a6e5dcc90b55426b366afb7e4c1eec96b97bb5a31c32b686095e401976828c736c12adca9c12fb9989fa125d92dcb8
-  data.tar.gz: 5e5e2bb9fb811b840cabca2c740e6fd43b714e0af33b1111c06493f2d07150dee87e3f8c8679ced1961d8a13d0f44ea222d4d088c9f1a608c2712f187da790d8
+  metadata.gz: 4732a30f2fbca3e9732122cff2fc71484459c1f877534e69dc558251e3e4d667e555e7f5b52b2a40cd69497cd88df8343cdc7016083bb96cbfa4dbb305570693
+  data.tar.gz: 26610d164e801f0c15abcbf18a5dc4a18ce331e493ad8a09462306c4ed605fe4f75db578174b2731ff76f7277d99765f2718c1263bcb5a524d8d8044102952af

data/.travis.yml

@@ -1,5 +1,8 @@
-sudo: false
+dist: xenial
 language: ruby
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.12.5
+- 2.6.3
+- 2.5.5
+- 2.4.6
+- 2.3.8
+- jruby-9.2.7.0

data/CHANGELOG.md

@@ -1,4 +1,45 @@
-# Changelog
+# CHANGELOG
+
+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
+
+### Changes
+
+### Fixes
+
+### Breaks
+
+
+## 1.3.4 - (2020-07-28)
+---
+
+### Fixes
+* Consider newlines when checking base62 format (#5)
+
+
+## 1.3.3
+
+* Fix error message on type errors (#4)
+
+## 1.3.2
+
+* Fix issue when parsing UUIDs (5e47b00)
+
+## 1.3.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)
 
 ## 1.2.1
 
@@ -18,4 +59,4 @@
 
 ## 1.0.0
 
-* Initial release.
+* Initial release.

data/Gemfile

@@ -4,3 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'activesupport'
+gem 'rake-release', '~> 1.2'
+gem 'rake'
+gem 'rspec', '~> 3.0'

data/README.md

@@ -1,6 +1,6 @@
 # UUID4
 
-[![Build Status](https://travis-ci.org/jgraichen/uuid4.svg?branch=master)](https://travis-ci.org/jgraichen/uuid4)
+[![Build Status](https://travis-ci.org/jgraichen/uuid4.svg?branch=master)](https://travis-ci.org/jgraichen/uuid4) [![Dependency Status](https://gemnasium.com/badges/github.com/jgraichen/uuid4.svg)](https://gemnasium.com/github.com/jgraichen/uuid4) [![Gem](https://img.shields.io/gem/v/uuid4.svg)](https://rubygems.org/gems/uuid4) [![license](https://img.shields.io/github/license/jgraichen/uuid4.svg)](https://github.com/jgraichen/uuid4/blob/master/LICENSE.txt)
 
 A UUID support library specialized on v4 UUIDs, parsing and formatting existing UUIDs. It can encode and decode dashed UUIDs, compact UUIDs, large integers, UUID URNs and Base62 coded UUIDs.
 

data/Rakefile

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

data/lib/uuid4.rb

@@ -60,6 +60,14 @@ class UUID4
 
   alias_method :to_i, :to_int
 
+  def hash
+    @value.hash
+  end
+
+  def eql?(object)
+    object.is_a?(::UUID4) && object.hash === hash
+  end
+
   def inspect
     "<UUID4:#{to_s}>"
   end
@@ -79,33 +87,46 @@ class UUID4
   attr_reader :value
 
   class << self
+    alias _new new
+    private :_new
+
     def new(value = nil)
       if value.nil?
         super(SecureRandom.uuid.tr('-', '').hex)
-      elsif value.is_a?(UUID4)
+      elsif (uuid = try_convert(value))
+        uuid
+      else
+        raise TypeError.new "Invalid UUID: #{value.inspect}"
+      end
+    end
+
+    def try_convert(value)
+      if value.nil? || value.is_a?(::UUID4)
         value
       elsif value.respond_to?(:to_uuid4)
         value.to_uuid4
-      elsif value.respond_to?(:to_int) && valid_int?(value = value.to_int)
-        super(value)
-      elsif (ret = _parse(value))
-        super(ret)
+      elsif (value = _parse(value))
+        _new value
+      end
+    end
+
+    def valid?(value)
+      if value.is_a?(::UUID4)
+        true
       else
-        raise TypeError.new "Invalid UUID: #{value.inspect}"
+        !try_convert(value).nil?
       end
     end
 
     def _parse(value)
       if value.respond_to?(:to_int) && valid_int?(value = value.to_int)
-        return value
-      end
-
-      FORMATTERS.each do |formatter|
-        val = formatter.decode(value) if formatter.respond_to?(:decode)
-        return val if val
+        value
+      else
+        # Return the result of the first formatter that can decode this value
+        FORMATTERS.lazy.map { |formatter|
+          formatter.decode(value) if formatter.respond_to?(:decode)
+        }.find {|value| !value.nil? }
       end
-
-      nil
     end
 
     def valid_int?(int)

data/lib/uuid4/formatter/base62.rb

@@ -3,7 +3,7 @@ require 'base62-rb'
 class UUID4
   module Formatter
     class Base62
-      REGEXP = /^[0-9A-z]{14,22}$/i
+      REGEXP = /\A[0-9A-Za-z]{14,22}\z/
 
       def encode(uuid)
         ::Base62.encode(uuid.to_i)

data/lib/uuid4/version.rb

@@ -1,8 +1,8 @@
 class UUID4
   module VERSION
     MAJOR = 1
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 4
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 

data/uuid4.gemspec

@@ -20,7 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'base62-rb', '~> 0.3.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'bundler'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuid4
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.4
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base62-rb
@@ -28,44 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: 
 email:
 - jg@altimos.de
@@ -109,10 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A UUIDv4 support library
 test_files: []
-has_rdoc: