noid 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/noid.rb

@@ -1,5 +1,7 @@
 require 'noid/base'
+require 'noid/minter'
 require 'noid/persistence'
+require 'noid/persistence/base'
 require 'noid/persistence/json'
 require 'noid/identifier'
 require 'noid/identifier/singleton'

data/lib/noid/base.rb

@@ -1,7 +1,7 @@
 require 'backports'
 
 module Noid
-  class Base
+  module Base
     XDIGIT = ['0','1','2','3','4','5','6','7','8','9','b','c','d','f','g','h','j','k','l','n','p','q','r','s','t','v','w','x','z']
     MAX_COUNTERS = 293
 

data/lib/noid/minter.rb

@@ -0,0 +1,5 @@
+module Noid
+  class Minter
+    include Noid::Base
+  end
+end

data/lib/noid/persistence/base.rb

@@ -0,0 +1,11 @@
+module Noid::Persistence
+  class Base
+    include Noid::Base
+
+    def mint
+      a = super
+      save
+      return a
+    end
+  end
+end

data/lib/noid/persistence/json.rb

@@ -1,6 +1,6 @@
 require 'json'
 module Noid::Persistence
-  class JSON < Noid::Base
+  class JSON < Base
     FILENAME = 'NOID.js'
     def initialize args = {}
       @file = args[:filename] || FILENAME
@@ -9,12 +9,6 @@ module Noid::Persistence
       save
     end
 
-    def mint
-      a = super
-      save
-      return a
-    end
-
     protected
     def load_json
       data = ::JSON.parse(File.read(@file)) if File.exists? @file

data/noid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{noid}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Beer"]
@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
     "lib/noid/identifier.rb",
     "lib/noid/identifier/anvl.rb",
     "lib/noid/identifier/singleton.rb",
+    "lib/noid/minter.rb",
     "lib/noid/persistence.rb",
+    "lib/noid/persistence/base.rb",
     "lib/noid/persistence/json.rb",
     "noid.gemspec",
     "test/helper.rb",

data/test/test_binding.rb

@@ -7,7 +7,7 @@ class TestNoidBinding < Test::Unit::TestCase
     should "accept identifier_class for NOID bindings" do
       Dir.mktmpdir do |d|
         Dir.chdir d
-        n = Noid::Base.new :template => 'r.rek', :identifier => { :class => Noid::Identifier::Base }
+        n = Noid::Minter.new :template => 'r.rek', :identifier => { :class => Noid::Identifier::Base }
         id = n.mint
         assert_equal(Noid::Identifier::Base, id.class)
         id['abc'] = 123
@@ -18,7 +18,7 @@ class TestNoidBinding < Test::Unit::TestCase
     should "use singleton instance to persist  NOID bindings" do
       Dir.mktmpdir do |d|
         Dir.chdir d
-        n = Noid::Base.new :template => 'r.rek', :identifier => { :class => Noid::Identifier::Singleton }
+        n = Noid::Minter.new :template => 'r.rek', :identifier => { :class => Noid::Identifier::Singleton }
         id = n.mint
         id['abc'] = 123
         assert_equal(123, id['abc'])
@@ -31,7 +31,7 @@ class TestNoidBinding < Test::Unit::TestCase
     should "user anvl instance to persist NOID binding info" do
       Dir.mktmpdir do |d|
         Dir.chdir d
-        n = Noid::Base.new :template => 'r.rek', :identifier => { :class => Noid::Identifier::Anvl }
+        n = Noid::Minter.new :template => 'r.rek', :identifier => { :class => Noid::Identifier::Anvl }
         id = n.mint
         id['abc'] = "123"
         assert_equal(Noid::Identifier::Anvl, id.class)

data/test/test_noid.rb

@@ -3,31 +3,31 @@ require 'helper'
 class TestNoid < Test::Unit::TestCase
   context "Noid" do
     should "generate checkdigits correctly" do
-      n = Noid::Base.new :template => 's.zd'
+      n = Noid::Minter.new :template => 's.zd'
       assert_equal('q', n.send(:checkdigit, '13030/xf93gt2'))
     end
 
     should "generate max sequence for type 'r'" do
-      n = Noid::Base.new :template => 's.rd'
+      n = Noid::Minter.new :template => 's.rd'
       assert_equal(0, n.send(:min))
       assert_equal(10, n.send(:max))
 
-      n = Noid::Base.new :template => 's.rdd'
+      n = Noid::Minter.new :template => 's.rdd'
       assert_equal(0, n.send(:min))
       assert_equal(100, n.send(:max))
     end
 
     should "generate quasi-random counters for type 'r'" do
-      n = Noid::Base.new :template => 's.rd'
+      n = Noid::Minter.new :template => 's.rd'
       assert_equal((0..9).map { |x| {:value => x, :max => (x + 1)} }, n.instance_variable_get('@counters'))
 
-      n = Noid::Base.new :template => 's.rdde'
+      n = Noid::Minter.new :template => 's.rdde'
       s = n.instance_variable_get('@counters')
       assert_contains(s, {:value => 2890, :max => 2900})
     end
 
     should "generate random sequence for type 'r'" do
-      n = Noid::Base.new :template => 's.rd' 
+      n = Noid::Minter.new :template => 's.rd' 
       a = 10.times.map { |i| n.mint }
 
       10.times do |i|
@@ -37,14 +37,14 @@ class TestNoid < Test::Unit::TestCase
     end
 
     should "generate numeric sequence for type 's'" do
-      n = Noid::Base.new :template => 's.sd'
+      n = Noid::Minter.new :template => 's.sd'
       10.times do |i|
         assert_equal("s#{i}", n.mint)
       end
     end
 
     should "generate extended sequence for type 's'" do
-      n = Noid::Base.new :template => 's.se'
+      n = Noid::Minter.new :template => 's.se'
       10.times do |i|
         assert_equal("s#{i}", n.mint)
       end
@@ -55,7 +55,7 @@ class TestNoid < Test::Unit::TestCase
     end
 
     should "raise an exception when overflowing sequence" do
-      n = Noid::Base.new :template => 's.sd'
+      n = Noid::Minter.new :template => 's.sd'
       10.times do |i|
         assert_equal("s#{i}", n.mint)
       end
@@ -66,20 +66,20 @@ class TestNoid < Test::Unit::TestCase
     end
 
     should "generate sequence for type 's' with checkdigit" do
-      n = Noid::Base.new :template => 's.sdk'
+      n = Noid::Minter.new :template => 's.sdk'
       assert_equal('s0s', n.mint)
       assert_equal('s1v', n.mint)
       assert_equal('s2x', n.mint)
     end
 
     should "generate sequence for type 'z' with checkdigit" do
-      n = Noid::Base.new :template => 'z.zdk'
+      n = Noid::Minter.new :template => 'z.zdk'
       assert_equal('z0z', n.mint)
       assert_equal('z11', n.mint)
       assert_equal('z23', n.mint)
     end
     should "generate sequence for type 'z', adding new digits as needed" do
-      n = Noid::Base.new :template => 'z.zdk'
+      n = Noid::Minter.new :template => 'z.zdk'
       assert_equal('z0z', n.mint)
       assert_equal('z11', n.mint)
       assert_equal('z23', n.mint)
@@ -88,7 +88,7 @@ class TestNoid < Test::Unit::TestCase
     end
 
     should "generate sequence for type 'z', adding new xdigits as needed" do
-      n = Noid::Base.new :template => 'z.zdek'
+      n = Noid::Minter.new :template => 'z.zdek'
       assert_equal('z00z', n.mint)
       assert_equal('z012', n.mint)
       assert_equal('z025', n.mint)
@@ -107,7 +107,7 @@ class TestNoid < Test::Unit::TestCase
     end
 
     should "validate 'r' digit sequences" do
-      n = Noid::Base.new :template => 'r.rd'
+      n = Noid::Minter.new :template => 'r.rd'
 
       assert_equal(true, n.valid?('r1')   )
       assert_equal(true, n.valid?('r9')  )
@@ -117,7 +117,7 @@ class TestNoid < Test::Unit::TestCase
     end
 
     should "validate 'r' xdigit sequences" do
-      n = Noid::Base.new :template => 'r.re'
+      n = Noid::Minter.new :template => 'r.re'
 
       assert_equal(true, n.valid?('r1')   )
       assert_equal(true, n.valid?('r9')  )
@@ -125,7 +125,7 @@ class TestNoid < Test::Unit::TestCase
       assert_equal(true, n.valid?('rb'))
     end
     should "validate 'r' xdigit + checkdigit sequences" do
-      n = Noid::Base.new :template => 'r.rek'
+      n = Noid::Minter.new :template => 'r.rek'
 
       assert_equal(true, n.valid?('r2w')   )
       assert_equal(false, n.valid?('r2b')  )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noid
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Chris Beer
@@ -141,7 +141,9 @@ files:
 - lib/noid/identifier.rb
 - lib/noid/identifier/anvl.rb
 - lib/noid/identifier/singleton.rb
+- lib/noid/minter.rb
 - lib/noid/persistence.rb
+- lib/noid/persistence/base.rb
 - lib/noid/persistence/json.rb
 - noid.gemspec
 - test/helper.rb