uuidtools 2.1.1 → 2.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: a5cf7d8f6def3ddb0c325cfe8d2dec0404b73996c69f559888d74dad4f6519f1
+  data.tar.gz: 4ba7a0931d37d6f14f664e230d38610995d281167ab1c0e0ed2ea6355c93a060
+SHA512:
+  metadata.gz: f9ac42163867349a27f20100c859be1103dec0b5c402f7630371d8debadb8a760b399f4f4369a941111987ca53ab68775947431f21ce29c7d267efb2a88fcc2c
+  data.tar.gz: 20b1d43a62100484f52844a919ba4683ca774da910e572acb865d599af5b6ad795180418746039b7a9b2f24942350a00414ca3309c6987dbf93085330017842c

data/CHANGELOG

@@ -1,3 +1,18 @@
+== UUIDTools 2.2.0
+ * drop support for ruby < 2.3
+ * use Integer vs Fixnum
+ * performance improvements
+== UUIDTools 2.1.5
+ * fixed issue with ip command vs ifconfig
+ * dumped RubyForge related cruft
+ * updated to modern RSpec syntax
+== UUIDTools 2.1.4
+ * various OS-specific improvements to obtaining MAC address
+== UUIDTools 2.1.3
+ * changes to build system
+== UUIDTools 2.1.2
+ * fixed issue with frozen objects
+ * fixed issue with running specs in Ruby 1.9.2
 == UUIDTools 2.1.1
  * fixed issue with Ruby 1.9 compatibility
 == UUIDTools 2.1.0

data/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -0,0 +1,37 @@
+[![Build Status](https://secure.travis-ci.org/sporkmonger/uuidtools.svg)](http://travis-ci.org/sporkmonger/uuidtools)
+
+# UUIDTools
+
+<dl>
+  <dt>Homepage</dt><dd><a href="https://github.com/sporkmonger/uuidtools">sporkmonger/uuidtools</a></dd>
+  <dt>Author</dt><dd><a href="mailto:bob@sporkmonger.com">Bob Aman</a></dd>
+  <dt>Copyright</dt><dd>Copyright © 2005-2014 Bob Aman</dd>
+  <dt>License</dt><dd>Apache 2.0</dd>
+</dl>
+
+# Description
+
+UUIDTools was designed to be a simple library for generating any
+of the various types of UUIDs.  It conforms to RFC 4122 whenever
+possible.
+
+# Reference
+
+- {UUIDTools::UUID}
+
+# Example usage
+
+    require "uuidtools"
+
+    UUIDTools::UUID.md5_create(UUIDTools::UUID_DNS_NAMESPACE, "www.widgets.com")
+    # => #<UUID:0x287576 UUID:3d813cbb-47fb-32ba-91df-831e1593ac29>
+    UUIDTools::UUID.sha1_create(UUIDTools::UUID_DNS_NAMESPACE, "www.widgets.com")
+    # => #<UUID:0x2a0116 UUID:21f7f8de-8051-5b89-8680-0195ef798b6a>
+    UUIDTools::UUID.timestamp_create
+    # => #<UUID:0x2adfdc UUID:64a5189c-25b3-11da-a97b-00c04fd430c8>
+    UUIDTools::UUID.random_create
+    # => #<UUID:0x19013a UUID:984265dc-4200-4f02-ae70-fe4f48964159>
+
+# Install
+
+    $ sudo gem install uuidtools

data/Rakefile

@@ -1,29 +1,21 @@
-lib_dir = File.expand_path(File.join(File.dirname(__FILE__), "lib"))
-$:.unshift(lib_dir)
-$:.uniq!
-
 require 'rubygems'
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'spec/rake/spectask'
 
-require File.join(File.dirname(__FILE__), 'lib/uuidtools', 'version')
+require File.join(File.dirname(__FILE__), 'lib', 'uuidtools', 'version')
 
 PKG_DISPLAY_NAME   = 'UUIDTools'
 PKG_NAME           = PKG_DISPLAY_NAME.downcase
-PKG_VERSION        = UUID::VERSION::STRING
+PKG_VERSION        = UUIDTools::VERSION::STRING
 PKG_FILE_NAME      = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME       = "REL #{PKG_VERSION}"
 
-RUBY_FORGE_PROJECT = PKG_NAME
-RUBY_FORGE_USER    = "sporkmonger"
-RUBY_FORGE_PATH    = "/var/www/gforge-projects/#{RUBY_FORGE_PROJECT}"
-RUBY_FORGE_URL     = "http://#{RUBY_FORGE_PROJECT}.rubyforge.org/"
+GIT_HUB_USER       = "sporkmonger"
+GIT_HUB_URL        = "https://github.com/#{GIT_HUB_USER}/#{PKG_NAME}"
 
+PKG_AUTHOR         = "Bob Aman"
+PKG_AUTHOR_EMAIL   = "bob@sporkmonger.com"
+PKG_HOMEPAGE       = GIT_HUB_URL
 PKG_SUMMARY        = "UUID generator"
 PKG_DESCRIPTION    = <<-TEXT
 A simple universally unique ID generation library.
@@ -33,14 +25,9 @@ PKG_FILES = FileList[
     "lib/**/*", "spec/**/*", "vendor/**/*",
     "tasks/**/*", "website/**/*",
     "[A-Z]*", "Rakefile"
-].exclude(/database\.yml/).exclude(/[_\.]git$/)
-
-RCOV_ENABLED = (RUBY_PLATFORM != "java" && RUBY_VERSION =~ /^1\.8/)
-if RCOV_ENABLED
-  task :default => "spec:verify"
-else
-  task :default => "spec"
-end
+].exclude(/database\.yml/).exclude(/[_\.]git$/).exclude(/Gemfile/).exclude(/Gemfile\.lock/)
+
+task :default => "spec"
 
 WINDOWS = (RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/) rescue false
 SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])

data/lib/uuidtools.rb

@@ -1,26 +1,21 @@
+# encoding:utf-8
 #--
-# UUIDTools, Copyright (c) 2005-2008 Bob Aman
+# Copyright (C) 2005-2014 Bob Aman
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+#        http://www.apache.org/licenses/LICENSE-2.0
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
 #++
 
+
 $:.unshift(File.dirname(__FILE__))
 
 require 'uri'
@@ -38,30 +33,50 @@ rescue LoadError
 end
 
 module UUIDTools
-  #= uuidtools.rb
-  #
+  ##
   # UUIDTools was designed to be a simple library for generating any
   # of the various types of UUIDs.  It conforms to RFC 4122 whenever
   # possible.
   #
-  #== Example
-  #  UUID.md5_create(UUID_DNS_NAMESPACE, "www.widgets.com")
-  #  => #<UUID:0x287576 UUID:3d813cbb-47fb-32ba-91df-831e1593ac29>
-  #  UUID.sha1_create(UUID_DNS_NAMESPACE, "www.widgets.com")
-  #  => #<UUID:0x2a0116 UUID:21f7f8de-8051-5b89-8680-0195ef798b6a>
-  #  UUID.timestamp_create
-  #  => #<UUID:0x2adfdc UUID:64a5189c-25b3-11da-a97b-00c04fd430c8>
-  #  UUID.random_create
-  #  => #<UUID:0x19013a UUID:984265dc-4200-4f02-ae70-fe4f48964159>
+  # @example
+  #   UUID.md5_create(UUID_DNS_NAMESPACE, "www.widgets.com")
+  #   # => #<UUID:0x287576 UUID:3d813cbb-47fb-32ba-91df-831e1593ac29>
+  #   UUID.sha1_create(UUID_DNS_NAMESPACE, "www.widgets.com")
+  #   # => #<UUID:0x2a0116 UUID:21f7f8de-8051-5b89-8680-0195ef798b6a>
+  #   UUID.timestamp_create
+  #   # => #<UUID:0x2adfdc UUID:64a5189c-25b3-11da-a97b-00c04fd430c8>
+  #   UUID.random_create
+  #   # => #<UUID:0x19013a UUID:984265dc-4200-4f02-ae70-fe4f48964159>
   class UUID
     include Comparable
 
+    ##
+    # @api private
     @@last_timestamp = nil
+
+    ##
+    # @api private
     @@last_node_id = nil
+
+    ##
+    # @api private
     @@last_clock_sequence = nil
+
+    ##
+    # @api private
     @@state_file = nil
+
+    ##
+    # @api private
     @@mutex = Mutex.new
 
+    ##
+    # Creates a new UUID structure from its component values.
+    # @see UUID.md5_create
+    # @see UUID.sha1_create
+    # @see UUID.timestamp_create
+    # @see UUID.random_create
+    # @api private
     def initialize(time_low, time_mid, time_hi_and_version,
         clock_seq_hi_and_reserved, clock_seq_low, nodes)
       unless time_low >= 0 && time_low < 4294967296
@@ -110,22 +125,38 @@ module UUIDTools
       @nodes = nodes
     end
 
+    ##
+    # Returns the value of attribute `time_low`
     attr_accessor :time_low
+
+    ##
+    # Returns the value of attribute `time_mid`
     attr_accessor :time_mid
+
+    ##
+    # Returns the value of attribute `time_hi_and_version`
     attr_accessor :time_hi_and_version
+
+    ##
+    # Returns the value of attribute `clock_seq_hi_and_reserved`
     attr_accessor :clock_seq_hi_and_reserved
+
+    ##
+    # Returns the value of attribute `clock_seq_low`
     attr_accessor :clock_seq_low
+
+    ##
+    # Returns the value of attribute `nodes`
     attr_accessor :nodes
 
+    ##
     # Parses a UUID from a string.
     def self.parse(uuid_string)
       unless uuid_string.kind_of? String
         raise TypeError,
           "Expected String, got #{uuid_string.class.name} instead."
       end
-      uuid_components = uuid_string.downcase.scan(
-        Regexp.new("^([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-" +
-          "([0-9a-f]{2})([0-9a-f]{2})-([0-9a-f]{12})$")).first
+      uuid_components = uuid_string.downcase.scan(UUIDTools::UUID_REGEXP).first
       raise ArgumentError, "Invalid UUID format." if uuid_components.nil?
       time_low = uuid_components[0].to_i(16)
       time_mid = uuid_components[1].to_i(16)
@@ -133,52 +164,114 @@ module UUIDTools
       clock_seq_hi_and_reserved = uuid_components[3].to_i(16)
       clock_seq_low = uuid_components[4].to_i(16)
       nodes = []
-      for i in 0..5
+      6.times do |i|
         nodes << uuid_components[5][(i * 2)..(i * 2) + 1].to_i(16)
       end
       return self.new(time_low, time_mid, time_hi_and_version,
         clock_seq_hi_and_reserved, clock_seq_low, nodes)
     end
 
+    ##
     # Parses a UUID from a raw byte string.
     def self.parse_raw(raw_string)
       unless raw_string.kind_of? String
         raise TypeError,
           "Expected String, got #{raw_string.class.name} instead."
       end
-      integer = self.convert_byte_string_to_int(raw_string)
 
-      time_low = (integer >> 96) & 0xFFFFFFFF
-      time_mid = (integer >> 80) & 0xFFFF
-      time_hi_and_version = (integer >> 64) & 0xFFFF
-      clock_seq_hi_and_reserved = (integer >> 56) & 0xFF
-      clock_seq_low = (integer >> 48) & 0xFF
+      if raw_string.respond_to?(:force_encoding)
+        raw_string.force_encoding(Encoding::ASCII_8BIT)
+      end
+
+      raw_length = raw_string.length
+      if raw_length < 16
+        # Option A: Enforce raw_string be 16 characters (More strict)
+        #raise ArgumentError,
+        #  "Expected 16 bytes, got #{raw_string.length} instead."
+
+        # Option B: Pad raw_string to 16 characters (Compatible with existing behavior)
+        raw_string = raw_string.rjust(16, "\0")
+      elsif raw_length > 16
+        # NOTE: As per "Option B" above, existing behavior would use the lower
+        # 128-bits of an overly long raw_string instead of using the upper 128-bits.
+        start_index = raw_length - 16
+        raw_string = raw_string[start_index...raw_length]
+      end
+
+      raw_bytes = []
+      if raw_string[0].respond_to? :ord
+        for i in 0...raw_string.size
+          raw_bytes << raw_string[i].ord
+        end
+      else
+        raw_bytes = raw_string
+      end
+
+      time_low = ((raw_bytes[0] << 24) +
+                  (raw_bytes[1] << 16)  +
+                  (raw_bytes[2] << 8)  +
+                   raw_bytes[3])
+      time_mid = ((raw_bytes[4] << 8) +
+                   raw_bytes[5])
+      time_hi_and_version = ((raw_bytes[6] << 8) +
+                              raw_bytes[7])
+      clock_seq_hi_and_reserved = raw_bytes[8]
+      clock_seq_low = raw_bytes[9]
       nodes = []
-      for i in 0..5
-        nodes << ((integer >> (40 - (i * 8))) & 0xFF)
+      for i in 10...16
+        nodes << raw_bytes[i]
       end
+
       return self.new(time_low, time_mid, time_hi_and_version,
-        clock_seq_hi_and_reserved, clock_seq_low, nodes)
+                      clock_seq_hi_and_reserved, clock_seq_low, nodes)
     end
 
+    ##
     # Parses a UUID from an Integer.
     def self.parse_int(uuid_int)
       unless uuid_int.kind_of?(Integer)
         raise ArgumentError,
           "Expected Integer, got #{uuid_int.class.name} instead."
       end
-      return self.parse_raw(self.convert_int_to_byte_string(uuid_int, 16))
+
+      time_low = (uuid_int >> 96) & 0xFFFFFFFF
+      time_mid = (uuid_int >> 80) & 0xFFFF
+      time_hi_and_version = (uuid_int >> 64) & 0xFFFF
+      clock_seq_hi_and_reserved = (uuid_int >> 56) & 0xFF
+      clock_seq_low = (uuid_int >> 48) & 0xFF
+      nodes = []
+      for i in 0..5
+        nodes << ((uuid_int >> (40 - (i * 8))) & 0xFF)
+      end
+
+      return self.new(time_low, time_mid, time_hi_and_version,
+                      clock_seq_hi_and_reserved, clock_seq_low, nodes)
     end
 
+    ##
     # Parse a UUID from a hexdigest String.
-    def self.parse_hexdigest(uuid_hexdigest)
-      unless uuid_hexdigest.kind_of?(String)
+    def self.parse_hexdigest(uuid_hex)
+      unless uuid_hex.kind_of?(String)
         raise ArgumentError,
-          "Expected String, got #{uuid_hexdigest.class.name} instead."
+          "Expected String, got #{uuid_hex.class.name} instead."
       end
-      return self.parse_int(uuid_hexdigest.to_i(16))
+
+      time_low = uuid_hex[0...8].to_i(16)
+      time_mid = uuid_hex[8...12].to_i(16)
+      time_hi_and_version = uuid_hex[12...16].to_i(16)
+      clock_seq_hi_and_reserved = uuid_hex[16...18].to_i(16)
+      clock_seq_low = uuid_hex[18...20].to_i(16)
+      nodes_string = uuid_hex[20...32]
+      nodes = []
+      for i in 0..5
+        nodes << nodes_string[(i * 2)..(i * 2) + 1].to_i(16)
+      end
+
+      return self.new(time_low, time_mid, time_hi_and_version,
+                      clock_seq_hi_and_reserved, clock_seq_low, nodes)
     end
 
+    ##
     # Creates a UUID from a random value.
     def self.random_create()
       new_uuid = self.parse_raw(SecureRandom.random_bytes(16))
@@ -189,6 +282,7 @@ module UUIDTools
       return new_uuid
     end
 
+    ##
     # Creates a UUID from a timestamp.
     def self.timestamp_create(timestamp=nil)
       # We need a lock here to prevent two threads from ever
@@ -213,7 +307,7 @@ module UUIDTools
           nodes = SecureRandom.random_bytes(6).unpack("C*")
           nodes[0] |= 0b00000001
         end
-        for i in 0..5
+        6.times do |i|
           node_id += (nodes[i] << (40 - (i * 8)))
         end
         clock_sequence = @@last_clock_sequence
@@ -248,16 +342,19 @@ module UUIDTools
       end
     end
 
+    ##
     # Creates a UUID using the MD5 hash.  (Version 3)
     def self.md5_create(namespace, name)
       return self.create_from_hash(Digest::MD5, namespace, name)
     end
 
+    ##
     # Creates a UUID using the SHA1 hash.  (Version 5)
     def self.sha1_create(namespace, name)
       return self.create_from_hash(Digest::SHA1, namespace, name)
     end
 
+    ##
     # This method applies only to version 1 UUIDs.
     # Checks if the node ID was generated from a random number
     # or from an IEEE 802 address (MAC address).
@@ -269,6 +366,7 @@ module UUIDTools
       return ((self.nodes.first & 0x01) == 1)
     end
 
+    ##
     # Returns true if this UUID is the
     # nil UUID (00000000-0000-0000-0000-000000000000).
     def nil_uuid?
@@ -283,6 +381,7 @@ module UUIDTools
       return true
     end
 
+    ##
     # Returns the UUID version type.
     # Possible values:
     # 1 - Time-based with unique or random host identifier
@@ -294,6 +393,7 @@ module UUIDTools
       return (time_hi_and_version >> 12)
     end
 
+    ##
     # Returns the UUID variant.
     # Possible values:
     # 0b000 - Reserved, NCS backward compatibility.
@@ -313,6 +413,7 @@ module UUIDTools
       return (result >> 6)
     end
 
+    ##
     # Returns true if this UUID is valid.
     def valid?
       if [0b000, 0b100, 0b110, 0b111].include?(self.variant) &&
@@ -323,6 +424,7 @@ module UUIDTools
       end
     end
 
+    ##
     # Returns the IEEE 802 address used to generate this UUID or
     # nil if a MAC address was not used.
     def mac_address
@@ -333,6 +435,7 @@ module UUIDTools
       end).join(":")
     end
 
+    ##
     # Returns the timestamp used to generate this UUID
     def timestamp
       return nil if self.version != 1
@@ -345,8 +448,10 @@ module UUIDTools
         (gmt_timestamp_100_nanoseconds - 0x01B21DD213814000) / 10000000.0)
     end
 
+    ##
     # Compares two UUIDs lexically
     def <=>(other_uuid)
+      return nil unless other_uuid.is_a?(UUIDTools::UUID)
       check = self.time_low <=> other_uuid.time_low
       return check if check != 0
       check = self.time_mid <=> other_uuid.time_mid
@@ -358,7 +463,7 @@ module UUIDTools
       return check if check != 0
       check = self.clock_seq_low <=> other_uuid.clock_seq_low
       return check if check != 0
-      for i in 0..5
+      6.times do |i|
         if (self.nodes[i] < other_uuid.nodes[i])
           return -1
         end
@@ -369,169 +474,224 @@ module UUIDTools
       return 0
     end
 
+    ##
     # Returns a representation of the object's state
     def inspect
       return "#<UUID:0x#{self.object_id.to_s(16)} UUID:#{self.to_s}>"
     end
 
+    ##
     # Returns the hex digest of the UUID object.
     def hexdigest
-      return self.to_i.to_s(16).rjust(32, "0")
+      (self.frozen? ?
+        generate_hexdigest : (@hexdigest ||= generate_hexdigest)
+      ).dup
     end
 
+    ##
     # Returns the raw bytes that represent this UUID.
     def raw
-      return self.class.convert_int_to_byte_string(self.to_i, 16)
+      (self.frozen? ? generate_raw : (@raw ||= generate_raw)).dup
     end
 
+    ##
     # Returns a string representation for this UUID.
     def to_s
-      result = sprintf("%8.8x-%4.4x-%4.4x-%2.2x%2.2x-", @time_low, @time_mid,
-        @time_hi_and_version, @clock_seq_hi_and_reserved, @clock_seq_low);
-      for i in 0..5
-        result << sprintf("%2.2x", @nodes[i])
-      end
-      return result.downcase
+      (self.frozen? ? generate_s : (@string ||= generate_s)).dup
     end
     alias_method :to_str, :to_s
 
+    ##
     # Returns an integer representation for this UUID.
     def to_i
-      @integer ||= (begin
+      self.frozen? ? generate_i : (@integer ||= generate_i)
+    end
+
+    ##
+    # Returns a URI string for this UUID.
+    def to_uri
+      return "urn:uuid:#{self.to_s}"
+    end
+
+    ##
+    # Returns an integer hash value.
+    def hash
+      self.frozen? ? generate_hash : (@hash ||= generate_hash)
+    end
+
+  protected
+    ##
+    # Generates the hex digest of the UUID object.
+    #
+    # @api private
+    def generate_hexdigest
+      return self.to_i.to_s(16).rjust(32, "0")
+    end
+
+    # Generates an integer hash value.
+    #
+    # @api private
+    def generate_hash
+      return self.to_i % 0x3fffffff
+    end
+
+    ##
+    # Generates an integer representation for this UUID.
+    #
+    # @api private
+    def generate_i
+      return (begin
         bytes = (time_low << 96) + (time_mid << 80) +
           (time_hi_and_version << 64) + (clock_seq_hi_and_reserved << 56) +
           (clock_seq_low << 48)
-        for i in 0..5
+        6.times do |i|
           bytes += (nodes[i] << (40 - (i * 8)))
         end
         bytes
       end)
     end
 
-    # Returns a URI string for this UUID.
-    def to_uri
-      return "urn:uuid:#{self.to_s}"
+    ##
+    # Generates a string representation for this UUID.
+    #
+    # @api private
+    def generate_s
+      result = sprintf("%8.8x-%4.4x-%4.4x-%2.2x%2.2x-", @time_low, @time_mid,
+        @time_hi_and_version, @clock_seq_hi_and_reserved, @clock_seq_low);
+      6.times do |i|
+        result << sprintf("%2.2x", @nodes[i])
+      end
+      return result.downcase
     end
 
-    # Returns an integer hash value.
-    def hash
-      @hash ||= self.to_i % 0x3fffffff
+    ##
+    # Generates the raw bytes that represent this UUID.
+    #
+    # @api private
+    def generate_raw
+      return self.class.convert_int_to_byte_string(self.to_i, 16)
     end
 
+  public
+    ##
     # Returns true if this UUID is exactly equal to the other UUID.
     def eql?(other)
       return self == other
     end
 
+    #
+    # Determine what OS we're running on.  Helps decide how to find the MAC
+    #
+    def self.os_class
+      require 'rbconfig'
+      os_platform = RbConfig::CONFIG['target_os']
+      os_class = nil
+      if (os_platform =~ /win/i && !(os_platform =~ /darwin/i)) ||
+          os_platform =~ /w32/i
+        os_class = :windows
+      elsif os_platform =~ /solaris/i
+        os_class = :solaris
+      elsif os_platform =~ /netbsd/i
+        os_class = :netbsd
+      elsif os_platform =~ /openbsd/i
+        os_class = :openbsd
+      end
+    end
+
+    # making these class variables helps with testing
+    @ifconfig_command = "ifconfig"
+    @ifconfig_path_default = "/sbin/ifconfig"
+    @ip_command = "ip"
+    @ip_path_default = "/sbin/ip"
+
+    class << self
+      attr_accessor :ifconfig_command, :ifconfig_path_default
+      attr_accessor :ip_command, :ip_path_default
+    end
+
+    #
+    # Find the path of the ifconfig(8) command if it is present
+    #
+    def self.ifconfig_path
+      path = `which #{UUID.ifconfig_command} 2>/dev/null`.strip
+      path = UUID.ifconfig_path_default if (path == "" && File.exist?(UUID.ifconfig_path_default))
+      return (path === "" ? nil : path)
+    end
+
+    #
+    # Find the path of the ip(8) command if it is present
+    #
+    def self.ip_path
+      path = `which #{UUID.ip_command} 2>/dev/null`.strip
+      path = UUID.ip_path_default if (path == "" && File.exist?(UUID.ip_path_default))
+      return (path === "" ? nil : path)
+    end
+
+    #
+    # Call the ifconfig or ip command that is found
+    #
+    def self.ifconfig(all=nil)
+      # find the path of the ifconfig command
+      ifconfig_path = UUID.ifconfig_path
+
+      # if it does not exist, try the ip command
+      if ifconfig_path == nil
+        ifconfig_path = "#{UUID.ip_path} addr list"
+        # all makes no sense when using ip(1)
+        all = nil
+      end
+
+      all_switch = all == nil ? "" : "-a"
+      return `#{ifconfig_path} #{all_switch}` if not ifconfig_path == nil
+    end
+
+    # Match and return the first Mac address found
+    def self.first_mac(instring)
+      mac_regexps = [
+        Regexp.new("address:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
+        Regexp.new("addr:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
+        Regexp.new("ether:? (#{(["[0-9a-fA-F]{1,2}"] * 6).join(":")})"),
+        Regexp.new("HWaddr:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
+        Regexp.new("link/ether? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
+        Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
+        Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join("-")})")
+      ]
+      parse_mac = lambda do |output|
+        (mac_regexps.map do |regexp|
+           result = output[regexp, 1]
+           result.downcase.gsub(/-/, ":") if result != nil
+        end).compact.first
+      end
+
+      mac = parse_mac.call(instring)
+      if mac
+        # expand octets that were compressed (solaris)
+        return (mac.split(':').map do |octet|
+          (octet.length == 1 ? "0#{octet}" : octet)
+        end).join(':')
+      else
+        return nil
+      end
+    end
+
+    ##
     # Returns the MAC address of the current computer's network card.
     # Returns nil if a MAC address could not be found.
-    def self.mac_address #:nodoc:
+    def self.mac_address
       if !defined?(@@mac_address)
         require 'rbconfig'
-        os_platform = Config::CONFIG['target_os']
-        os_class = nil
-        if (os_platform =~ /win/i && !(os_platform =~ /darwin/i)) ||
-            os_platform =~ /w32/i
-          os_class = :windows
-        elsif os_platform =~ /solaris/i
-          os_class = :solaris
-        elsif os_platform =~ /netbsd/i
-          os_class = :netbsd
-        elsif os_platform =~ /openbsd/i
-          os_class = :openbsd
-        end
-        mac_regexps = [
-          Regexp.new("address:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
-          Regexp.new("addr:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
-          Regexp.new("ether:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
-          Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
-          Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join("-")})")
-        ]
-        parse_mac = lambda do |output|
-          (mac_regexps.map do |regexp|
-            result = output[regexp, 1]
-            result.downcase.gsub(/-/, ":") if result != nil
-          end).compact.first
-        end
+
+        os_class = UUID.os_class
+
         if os_class == :windows
-          script_in_path = true
-        else
-          script_in_path = Kernel.system("which ifconfig 2>&1 > /dev/null")
-        end
-        if os_class == :solaris
-          begin
-            ifconfig_output =
-              (script_in_path ? `ifconfig -a` : `/sbin/ifconfig -a`)
-            ip_addresses = ifconfig_output.scan(
-              /inet\s?(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/)
-            ip = ip_addresses.find {|addr| addr[0] != '127.0.0.1'}[0]
-            @@mac_address = `/usr/sbin/arp #{ip}`.split(' ')[3]
-          rescue Exception
-          end
-          if @@mac_address == "" || @@mac_address == nil
-            begin
-              ifconfig_output =
-                (script_in_path ?
-                  `ifconfig -a` : `/sbin/ifconfig -a`).split(' ')
-              index = ifconfig_output.index("inet") + 1
-              ip = ifconfig_output[index]
-              @@mac_address = `arp #{ip}`.split(' ')[3]
-            rescue Exception
-            end
-          end
-        elsif os_class == :windows
           begin
-            @@mac_address = parse_mac.call(`ipconfig /all`)
-          rescue
-          end
-        else
-          begin
-            if os_class == :netbsd
-              @@mac_address = parse_mac.call(
-                script_in_path ? `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`
-              )
-            elsif os_class == :openbsd
-              @@mac_address = parse_mac.call(
-                script_in_path ? `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`
-              )
-            elsif File.exists?('/sbin/ifconfig')
-              @@mac_address = parse_mac.call(
-                script_in_path ? `ifconfig 2>&1` : `/sbin/ifconfig 2>&1`
-              )
-              if @@mac_address == nil
-                @@mac_address = parse_mac.call(
-                  script_in_path ?
-                    `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`
-                )
-              end
-              if @@mac_address == nil
-                @@mac_address = parse_mac.call(
-                  script_in_path ?
-                    `ifconfig | grep HWaddr | cut -c39- 2>&1` :
-                    `/sbin/ifconfig | grep HWaddr | cut -c39- 2>&1`
-                )
-              end
-            else
-              @@mac_address = parse_mac.call(
-                script_in_path ? `ifconfig 2>&1` : `/sbin/ifconfig 2>&1`
-              )
-              if @@mac_address == nil
-                @@mac_address = parse_mac.call(
-                  script_in_path ?
-                    `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`
-                )
-              end
-              if @@mac_address == nil
-                @@mac_address = parse_mac.call(
-                  script_in_path ?
-                    `ifconfig | grep HWaddr | cut -c39- 2>&1` :
-                    `/sbin/ifconfig | grep HWaddr | cut -c39- 2>&1`
-                )
-              end
-            end
+            @@mac_address = UUID.first_mac `ipconfig /all`
           rescue
           end
+        else # linux, bsd, macos, solaris
+          @@mac_address = UUID.first_mac(UUID.ifconfig(:all))
         end
+
         if @@mac_address != nil
           if @@mac_address.respond_to?(:to_str)
             @@mac_address = @@mac_address.to_str
@@ -552,6 +712,7 @@ module UUIDTools
       return @@mac_address
     end
 
+    ##
     # Allows users to set the MAC address manually in cases where the MAC
     # address cannot be obtained programatically.
     def self.mac_address=(new_mac_address)
@@ -561,8 +722,12 @@ module UUIDTools
     # The following methods are not part of the public API,
     # and generally should not be called directly.
 
+
+    ##
     # Creates a new UUID from a SHA1 or MD5 hash
-    def self.create_from_hash(hash_class, namespace, name) #:nodoc:
+    #
+    # @api private
+    def self.create_from_hash(hash_class, namespace, name)
       if hash_class == Digest::MD5
         version = 3
       elsif hash_class == Digest::SHA1
@@ -585,34 +750,60 @@ module UUIDTools
       return new_uuid
     end
 
-    def self.convert_int_to_byte_string(integer, size) #:nodoc:
+    ##
+    # @api private
+    def self.convert_int_to_byte_string(integer, size)
       byte_string = ""
       if byte_string.respond_to?(:force_encoding)
         byte_string.force_encoding(Encoding::ASCII_8BIT)
       end
-      for i in 0..(size - 1)
+      size.times do |i|
         byte_string << ((integer >> (((size - 1) - i) * 8)) & 0xFF)
       end
       return byte_string
     end
 
-    def self.convert_byte_string_to_int(byte_string) #:nodoc:
+    ##
+    # @api private
+    def self.convert_byte_string_to_int(byte_string)
       if byte_string.respond_to?(:force_encoding)
         byte_string.force_encoding(Encoding::ASCII_8BIT)
       end
+
       integer = 0
       size = byte_string.size
-      for i in 0..(size - 1)
-        ordinal = (byte_string[i].respond_to?(:ord) ?
-          byte_string[i].ord : byte_string[i])
-        integer += (ordinal << (((size - 1) - i) * 8))
+      if byte_string[0].respond_to? :ord
+        for i in 0...size
+          integer += (byte_string[i].ord << (((size - 1) - i) * 8))
+        end
+      else
+        for i in 0...size
+          integer += (byte_string[i] << (((size - 1) - i) * 8))
+        end
       end
+      
       return integer
     end
   end
 
+  ##
+  # Constant Regexp that matches a UUID and captures its components.
+  UUID_REGEXP = Regexp.new("^([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-" +
+                          "([0-9a-f]{2})([0-9a-f]{2})-([0-9a-f]{12})$")
+
+  ##
+  # Constant that represents the DNS namespace.
   UUID_DNS_NAMESPACE = UUID.parse("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
+
+  ##
+  # Constant that represents the URL namespace.
   UUID_URL_NAMESPACE = UUID.parse("6ba7b811-9dad-11d1-80b4-00c04fd430c8")
+
+  ##
+  # Constant that represents the OID namespace.
   UUID_OID_NAMESPACE = UUID.parse("6ba7b812-9dad-11d1-80b4-00c04fd430c8")
+
+  ##
+  # Constant that represents the X500 namespace.
   UUID_X500_NAMESPACE = UUID.parse("6ba7b814-9dad-11d1-80b4-00c04fd430c8")
 end