torid 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6dacf1ffa7be13c30286d37766f06b04cfef520
-  data.tar.gz: eb17f8af92781af966f8575148346990b0c055a5
+  metadata.gz: f00dde7601ef49bef1988ca71448d7e177adeca8
+  data.tar.gz: 46b76fc71876f3e580d99e480c925bfb5ff1b9aa
 SHA512:
-  metadata.gz: ab397dcae732b089f5f5eba45c17dd1362fb4928a48fa30b9275c226e91cacd37f6c6248dd6dc26cc1d6ebe56b188f4d6e313670312a8f6811cea60f6c7b5f7e
-  data.tar.gz: 0265870e23051dfce0d1953c336447bd82e45129d34ca3156fcc4f4f701d329faad1e0f0b03612b4188189481734ba625f94ac2895f8dae54a1276fcff9048e2
+  metadata.gz: 4869b5ba0b7f952ad70b80d6b6113b12f96294ecaa309224c32b00d85afb13d215748407924c8d7da4f99c1b7da57b138a57fbe867df7b50ea07fc8e119e1315
+  data.tar.gz: 775f96e810c9e85fa4e7a17ecfc1f58926315f458d085ed01a8a8a5e008e25a25fc77419196aa94c70b7fb113e4303bce681447f731d1d6571b83a4a8c898fb7

data/HISTORY.md

@@ -1,4 +1,8 @@
 # Torid Changelog
+## Version 1.1.0 - 2014-07-17
+
+* Added Torid::UUID.match
+
 ## Version 1.0.0
 
 * Initial Release - Yeah!

data/lib/torid.rb

@@ -2,7 +2,7 @@
 # that sort lexically in time order.
 module Torid
   # Public: The Version of the Torid library as a String
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 
   # Public: return the next Torid::UUID from the default Generator
   #

data/lib/torid/uuid.rb

@@ -21,11 +21,28 @@ module Torid
   #   uuid.node_id   # => Integer
   class UUID
 
-    # Public: Create a Torid::UUID from an existing String.
+    # Regular expression that matches the 36 byte 8-4-4-4-12 format
+    REGEX = %r{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}}i
+
+    # Public: Return if the given string matches the UUID regular expression
+    #
+    # str - The String to compare to REGEX
     #
+    # Examples:
+    #
+    #   Torid::UUID.match( "0004fda3-8c73-5e0f-bae4-e9c86e3684a5" ) # => MatchData
+    #
+    # Returns MatchData or nil if there is no match
+    def self.match( str )
+      REGEX.match( str )
+    end
+
+    # Public: Create a Torid::UUID from an existing String.
     # The String can either be a 16 byte binary string, or a 36byte hexadecimal
     # UUID in the 8-4-4-4-12 format.
     #
+    # str - The String from which to create the UUID.
+    #
     # Examples
     #
     #   Torid::UUID.from( "0004fda3-8c73-5e0f-bae4-e9c86e3684a5" )                 # => Torid::UUID
@@ -34,18 +51,15 @@ module Torid
     # Returns a Torid::UUID
     # Raises ArgumentError if the String is not convertable to a UUID.
     def self.from( str )
-      case str.bytesize
-      when 36
-        from_string( str )
-      when 16
-        from_bytes( str )
-      else
-        raise ArgumentError, "UUID can only be loaded from a 16 byte binary string or a 36 byte formatted UUID string."
-      end
+      return from_bytes( str )  if str.bytesize == 16
+      return from_string( str ) if UUID.match( str )
+      raise ArgumentError, "UUID can only be loaded from a 16 byte binary string or a 36 byte formatted UUID string."
     end
 
     # Internal: Create a new UUID from an existing string in the 8-4-4-4-12 format
     #
+    # str - The String from which to create the UUID.
+    #
     # Copied from lexical_uuid
     #
     # Returns a Torid::UUID
@@ -57,6 +71,8 @@ module Torid
 
     # Internal: Create a new UUID from an existing 16 byte String
     #
+    # str - The String from which to create the UUID.
+    #
     # Copied from lexical_uuid
     #
     # Returns a Torid::UUID

data/tasks/this.rb

@@ -25,7 +25,11 @@ class ThisProject
   #
   # Yields self
   def initialize(&block)
-    @exclude_from_manifest = %r/\.(git|DS_Store)|^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)|^[^\/]+\.gemspec|\.(swp|jar|bundle|so|rvmrc)$|~$/
+    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store)/,
+                                          /^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)/,
+                                          /^[^\/]+\.gemspec/,
+                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml)$/,
+                                          /~$/)
     @gemspecs              = Hash.new
     yield self if block_given?
   end
@@ -177,7 +181,7 @@ class ThisProject
     if RUBY_VERSION < "1.9.0"
       platform_gemspec.add_development_dependency( 'rcov', '~> 1.0.0' )
     else
-      platform_gemspec.add_development_dependency( 'simplecov', '~> 0.8.2' )
+      platform_gemspec.add_development_dependency( 'simplecov', '~> 0.9' )
     end
   end
 

data/test/test_uuid.rb

@@ -12,6 +12,23 @@ module Torid
       @guid      = "0004fd7d-f50d-e22e-0000-00000000002a"
     end
 
+    def test_uuid_regex_matches
+      assert_match( Torid::UUID::REGEX, @guid )
+    end
+
+    def test_uuid_match
+      assert( Torid::UUID::REGEX.match( @guid ) )
+    end
+
+    def test_uuid_no_match
+      assert_equal( nil, Torid::UUID::REGEX.match( "foo" ))
+    end
+
+    def test_uuid_match_case_insensitive
+      match_data = Torid::UUID::REGEX.match( @guid.upcase )
+      assert_instance_of( MatchData, match_data )
+    end
+
     def test_round_trips_bytes
       uuid = ::Torid::UUID.from( @bytes)
       assert_equal( @bytes, uuid.bytes )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torid
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fnv