uuid4 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40dd0f2af493ca5b0bbe31e4ff0b78b4eef6b173
-  data.tar.gz: a85b9447fafed6c5983b2eddcc85d8e2da91406a
+  metadata.gz: ba42502b36d87ad581c49a75fecd0986f5e7300d
+  data.tar.gz: c1aa10e23bdeac041883dc68ffc42dfeaf6189b0
 SHA512:
-  metadata.gz: 9f9baf2e30e8d2473cab8599b1cb845541a6e5dcc90b55426b366afb7e4c1eec96b97bb5a31c32b686095e401976828c736c12adca9c12fb9989fa125d92dcb8
-  data.tar.gz: 5e5e2bb9fb811b840cabca2c740e6fd43b714e0af33b1111c06493f2d07150dee87e3f8c8679ced1961d8a13d0f44ea222d4d088c9f1a608c2712f187da790d8
+  metadata.gz: 894d8c3b4820762cdb81cb6c58ef0ae0a3a22333351d3e16da416a4d64b00b39a92ea74f586b311559d1c2ce46cd9a77a80d42bbf759b082e01b8119dc443dc0
+  data.tar.gz: 45a20cbd99f390ce85d30ee49d2eba22d773a84f49f67f72923a9f67a359ff5c3dde1a32e25af54cedccbe7916c671ee697b44bb88647a7b1607d72f6f04b59f

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 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
 
 * Improve `#as_json` compatibility by swallowing arbitrary arguments passed by encoders.

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 (value = try_convert(value))
         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)
       else
         raise TypeError.new "Invalid UUID: #{value.inspect}"
       end
     end
 
-    def _parse(value)
-      if value.respond_to?(:to_int) && valid_int?(value = value.to_int)
-        return value
+    def try_convert(value)
+      if value.nil? || value.is_a?(::UUID4)
+        value
+      elsif value.respond_to?(:to_uuid4)
+        value.to_uuid4
+      elsif (value = _parse(value))
+        _new value
       end
+    end
 
-      FORMATTERS.each do |formatter|
-        val = formatter.decode(value) if formatter.respond_to?(:decode)
-        return val if val
+    def valid?(value)
+      if value.is_a?(::UUID4)
+        true
+      else
+        !try_convert(value).nil?
       end
+    end
 
-      nil
+    def _parse(value)
+      if value.respond_to?(:to_int) && valid_int?(value = value.to_int)
+        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(&:itself)
+      end
     end
 
     def valid_int?(int)

data/lib/uuid4/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuid4
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base62-rb
@@ -110,9 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A UUIDv4 support library
 test_files: []
-has_rdoc: