uuidtools 2.1.1 → 2.1.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 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/lib/uuidtools.rb

@@ -376,28 +376,76 @@ module UUIDTools
 
     # Returns the hex digest of the UUID object.
     def hexdigest
-      return self.to_i.to_s(16).rjust(32, "0")
+      return @hexdigest unless @hexdigest.nil?
+      if self.frozen?
+        return generate_hexdigest
+      else
+        return (@hexdigest = generate_hexdigest)
+      end
     end
 
     # Returns the raw bytes that represent this UUID.
     def raw
-      return self.class.convert_int_to_byte_string(self.to_i, 16)
+      return @raw unless @raw.nil?
+      if self.frozen?
+        return generate_raw
+      else
+        return (@raw = generate_raw)
+      end
     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])
+      return @string unless @string.nil?
+      if self.frozen?
+        return generate_s
+      else
+        return (@string = generate_s)
       end
-      return result.downcase
     end
     alias_method :to_str, :to_s
 
     # Returns an integer representation for this UUID.
     def to_i
-      @integer ||= (begin
+      return @integer unless @integer.nil?
+      if self.frozen?
+        return generate_i
+      else
+        return (@integer = generate_i)
+      end
+    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
+      return @hash unless @hash.nil?
+      if self.frozen?
+        return generate_hash
+      else
+        return (@hash = generate_hash)
+      end
+    end
+
+    #These methods generate the appropriate representations the above methods cache
+    protected
+    
+    # Generates the hex digest of the UUID object.
+    def generate_hexdigest
+      return self.to_i.to_s(16).rjust(32, "0")
+    end
+    
+    # Generates an integer hash value.
+    def generate_hash
+      return self.to_i % 0x3fffffff
+    end
+    
+    # Generates an integer representation for this UUID.
+    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)
@@ -407,16 +455,23 @@ module UUIDTools
         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.
+    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);
+      for i in 0..5
+        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.
+    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)

data/lib/uuidtools/version.rb

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

data/spec/uuidtools/mac_address_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "../spec_helper.rb")
+require File.expand_path("../../spec_helper.rb", __FILE__)
 
 describe UUIDTools::UUID, "when obtaining a MAC address" do
   before do

data/spec/uuidtools/utility_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "../spec_helper.rb")
+require File.expand_path("../../spec_helper.rb", __FILE__)
 
 describe SecureRandom do
   it "should correctly obtain random bits" do

data/spec/uuidtools/uuid_creation_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "../spec_helper.rb")
+require File.expand_path("../../spec_helper.rb", __FILE__)
 
 describe UUIDTools::UUID, "when generating" do
   it "should correctly generate SHA1 variant UUIDs" do

data/spec/uuidtools/uuid_parsing_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "../spec_helper.rb")
+require File.expand_path("../../spec_helper.rb", __FILE__)
 
 describe UUIDTools::UUID, "when parsing" do
   it "should correctly parse the MAC address from a timestamp version UUID" do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uuidtools
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  hash: 15
+  prerelease: 
+  segments: 
+  - 2
+  - 1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Bob Aman
@@ -9,39 +15,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-13 00:00:00 -04:00
+date: 2011-02-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
         version: 0.8.3
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 1
+        - 11
         version: 1.1.11
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: launchy
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
-    version: 
+  type: :development
+  version_requirements: *id003
 description: |
   A simple universally unique ID generation library.
 
@@ -86,21 +110,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: uuidtools
-rubygems_version: 1.3.4
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: UUID generator