web_server_uid 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: 1f4e8a55bfb690af19adc6020144a1239ce1958253d82cde98a5863735535889a451e116f12dcfd33927b3bbe8541930cc5260be1bf1c8f8021cccc09ad0b4f7
-  data.tar.gz: a5b54a5ea1c6a90cca40e472fc7909b3ae23298f6d13cd4ddf54ed23940ad85c125c659d3465e30987aefce6e0e3446e01f6e020dcda4b9cf92ce1bb85c98697
 SHA1: 
-  metadata.gz: 29eb5fec9ff2853494d6752ae159f5df63a40977
-  data.tar.gz: 7730d4f45312472340a561d486bdb960eb1a094e
+  metadata.gz: 1a8a676540be4df67822b2ca72623dde3800bb4c
+  data.tar.gz: cb182fae67d7d1cea39040248e800e4b2b744526
+SHA512: 
+  metadata.gz: 5385c0ce03a88ae0a4fd2f91b314e1a4fb1a86d736ef51cf0c5c1f2fae90f62e86d1e2142f423de470ea24664dd3ea30b5ecad9fb6a3e3f1eb231d5b68d0192e
+  data.tar.gz: 34ef20fb44cd5c59c8bbc75a0a2051ff50ea48a18414276df71d768a369af9fa85b230a53c62fecce13fb30531168c7ccbbeebf05b82e3452555c00fa9f437ad

data/lib/web_server_uid.rb

@@ -110,7 +110,7 @@ class WebServerUid
       ]
 
       binary = components.pack("NNNN")
-      from_binary(binary)
+      new(binary, :generated)
     end
 
     private
@@ -144,6 +144,7 @@ class WebServerUid
   #
   # ...and +type+ must be the corresponding format -- one of :binary, :hex, or :base64. (It is not possible to guess
   # the format 100% reliably from the inbound +raw_data+, since raw binary can happen to look like one of the others.)
+  # (+type+ can also be +:generated+, for exclusive use of +.generate+, above.)
   #
   # +options+ can contain:
   #
@@ -153,7 +154,7 @@ class WebServerUid
   #                                  get exactly that character in the Base64 at the end, and this will translate to
   #                                  extra data.
   def initialize(raw_data, type, options = { })
-    raise ArgumentError, "Type must be one of :binary, :hex, or :base64, not #{type.inspect}" unless [ :binary, :hex, :base64 ].include?(type)
+    raise ArgumentError, "Type must be one of :binary, :hex, or :base64, not #{type.inspect}" unless [ :binary, :hex, :base64, :generated ].include?(type)
     @input_type = type
 
     @binary_components = case type
@@ -163,7 +164,7 @@ class WebServerUid
     when :base64 then
       @raw_binary_data = Base64.decode64(raw_data)
       @raw_binary_data.unpack("NNNN")
-    when :binary then
+    when :binary, :generated then
       @raw_binary_data = raw_data
       @raw_binary_data.unpack("NNNN")
     else
@@ -193,6 +194,14 @@ class WebServerUid
     0
   end
 
+  def to_s
+    "<#{self.class.name} from #{@input_type}: #{to_hex_string}>"
+  end
+
+  def inspect
+    to_s
+  end
+
   include Comparable
 
   # ...well, except for this one. ;)

data/lib/web_server_uid/version.rb

@@ -1,3 +1,3 @@
 class WebServerUid
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/web_server_uid_spec.rb

@@ -74,6 +74,16 @@ describe WebServerUid do
       1000.times { ids << WebServerUid.generate }
       expect(ids.map(&:to_hex_string).uniq.length).to eq(1000)
     end
+
+    it "should turn itself into a string reasonably, and say where it's from" do
+      expect(@generated.to_s).to match(/generated/i)
+      expect(@generated.to_s).to match(/#{@generated.to_hex_string}/i)
+    end
+
+    it "should inspect itself reasonably, and say where it's from" do
+      expect(@generated.inspect).to match(/generated/i)
+      expect(@generated.inspect).to match(/#{@generated.to_hex_string}/i)
+    end
   end
 
   describe "known examples" do
@@ -154,6 +164,16 @@ describe WebServerUid do
         it "should have the right cookie version number" do
           expect(uid.cookie_version_number).to eq(2)
         end
+
+        it "should turn itself into a string reasonably, and say where it's from" do
+          expect(uid.to_s).to match(/#{uid.to_hex_string}/i)
+          expect(uid.to_s).to match(/#{type}/i)
+        end
+
+        it "should inspect itself reasonably, and say where it's from" do
+          expect(uid.inspect).to match(/#{uid.to_hex_string}/i)
+          expect(uid.inspect).to match(/#{type}/i)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: web_server_uid
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Andrew Geweke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-15 00:00:00 Z
+date: 2014-02-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler