noid 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 1cc8131a9c265bd3f5a97a0a1a6127473c7aac72
-  data.tar.gz: 251bc9bf4d40a678c7feef0dacd6df64eba6fbf6
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDE0ZDYxMWVjODZhOGEwODM0NDRiZThjZmZhMWU3YTVjZjZjYTEwNw==
+  data.tar.gz: !binary |-
+    ZWY4NGM2YjcwMGViNmQxMTk1MmU1OTYzNGFiMDQ1ODk1YTI1ZjE3Mw==
 SHA512:
-  metadata.gz: ec5f8701d9b8e0a3b6751bccc2c34112380604c32eae49b13a2c9aa94b016c38726a92bf8f653df2b922552664bbce74f0b6d955035cb83420c10c13b5771e5a
-  data.tar.gz: 22659b109cabc3de9feff9febb2a4f059802ed0b6dc0fcb83758d4c750ef4ccadc724286714cfce52260de3a8b656de979717b868f20da94e0c20d6124edca7c
+  metadata.gz: !binary |-
+    MmIxY2RiNWUzNjFmZmE1MmY4YjE1YjgxZTFkZTIwMDZhNWYwZTI1ZWM5NWE5
+    MDcyZDFhMmE5ZWQxZDVhOWIwYzRmNjdjOGViZjA4NDQ4ZjcwOTViOWU3ZDcz
+    NDE5ZjhhNWIwMDk3Y2IzZGUzZDI1Zjk5ZDE3NzBlYTE1MDVjNGE=
+  data.tar.gz: !binary |-
+    MDdlODMyZDMxYWExNzM5MTY4ZGY5ZjkzNzJhMDc0MDUwODg0OTA2OGEwNDJh
+    MzRmNDdjNTk0NWE4NzkzZTYwMDJlNTBmZGY0MjgwZmMwZWNlNjgwMWMzZTYw
+    NjYyNWM3OGMxYzMxNTVmOGZkNTU1Y2RkMDQ5MTc2Y2I4YzczY2M=

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/noid/minter.rb

@@ -72,7 +72,7 @@ module Noid
       @seed = @rand.seed
       @seq = seq || 0
 
-      seq.times { @rand.rand } if seq
+      seq.times { next_random } if seq
 
       @rand
     end
@@ -82,15 +82,20 @@ module Noid
       @seq += 1
       case template.generator
         when 'r'
-          raise Exception("Exhausted noid sequence pool") if counters.size == 0
-          i = @rand.rand(counters.size)
-          n = counters[i][:value]
-          counters[i][:value] += 1
-          counters.delete_at(i) if counters[i][:value] == counters[i][:max]
+          n = next_random
       end
       n
     end
 
+    def next_random
+      raise Exception("Exhausted noid sequence pool") if counters.size == 0
+      i = @rand.rand(counters.size)
+      n = counters[i][:value]
+      counters[i][:value] += 1
+      counters.delete_at(i) if counters[i][:value] == counters[i][:max]
+      n
+    end
+
     ##
     # Counters to use for quasi-random NOID sequences
     def counters

data/spec/lib/minter_spec.rb

@@ -128,11 +128,16 @@ describe Noid::Minter do
     it "given a specific seed and sequence, identifiers should be replicable" do
       minter = Noid::Minter.new(:template => "63q.redek")
       minter.seed(23456789, 567)
-      minter.mint.should == "63qh305"
+      mint1 = minter.mint
+      dump1 = minter.dump
 
       minter = Noid::Minter.new(:template => "63q.redek")
       minter.seed(23456789, 567)
-      minter.mint.should == "63qh305"
+      mint2 = minter.mint
+      dump2 = minter.dump
+      expect(dump1).to eql(dump2)
+      expect(mint1).to eql(mint2)
+      mint1.should == "63qb41v" # "63qh305" was the value from a slightly buggy impl
     end
   end
 
@@ -171,6 +176,24 @@ describe Noid::Minter do
 
   end
 
+  describe "with large seeds" do
+    it "should not reproduce noids with constructed sequences" do
+      minter = Noid::Minter.new(:template => 'ldpd:.reeeeeeee')
+      minter.seed(192548637498850379850405658298152906991)
+      first_values = (1..1000).collect {|c| minter.mint}
+
+      values = []
+      (0..999).each do |i|
+        minter = Noid::Minter.new(:template => 'ldpd:.reeeeeeee')
+        minter.seed(192548637498850379850405658298152906991, i)
+        values << minter.mint
+        expect(values[i]).to eql first_values[i] 
+      end
+      values.uniq!
+      expect(values.length).to eql 1000
+    end
+  end
+
   describe "multithreading-safe example" do
     before do
       require 'yaml'

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: noid
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Nice Opaque Identifier
@@ -83,18 +83,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: noid
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Nice Opaque Identifier
-test_files: []
+test_files:
+- spec/lib/minter_spec.rb
+- spec/spec_helper.rb