Merge pull request #14 from microservices/update_all_the_things

Update all the things

Author: cbeer

.rspec

@@ -0,0 +1 @@
+--color

.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - jruby-19mode
+  - 2.1
+  - 2.2
 script: bundle exec rake

Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in test.gemspec
 gemspec

Rakefile

@@ -15,10 +15,10 @@ require 'rspec'
 require 'rspec/core/rake_task'
 
 desc 'Default: run specs.'
-task :default => :spec
+task default: :spec
 
 RSpec::Core::RakeTask.new do |t|
-  if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.8/
+  if ENV['COVERAGE'] && RUBY_VERSION =~ /^1.8/
     t.rcov = true
     t.rcov_opts = ['--exclude', 'spec', '--exclude', 'gems']
   end
@@ -32,14 +32,13 @@ begin
   doc_destination = File.join(project_root, 'doc')
 
   YARD::Rake::YardocTask.new(:doc) do |yt|
-    yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + 
-                 [ File.join(project_root, 'README.md') ]
+    yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
+      [File.join(project_root, 'README.md')]
     yt.options = ['--output-dir', doc_destination, '--readme', 'README.md']
   end
 rescue LoadError
-  desc "Generate YARD Documentation"
+  desc 'Generate YARD Documentation'
   task :doc do
-    abort "Please install the YARD gem to generate rdoc."
+    abort 'Please install the YARD gem to generate rdoc.'
   end
 end
-

lib/noid.rb

@@ -1,8 +1,8 @@
-require "noid/version"
-require "noid/minter"
-require "noid/template"
+require 'noid/version'
+require 'noid/minter'
+require 'noid/template'
 
 module Noid
-    XDIGIT = ['0','1','2','3','4','5','6','7','8','9','b','c','d','f','g','h','j','k','m','n','p','q','r','s','t','v','w','x','z']
-    MAX_COUNTERS = 293
+  XDIGIT = %w(0 1 2 3 4 5 6 7 8 9 b c d f g h j k m n p q r s t v w x z)
+  MAX_COUNTERS = 293
 end

lib/noid/minter.rb

@@ -1,10 +1,9 @@
 module Noid
   class Minter
-    attr_reader :seed, :seq
+    attr_reader :seed, :seq, :template
     attr_writer :counters
 
-    def initialize options = {}
-
+    def initialize(options = {})
       if options[:state]
         seed(options[:seed])
         @seq = options[:seq]
@@ -19,44 +18,34 @@ def initialize options = {}
         @after_mint = options[:after_mint]
       end
       @template ||= Noid::Template.new(@template_string)
-    end  
+    end
 
     ##
     # Mint a new identifier
     def mint
       n = next_in_sequence
       id = template.mint(n)
-      if @after_mint
-        @after_mint.call(self, id)
-      end
+      @after_mint.call(self, id) if @after_mint
       id
     end
 
-    ##
-    # Noid identifier template
-    #
-    # @return Noid::Template
-    def template
-      @template 
-    end
-
     ##
     # Is the identifier valid under the template string and checksum?
     # @param [String] id
     # @return bool
-    def valid? id
-      prefix = @template.prefix.empty? ? '' : id[0..@template.prefix.length-1]
+    def valid?(id)
+      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 @template.characters.length == ch.length
       @template.characters.split('').each_with_index do |c, i|
-        return false unless Noid::XDIGIT.include? ch[i] 
-        return false if c == 'd' and ch[i] =~ /[^\d]/
+        return false unless Noid::XDIGIT.include? ch[i]
+        return false if c == 'd' && ch[i] =~ /[^\d]/
       end
 
-      return false unless check.nil? or check == @template.checkdigit(id[0..-2])
+      return false unless check.nil? || check == @template.checkdigit(id[0..-2])
 
       true
     end
@@ -66,9 +55,9 @@ def valid? id
     # @param [Integer] seed
     # @param [Integer] seq
     # @return [Random]
-    def seed seed = nil, seq = 0
+    def seed(seed = nil, seq = 0)
       @rand = ::Random.new(seed) if seed
-      @rand ||= ::Random.new 
+      @rand ||= ::Random.new
       @seed = @rand.seed
       @seq = seq || 0
 
@@ -81,14 +70,14 @@ def next_in_sequence
       n = @seq
       @seq += 1
       case template.generator
-        when 'r'
-          n = next_random
+      when 'r'
+        n = next_random
       end
       n
     end
 
     def next_random
-      raise Exception("Exhausted noid sequence pool") if counters.size == 0
+      raise 'Exhausted noid sequence pool' if counters.size == 0
       i = @rand.rand(counters.size)
       n = counters[i][:value]
       counters[i][:value] += 1
@@ -100,7 +89,7 @@ def next_random
     # Counters to use for quasi-random NOID sequences
     def counters
       return @counters if @counters
-      return [] unless template.generator == "r"
+      return [] unless template.generator == 'r'
 
       percounter = template.max / (@max_counters || Noid::MAX_COUNTERS) + 1
       t = 0
@@ -120,7 +109,7 @@ def counters
     end
 
     def dump
-      { :state => true, :seq => @seq, :seed => @seed, :template => template.template, :counters => Marshal.load(Marshal.dump(counters)) }
+      { state: true, seq: @seq, seed: @seed, template: template.template, counters: Marshal.load(Marshal.dump(counters)) }
     end
   end
 end

lib/noid/template.rb

@@ -2,20 +2,20 @@ module Noid
   class Template
     attr_reader :template
 
-    # @param [String] template A Template is a coded string of the form Prefix.Mask that governs how identifiers will be minted. 
-    def initialize template
-      @template = template  
+    # @param [String] template A Template is a coded string of the form Prefix.Mask that governs how identifiers will be minted.
+    def initialize(template)
+      @template = template
     end
 
-    def mint n
+    def mint(n)
       str = prefix
       str += n2xdig(n)
       str += checkdigit(str) if checkdigit?
 
       str
     end
 
-    def valid? str
+    def valid?(str)
       return false unless str[0..prefix.length] == prefix
 
       if generator == 'z'
@@ -26,12 +26,12 @@ def valid? str
 
       characters.split('').each_with_index do |c, i|
         case c
-          when 'e'
-            return false unless Noid::XDIGIT.include? str[prefix.length + i]
-          when 'd'
-            return false unless str[prefix.length + i] =~ /\d/
+        when 'e'
+          return false unless Noid::XDIGIT.include? str[prefix.length + i]
+        when 'd'
+          return false unless str[prefix.length + i] =~ /\d/
         end
-      end 
+      end
 
       return false unless checkdigit(str[0..-2]) == str.split('').last if checkdigit?
 
@@ -53,18 +53,18 @@ def mask
     ##
     # generator type to use: r, s, z
     def generator
-      @generator ||= mask[0..0]  
+      @generator ||= mask[0..0]
     end
 
     ##
     # sequence pattern: e (extended), d (digit)
     def characters
       @characters ||= begin
-        if checkdigit?
-          mask[1..-2]
-        else
-          mask[1..-1]
-        end
+                        if checkdigit?
+                          mask[1..-2]
+                        else
+                          mask[1..-1]
+                        end
                       end
     end
 
@@ -78,8 +78,8 @@ def checkdigit?
     # calculate a checkdigit for the str
     # @param [String] str
     # @return [String] checkdigit
-    def checkdigit str
-      Noid::XDIGIT[str.split('').map { |x| Noid::XDIGIT.index(x).to_i }.each_with_index.map { |n, idx| n*(idx+1) }.inject { |sum, n| sum += n }  % Noid::XDIGIT.length ]
+    def checkdigit(str)
+      Noid::XDIGIT[str.split('').map { |x| Noid::XDIGIT.index(x).to_i }.each_with_index.map { |n, idx| n * (idx + 1) }.inject { |sum, n| sum + n } % Noid::XDIGIT.length]
     end
 
     ##
@@ -93,52 +93,51 @@ def min
     def max
       @max ||= begin
         case generator
-          when 'z'
-            nil
-          else
-            characters.split('').map { |x| character_space(x) }.compact.inject(1) { |total, x| total *= x }
+        when 'z'
+          nil
+        else
+          characters.split('').map { |x| character_space(x) }.compact.inject(1) { |total, x| total * x }
         end
       end
     end
 
-
     protected
+
     ##
     # total size of a given template character value
     # @param [String] c
-    def character_space c
+    def character_space(c)
       case c
-        when 'e'
-          Noid::XDIGIT.length
-        when 'd'
-          10
+      when 'e'
+        Noid::XDIGIT.length
+      when 'd'
+        10
       end
     end
 
     ##
     # convert a minter position to a noid string under this template
     # @param [Integer] n
     # @return [String]
-    def n2xdig n
+    def n2xdig(n)
       xdig = characters.reverse.split('').map do |c|
         value = n % character_space(c)
-        n = n / character_space(c)  
+        n /= character_space(c)
         Noid::XDIGIT[value]
       end.compact.join('')
 
       if generator == 'z'
         c = characters.split('').last
         while n > 0
           value = n % character_space(c)
-          n = n / character_space(c)  
+          n /= character_space(c)
           xdig += Noid::XDIGIT[value]
         end
       end
 
-      raise Exception if n > 0
+      raise 'Exhausted noid sequence pool' if n > 0
 
       xdig.reverse
     end
-
   end
 end

lib/noid/version.rb

@@ -4,6 +4,6 @@ def self.version
       @version ||= File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
     end
 
-    VERSION = self.version
+    VERSION = version
   end
 end

noid.gemspec

@@ -1,27 +1,27 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "noid/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'noid/version'
 
 Gem::Specification.new do |s|
-  s.name        = "noid"
+  s.name        = 'noid'
   s.version     = Noid::VERSION
-  s.authors     = ["Chris Beer"]
-  s.email       = ["[email protected]"]
-  s.homepage    = "http://github.com/microservices/noid"
-  s.summary     = %q{Nice Opaque Identifier}
-  s.description = %q{Nice Opaque Identifier}
-  s.licenses    = ["MIT"]
+  s.authors     = ['Chris Beer']
+  s.email       = ['[email protected]']
+  s.homepage    = 'http://github.com/microservices/noid'
+  s.summary     = 'Nice Opaque Identifier'
+  s.description = 'Nice Opaque Identifier'
+  s.licenses    = ['MIT']
 
-  s.rubyforge_project = "noid"
+  s.rubyforge_project = 'noid'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", ">= 2.0"
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '>= 3.0'
 end