ruuid 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12955371c15837c3d5bd2ab62753e04852114933
-  data.tar.gz: 154a406dce57289289633ca8107e24c372bde09f
+  metadata.gz: e771cd338893fc6ba98871678208daffbac1d5c4
+  data.tar.gz: 8383b56ae6a40be9be60fa9655177a53ca551b8b
 SHA512:
-  metadata.gz: 520286586d5dc145c9f5872ec9f24c07e16920350175f8541bb93757ea262aab4a91a62f8f06edc3effccd06bc76da4cb6f38c44a714ef391293e628d0b731ad
-  data.tar.gz: f3a64c3fc5840bb2b1bf89d8ebaa76a8f0432829d64ff4e2c713150233519336b84803842ca4b32f887605ebaaf2b7e12c83114204fddc6b01ed5506b0b27e76
+  metadata.gz: 67467a1ddabc1f10de041011c4cb9529776ea312f4eda91691e55d5a7f8463197ddaa798c181828ab653f919d5268455f6c0170ff1824a63af4fa24b4791f9e6
+  data.tar.gz: c711cb679f5e90c59c3d2ee3bcf414e00f06559e11358c6cdde09806d5a5478c32cc48a667a24ce5102e58538c9e39b7572a86150f4489f5559fa36fed183014

data/README.md

@@ -30,7 +30,7 @@ Or install it yourself as:
 ```ruby
 require 'ruuid'
 
-uuid = RUUID.generate
+uuid = RUUID::UUID.new
 # => <RUUID::UUID:0x70168845476220 data=7cc9f80c-c2e2-4d03-ad35-1e3112dc77de>
 
 uuid.version

data/lib/ruuid/generator.rb

@@ -31,7 +31,12 @@ module RUUID
     end
 
     def generate
-      UUID.from_data(masked_bytes)
+      raw_bytes.tap { |bytes|
+        # Mask version
+        bytes[6] = (bytes[6] & 0x0f) | (version << 4)
+        # Mask variant
+        bytes[8] = (bytes[8] & 0x3f) | 0x80
+      }.collect(&:chr).join
     end
 
     private
@@ -42,14 +47,5 @@ module RUUID
       end
       source.call.bytes
     end
-
-    def masked_bytes
-      raw_bytes.tap { |bytes|
-        # Mask version
-        bytes[6] = (bytes[6] & 0x0f) | (version << 4)
-        # Mask variant
-        bytes[8] = (bytes[8] & 0x3f) | 0x80
-      }.collect(&:chr).join
-    end
   end # Generator
 end # RUUID

data/lib/ruuid/uuid.rb

@@ -2,24 +2,15 @@ module RUUID
   class UUID
     include Comparable
 
-    # @private
-    def self.from_data(data)
-      uuid = allocate
-      uuid.instance_variable_set :@data, data.dup.freeze
-      uuid.validate
-      uuid
-    end
-
     def self.parse(string)
-      from_data(Parser.parse(string))
+      new(Parser.parse(string))
     end
 
-    # @private
-    def initialize
-      raise RuntimeError, 'RUUID::UUID.new is not allowed. Use RUUID.generate instead.'
+    def initialize(data = RUUID.default_generator.generate)
+      @data = normalize(data)
+      validate
     end
 
-    # @private
     attr_reader :data
 
     def to_s(format = RUUID.default_format)
@@ -70,7 +61,8 @@ module RUUID
       data.bytes[6] >> 4
     end
 
-    # @private
+    private
+
     def validate
       unless data.length == 16
         raise InvalidUUIDError, 'Invalid UUID length'
@@ -80,5 +72,9 @@ module RUUID
         raise InvalidUUIDError, 'Invalid UUID variant'
       end
     end
+
+    def normalize(data)
+      data.dup.force_encoding(Encoding::BINARY).freeze
+    end
   end # UUID
 end # RUUID

data/lib/ruuid/version.rb

@@ -1,3 +1,3 @@
 module RUUID
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/ruuid.rb

@@ -16,8 +16,4 @@ module RUUID
 
   attr_accessor :default_format
   self.default_format = :canonical
-
-  def generate
-    default_generator.generate
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruuid
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Gabe Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler