uuidtools 2.0.0 → 2.1.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+== UUIDTools 2.1.0
+ * completely reworked the MAC address detection code
+ * added additional parsing methods
 == UUIDTools 2.0.0
  * moved to its own module to avoid collisions
 == UUIDTools 1.0.7

data/README

@@ -3,11 +3,11 @@
  possible.
 
 == Example
-  UUID.md5_create(UUID_DNS_NAMESPACE, "www.widgets.com")
+  UUIDTools::UUID.md5_create(UUIDTools::UUID_DNS_NAMESPACE, "www.widgets.com")
   => #<UUID:0x287576 UUID:3d813cbb-47fb-32ba-91df-831e1593ac29>
-  UUID.sha1_create(UUID_DNS_NAMESPACE, "www.widgets.com")
+  UUIDTools::UUID.sha1_create(UUIDTools::UUID_DNS_NAMESPACE, "www.widgets.com")
   => #<UUID:0x2a0116 UUID:21f7f8de-8051-5b89-8680-0195ef798b6a>
-  UUID.timestamp_create
+  UUIDTools::UUID.timestamp_create
   => #<UUID:0x2adfdc UUID:64a5189c-25b3-11da-a97b-00c04fd430c8>
-  UUID.random_create
+  UUIDTools::UUID.random_create
   => #<UUID:0x19013a UUID:984265dc-4200-4f02-ae70-fe4f48964159>

data/lib/uuidtools.rb

@@ -161,6 +161,24 @@ module UUIDTools
         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))
+    end
+
+    # Parse a UUID from a hexdigest String.
+    def self.parse_hexdigest(uuid_hexdigest)
+      unless uuid_hexdigest.kind_of?(String)
+        raise ArgumentError,
+          "Expected String, got #{uuid_hexdigest.class.name} instead."
+      end
+      return self.parse_int(uuid_hexdigest.to_i(16))
+    end
+
     # Creates a UUID from a random value.
     def self.random_create()
       new_uuid = self.parse_raw(SecureRandom.random_bytes(16))
@@ -192,8 +210,7 @@ module UUIDTools
             octet.to_i(16)
           end
         else
-          nodes = []
-          SecureRandom.random_bytes(6).each_byte { |chr| nodes << chr }
+          nodes = SecureRandom.random_bytes(6).unpack("C*")
           nodes[0] |= 0b00000001
         end
         for i in 0..5
@@ -412,13 +429,36 @@ module UUIDTools
       if !defined?(@@mac_address)
         require 'rbconfig'
         os_platform = Config::CONFIG['target_os']
-        if (os_platform =~ /win/ && !(os_platform =~ /darwin/)) ||
-            os_platform =~ /w32/
+        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
+        if os_class == :windows
           script_in_path = true
         else
           script_in_path = Kernel.system("which ifconfig 2>&1 > /dev/null")
         end
-        if os_platform =~ /solaris/
+        if os_class == :solaris
           begin
             ifconfig_output =
               (script_in_path ? `ifconfig -a` : `/sbin/ifconfig -a`)
@@ -439,74 +479,56 @@ module UUIDTools
             rescue Exception
             end
           end
-        elsif os_platform =~ /win/ && !(os_platform =~ /darwin/)
+        elsif os_class == :windows
           begin
-            ifconfig_output = `ipconfig /all`
-            mac_addresses = ifconfig_output.scan(
-              Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join("-")})"))
-            if mac_addresses.size > 0
-              @@mac_address = mac_addresses.first.first.downcase.gsub(/-/, ":")
-            end
+            @@mac_address = parse_mac.call(`ipconfig /all`)
           rescue
           end
         else
           begin
-            mac_addresses = []
-            if os_platform =~ /netbsd/
-              ifconfig_output =
-                (script_in_path ? `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`)
-              mac_addresses = ifconfig_output.scan(
-                Regexp.new("address\: (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
-            elsif os_platform =~ /openbsd/
-              ifconfig_output = `/sbin/ifconfig -a 2>&1`
-              ifconfig_output =
-                (script_in_path ? `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`)
-              mac_addresses = ifconfig_output.scan(
-                Regexp.new("addr (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+            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')
-              ifconfig_output =
-                (script_in_path ? `ifconfig 2>&1` : `/sbin/ifconfig 2>&1`)
-              mac_addresses = ifconfig_output.scan(
-                Regexp.new("ether (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
-              if mac_addresses.size == 0
-                ifconfig_output =
-                  (script_in_path ?
-                    `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`)
-                mac_addresses = ifconfig_output.scan(
-                  Regexp.new("ether (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+              @@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_addresses.size == 0
-                ifconfig_output =
-                  (script_in_path ?
+              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`)
-                mac_addresses = ifconfig_output.scan(
-                  Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+                    `/sbin/ifconfig | grep HWaddr | cut -c39- 2>&1`
+                )
               end
             else
-              ifconfig_output =
-                (script_in_path ? `ifconfig 2>&1` : `/sbin/ifconfig 2>&1`)
-              mac_addresses = ifconfig_output.scan(
-                Regexp.new("ether (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
-              if mac_addresses.size == 0
-                ifconfig_output =
-                  (script_in_path ?
-                    `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`)
-                mac_addresses = ifconfig_output.scan(
-                  Regexp.new("ether (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+              @@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_addresses.size == 0
-                ifconfig_output =
-                  (script_in_path ?
+              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`)
-                mac_addresses = ifconfig_output.scan(
-                  Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+                    `/sbin/ifconfig | grep HWaddr | cut -c39- 2>&1`
+                )
               end
             end
-            if mac_addresses.size > 0
-              @@mac_address = mac_addresses.first.first
-            end
           rescue
           end
         end

data/lib/uuidtools/version.rb

@@ -26,7 +26,7 @@ unless defined? UUID::VERSION
   class UUID
     module VERSION #:nodoc:
       MAJOR = 2
-      MINOR = 0
+      MINOR = 1
       TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')

data/spec/uuidtools/uuid_parsing_spec.rb

@@ -106,4 +106,22 @@ describe UUIDTools::UUID, "when parsing" do
       UUIDTools::UUID.new(0, 0, 0, 0, 0, [0, 0, 0, 0, 0, 0])
     )
   end
+
+  it "should correctly parse integers" do
+    UUIDTools::UUID.new(0, 0, 0, 0, 0, [0, 0, 0, 0, 0, 0]).should ==
+      UUIDTools::UUID.parse_int(0)
+    UUIDTools::UUID.parse_int(0).should be_nil_uuid
+    uuid = UUIDTools::UUID.timestamp_create
+    UUIDTools::UUID.parse_int(uuid.to_i).should == uuid
+  end
+
+  it "should correctly parse hexdigests" do
+    UUIDTools::UUID.new(0, 0, 0, 0, 0, [0, 0, 0, 0, 0, 0]).should ==
+      UUIDTools::UUID.parse_hexdigest("00000000000000000000000000000000")
+    UUIDTools::UUID.parse_hexdigest(
+      "00000000000000000000000000000000"
+    ).should be_nil_uuid
+    uuid = UUIDTools::UUID.timestamp_create
+    UUIDTools::UUID.parse_hexdigest(uuid.hexdigest).should == uuid
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: uuidtools
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Bob Aman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -04:00
+date: 2009-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.2
     version: 
-description: A simple universally unique ID generation library.
+description: |
+  A simple universally unique ID generation library.
+
 email: bob@sporkmonger.com
 executables: []
 
@@ -51,14 +53,11 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- lib/compat
 - lib/compat/securerandom.rb
-- lib/uuidtools
 - lib/uuidtools/version.rb
 - lib/uuidtools.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/uuidtools
 - spec/uuidtools/mac_address_spec.rb
 - spec/uuidtools/utility_spec.rb
 - spec/uuidtools/uuid_creation_spec.rb
@@ -78,6 +77,8 @@ files:
 - README
 has_rdoc: true
 homepage: http://uuidtools.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -99,9 +100,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: uuidtools
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: UUID generator
 test_files: []