noid 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/noid/minter.rb

@@ -38,18 +38,18 @@ module Noid
     # @param [String] id
     # @return bool
     def valid? id
-      prefix = id[0..@prefix.length-1]
-      ch = id[@prefix.length..-1].split('')
-      check = ch.pop if @check
-      return false unless prefix == @prefix
+      prefix = @template.prefix.empty? ? '' : id[0..@template.prefix.length-1]
+      ch = @template.prefix.empty? ? id.split('') : id[@template.prefix.length..-1].split('')
+      check = ch.pop if @template.checkdigit?
+      return false unless prefix == @template.prefix
 
-      return false unless @characters.length == ch.length
-      @characters.each_with_index do |c, i|
+      return false unless @template.characters.length == ch.length
+      @template.characters.each_with_index do |c, i|
         return false unless Noid::XDIGIT.include? ch[i] 
         return false if c == 'd' and ch[i] =~ /[^\d]/
       end
 
-      return false unless check.nil? or check == checkdigit(id[0..-2])
+      return false unless check.nil? or check == @template.checkdigit(id[0..-2])
 
       true
     end

data/spec/lib/minter_spec.rb

@@ -93,15 +93,28 @@ describe Noid::Minter do
     minter.mint.should =~ /63q\w\d\w\w/
   end
 
+  describe "validate" do
+    it "should validate a prefixed identifier" do
+      minter = Noid::Minter.new(:template => "foobar.redek")
+      id = minter.mint
+      minter.valid?(id).should be_true
+    end
+    it "should validate a prefixless identifier" do
+      minter = Noid::Minter.new(:template => ".redek")
+      id = minter.mint
+      minter.valid?(id).should be_true
+    end
+  end
+
   describe "seed" do
     it "given a specific seed, identifiers should be replicable" do
       minter = Noid::Minter.new(:template => "63q.redek")
-      minter.seed(0)
-      minter.mint.should == "63qk208"
-
+      minter.seed(1)
+      minter.mint.should == "63q3706"
+      
       minter = Noid::Minter.new(:template => "63q.redek")
-      minter.seed(0)
-      minter.mint.should == "63qk208"
+      minter.seed(1)
+      minter.mint.should == "63q3706"
     end
 
     it "given a specific seed and sequence, identifiers should be replicable" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noid
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-14 00:00:00.000000000 -04:00
-default_executable: 
+date: 2012-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &2169181340 !ruby/object:Gem::Requirement
+  requirement: &2156059240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169181340
+  version_requirements: *2156059240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2169180820 !ruby/object:Gem::Requirement
+  requirement: &2156058720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2169180820
+  version_requirements: *2156058720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2169180320 !ruby/object:Gem::Requirement
+  requirement: &2156058200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2169180320
+  version_requirements: *2156058200
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2169179860 !ruby/object:Gem::Requirement
+  requirement: &2156057420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169179860
+  version_requirements: *2156057420
 description: ''
 email:
 - chris@cbeer.info
@@ -76,7 +75,6 @@ files:
 - noid.gemspec
 - spec/lib/minter_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/microservices/noid
 licenses: []
 post_install_message: 
@@ -97,10 +95,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: noid
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Nice Opaque Identifier
 test_files:
 - spec/lib/minter_spec.rb
 - spec/spec_helper.rb
+has_rdoc: