active_fedora-noid 1.1.3 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb21b73450d652c999b6957aec06a64a6b93a424
-  data.tar.gz: 92a908f1457731a303eaa3bede38fd139ba0a820
+  metadata.gz: b411ca036a7be29f78737f471e4299ae3e9dbe84
+  data.tar.gz: 11688eabbb0b224605aa9b236843cc30534c30f9
 SHA512:
-  metadata.gz: 1a41ca01378cfab9bfeb598ebfbba2b685759058281897c6bc730b8d92cd7dc5e047676de949d05d802141cc46c448eaf052cef625154ed2a0695601e6cc88ea
-  data.tar.gz: b844067ca1dd94891953605151997e594b0c57f4194148ed47a6ddcd9f1481b678e8bf672b73282e99a4ee4cec4e4f3dc559c9bf6f5faba7dae6daf57a39c7a8
+  metadata.gz: d683d23ff54c91077c0b2e3b334a5b38f894483326cda8e346fd0188efc8d81d231d0b41974ea786005edfba158a77b87ec2a76fc97b85162afab6d108d2f3f7
+  data.tar.gz: ab60c0951d64d425038a579f50a4727a7526e0a9b8c77b936e432b456d8c69aa3b3813feec49d0729aa3c1a5d52f91d13e7a2d121e6c8501523ec398ed7656fb

data/.gitignore

@@ -1,6 +1,5 @@
 *.rbc
 capybara-*.html
-.rspec
 /log
 /tmp
 /db/*.sqlite3
@@ -10,6 +9,7 @@ capybara-*.html
 **.orig
 rerun.txt
 pickle-email-*.html
+.byebug_history
 
 # TODO Comment out these rules if you are OK with secrets being uploaded to the repo
 config/initializers/secret_token.rb
@@ -32,3 +32,5 @@ pkg
 /vendor/assets/bower_components
 *.bowerrc
 bower.json
+
+.internal_test_app

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -3,12 +3,12 @@ cache: bundler
 sudo: false
 rvm:
   - 2.3.1
+  - 2.2
+  - 2.1
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  matrix:
-    - "RAILS_VERSION=4.2.7.1"
-    - "RAILS_VERSION=5.0.0.1"
+    - "RAILS_VERSION=4.2.6"
 notifications:
   irc:
     channels:

data/Gemfile

@@ -6,4 +6,39 @@ gemspec
 group :development, :test do
   gem 'byebug' unless ENV['CI']
   gem 'coveralls', require: false
+  gem 'byebug' unless ENV['CI']
+end
+# BEGIN ENGINE_CART BLOCK
+# engine_cart: 0.8.2
+# engine_cart stanza: 0.8.0
+# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
+file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
+if File.exist?(file)
+  begin
+    eval_gemfile file
+  rescue Bundler::GemfileError => e
+    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+    Bundler.ui.warn e.message
+  end
+else
+  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
+
+  if ENV['RAILS_VERSION']
+    if ENV['RAILS_VERSION'] == 'edge'
+      gem 'rails', github: 'rails/rails'
+      ENV['ENGINE_CART_RAILS_OPTIONS']= "--edge --skip-turbolinks"
+    else
+      gem 'rails', ENV['RAILS_VERSION']
+    end
+  end
+
+  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
+    gem 'responders', "~> 2.0"
+    gem 'sass-rails', ">= 5.0"
+  elsif ENV['RAILS_VERSION'] =~ /^5.0/ || ENV['RAILS_VERSION'] == 'edge'
+    # nop
+  else
+    gem 'sass-rails', "< 5.0"
+  end
 end
+# END ENGINE_CART BLOCK

data/Rakefile

@@ -1,7 +1,12 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
+require 'engine_cart/rake_task'
 
-task default: :spec
+task default: :ci
 RSpec::Core::RakeTask.new
 
-import './lib/tasks/noid_tasks.rake'
+Dir.glob('lib/tasks/*.rake').each { |r| import r }
+
+desc 'Continuous Integration (generate test app and run tests)'
+task ci: ['engine_cart:generate', 'spec'] do
+end

data/active_fedora-noid.gemspec

@@ -18,16 +18,19 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'active-fedora', '>= 9.7', '< 11'
-  spec.add_dependency 'noid', '~> 0.7'
+  spec.add_dependency 'noid', '~> 0.9'
+  spec.add_dependency 'rails', '~> 4.2.6'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'engine_cart', '~> 0.8'
 
   spec.post_install_message = <<-END
 NOTE: ActiveFedora::Noid 1.0.0 included a change that breaks existing minter
 statefiles. Run the `active_fedora:noid:migrate_statefile` rake task to migrate
-your statefile. (If you're using a custom statefile, not /tmp/minter-state,, set
+your statefile. (If you're using a custom statefile, not /tmp/minter-state, set
 an environment variable called AFNOID_STATEFILE with its path.)
 END
 

data/app/models/minter_state.rb

@@ -0,0 +1,21 @@
+class MinterState < ActiveRecord::Base
+  validates :namespace, presence: true, uniqueness: true
+  validates :template, presence: true
+  validates :template, format: { with: Object.const_get('Noid::Template::VALID_PATTERN'), message: 'value fails regex' }
+
+  # @return [Hash] options for Noid::Minter.new
+  # * template [String] setting the identifier pattern
+  # * seq [Integer] reflecting minter position in sequence
+  # * counters [Array{Hash}] "buckets" each with :current and :max values
+  # * rand [Object] random number generator object
+  def noid_options
+    return nil unless template
+    opts = {
+      :template => template,
+      :seq => seq
+    }
+    opts[:counters] = JSON.parse(counters, :symbolize_names => true) if counters
+    opts[:rand]     = Marshal.load(random) if random
+    opts
+  end
+end

data/db/migrate/20160610010003_create_minter_states.rb

@@ -0,0 +1,14 @@
+class CreateMinterStates < ActiveRecord::Migration
+  def change
+    create_table :minter_states do |t|
+      t.string :namespace, null: false, default: 'default'
+      t.string :template, null: false
+      t.text :counters
+      t.bigint :seq, default: 0
+      t.binary :random
+      t.timestamps null: false
+    end
+    # Use both model and DB-level constraints for consistency while scaling horizontally
+    add_index :minter_states, :namespace, unique: true
+  end
+end

data/lib/active_fedora/noid/config.rb

@@ -1,7 +1,7 @@
 module ActiveFedora
   module Noid
     class Config
-      attr_writer :template, :translate_uri_to_id, :translate_id_to_uri, :statefile
+      attr_writer :template, :translate_uri_to_id, :translate_id_to_uri, :statefile, :namespace
 
       def template
         @template ||= '.reeddeeddk'
@@ -11,6 +11,10 @@ module ActiveFedora
         @statefile ||= '/tmp/minter-state'
       end
 
+      def namespace
+        @namespace ||= 'default'
+      end
+
       def translate_uri_to_id
         lambda do |uri|
           uri.to_s.sub(baseurl, '').split('/', baseparts).last

data/lib/active_fedora/noid/engine.rb

@@ -0,0 +1,8 @@
+require 'rails'
+
+module ActiveFedora
+  module Noid
+    class Engine < ::Rails::Engine
+    end
+  end
+end

data/lib/active_fedora/noid/minter/base.rb

@@ -0,0 +1,32 @@
+require 'noid'
+
+module ActiveFedora
+  module Noid
+    module Minter
+      class Base < ::Noid::Minter
+        def initialize(template = default_template)
+          super(:template => template.to_s)
+        end
+
+        def mint
+          Mutex.new.synchronize do
+            while true
+              pid = next_id
+              return pid unless ActiveFedora::Base.exists?(pid) || ActiveFedora::Base.gone?(pid)
+            end
+          end
+        end
+
+        protected
+
+        def default_template
+          ActiveFedora::Noid.config.template
+        end
+
+        def next_id
+          raise NotImplementedError.new('Implement next_id in child class')
+        end
+      end
+    end
+  end
+end

data/lib/active_fedora/noid/minter/db.rb

@@ -0,0 +1,40 @@
+require 'noid'
+
+module ActiveFedora
+  module Noid
+    module Minter
+      class Db < Base
+        protected
+
+        # Uses pessimistic lock to ensure the record fetched is the same one updated.
+        # Should be fast enough to avoid terrible deadlock.
+        # Must lock because of multi-connection context! (transaction is per connection -- not enough)
+        # The DB table will only ever have at most one row per namespace.
+        # The 'default' namespace row is inserted by `rails generate active_fedora:noid:seed`.
+        # If you want another namespace, edit your config initialzer to something like:
+        #     ActiveFedora::Noid.config.namespace = 'druid'
+        #     ActiveFedora::Noid.config.template = '.reeedek'
+        # and in your app run:
+        #     bundle exec rails generate active_fedora:noid:seed
+        def next_id
+          id = nil
+          MinterState.transaction do
+            state = MinterState.lock.where(
+              namespace: ActiveFedora::Noid.config.namespace,
+              template: ActiveFedora::Noid.config.template,
+            ).first!
+            minter = ::Noid::Minter.new(state.noid_options)
+            id = minter.mint
+            # namespace and template are the same, now update the other attributes
+            state.seq      = minter.seq
+            state.counters = JSON.generate(minter.counters)
+            state.random   = Marshal.dump(minter.instance_variable_get(:@rand))
+            state.save!
+          end # transaction
+          id
+        end
+
+      end # class Db
+    end
+  end
+end

data/lib/active_fedora/noid/service.rb

@@ -20,7 +20,7 @@ module ActiveFedora
       protected
 
       def default_minter
-        @minter ||= ActiveFedora::Noid::SynchronizedMinter.new
+        ActiveFedora::Noid::SynchronizedMinter.new
       end
     end
   end

data/lib/active_fedora/noid/synchronized_minter.rb

@@ -1,35 +1,19 @@
 require 'noid'
+
 module ActiveFedora
   module Noid
-    class SynchronizedMinter
-      attr_reader :template, :statefile
+    class SynchronizedMinter < Minter::Base
+      attr_reader :statefile
 
       def initialize(template = default_template, statefile = default_statefile)
-        @template = template
+        super(template)
         @statefile = statefile
       end
 
-      def mint
-        Mutex.new.synchronize do
-          while true
-            pid = next_id
-            return pid unless ActiveFedora::Base.exists?(pid) || ActiveFedora::Base.gone?(pid)
-          end
-        end
-      end
-
-      def valid?(identifier)
-        ::Noid::Minter.new(template: template).valid?(identifier)
-      end
-
       protected
 
-      def default_template
-        @template ||= ActiveFedora::Noid.config.template
-      end
-
       def default_statefile
-        @statefile ||= ActiveFedora::Noid.config.statefile
+        ActiveFedora::Noid.config.statefile
       end
 
       def state_for(io_object)
@@ -39,14 +23,14 @@ module ActiveFedora
       end
 
       def next_id
-        id = ''
+        id = nil
         ::File.open(statefile, 'a+b', 0644) do |f|
           f.flock(::File::LOCK_EX)
           # Files opened in append mode seek to end of file
           f.rewind
           state = state_for(f)
-          minter = ::Noid::Minter.new(state)
-
+          state[:template] &&= state[:template].to_s
+          minter = ::Noid::Minter.new(state) # minter w/in the minter, lives only for an instant
           id = minter.mint
 
           # Wipe prior contents so the new state can be written from the beginning of the file

data/lib/active_fedora/noid/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module Noid
-    VERSION = '1.1.3'.freeze
+    VERSION = '2.0.0.beta1'.freeze
   end
 end

data/lib/active_fedora/noid.rb

@@ -1,6 +1,9 @@
 require 'active_fedora/noid/version'
 require 'active_fedora/noid/config'
+require 'active_fedora/noid/engine'
 require 'active_fedora/noid/service'
+require 'active_fedora/noid/minter/base'
+require 'active_fedora/noid/minter/db'
 require 'active_fedora/noid/synchronized_minter'
 
 module ActiveFedora
@@ -15,10 +18,7 @@ module ActiveFedora
       end
 
       def treeify(identifier)
-        raise ArgumentError, 'Identifier must be a string of size > 0 in order to be treeified' if identifier.blank?
-        head = identifier.split('/').first
-        head.gsub!(/#.*/, '')
-        (head.scan(/..?/).first(4) + [identifier]).join('/')
+        (identifier.scan(/..?/).first(4) + [identifier]).join('/')
       end
     end
   end

data/lib/generators/active_fedora/noid/install_generator.rb

@@ -0,0 +1,24 @@
+module ActiveFedora
+  module Noid
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      desc <<-END_OF_DESC
+Copies DB migrations
+      END_OF_DESC
+
+      def banner
+        say_status('info', 'Installing ActiveFedora::Noid', :blue)
+      end
+
+      def migrations
+        rake 'active_fedora_noid_engine:install:migrations'
+        rake 'db:migrate'
+      end
+
+      def seed
+        generate 'active_fedora:noid:seed'
+      end
+    end
+  end
+end

data/lib/generators/active_fedora/noid/seed_generator.rb

@@ -0,0 +1,29 @@
+module ActiveFedora
+  module Noid
+    class SeedGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+      argument :namespace, :type => :string, :default => ActiveFedora::Noid.config.namespace
+      argument :template, :type => :string, :default => ActiveFedora::Noid.config.template
+
+      desc <<-END_OF_DESC
+Seeds DB from ActiveFedora::Noid.config (or command-line overrides)
+      END_OF_DESC
+
+      def banner
+        say_status('info', "Initializing database table for namespace:template of '#{namespace}:#{template}'", :blue)
+      end
+
+      def checks
+        say_status('warn', "Be sure to use an initializer to do 'ActiveFedora::Noid.config.namespace = #{namespace}'", :red) if namespace != ActiveFedora::Noid.config.namespace
+        say_status('warn', "Be sure to use an initializer to do 'ActiveFedora::Noid.config.template = #{template}'", :red) if template != ActiveFedora::Noid.config.template
+      end
+
+      def seed_row
+        MinterState.create!(
+          namespace: namespace,
+          template: template
+        )
+      end
+    end
+  end
+end

data/spec/models/minter_state_spec.rb

@@ -0,0 +1,58 @@
+include MinterStateHelper
+
+describe MinterState, type: :model do
+  before(:each) { reset_minter_state_table }
+  after( :all ) { reset_minter_state_table }
+
+  let(:state) { described_class.new }
+  let(:first) { described_class.first }
+
+  it 'db is seeded with first row' do
+    expect{ first }.not_to raise_error
+    expect(first.namespace).to eq 'default'
+    expect(first.template).to eq '.reeddeeddk'
+    expect(first.seq).to eq 0
+    expect(described_class.group(:namespace).count).to eq('default' => 1)
+  end
+  describe 'validation' do
+    it 'blocks invalid template' do
+      expect{ state.save! }.to raise_error(ActiveRecord::RecordInvalid) # empty
+      state.template = 'bad_template'
+      expect{ state.save! }.to raise_error(ActiveRecord::RecordInvalid)
+      state.template = 'reeddddk' # close, but missing '.'
+      expect{ state.save! }.to raise_error(ActiveRecord::RecordInvalid)
+    end
+    it 'allows valid template (edit)' do
+      first.template = '.reeddddk'
+      expect{ first.save! }.not_to raise_error # OK!
+    end
+    it 'blocks new record in same namespace' do
+      state.template = '.reeddddk'
+      expect{ state.save! }.to raise_error(ActiveRecord::RecordInvalid)
+    end
+    it 'allows new record in distinct namespace' do
+      state.template = '.reeddddk'
+      state.namespace = 'foobar'
+      expect{ state.save! }.not_to raise_error # OK!
+      expect(described_class.group(:namespace).count).to eq('default' => 1, 'foobar' => 1)
+    end
+  end
+
+  describe '#noid_options' do
+    it 'returns nil without template (new object not persisted)' do
+      expect(state.noid_options).to be_nil
+    end
+    it 'returns correct hash when populated' do
+      state.template = '.reeddddk'
+      state.seq = 1
+      expect(state.noid_options).to match a_hash_including(
+        :template => '.reeddddk',
+        :seq => 1
+      )
+      expect(first.noid_options).to match a_hash_including(
+        :template => '.reeddeeddk',
+        :seq => 0
+      )
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,81 +1,22 @@
+ENV["RAILS_ENV"] ||= 'test'
+
 require 'coveralls'
 Coveralls.wear!
+require 'engine_cart'
+EngineCart.load_application!
 
 require 'active_fedora'
-require 'byebug' unless ENV['CI']
 require 'active_fedora/noid'
+require 'byebug' unless ENV['CI']
+
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
   config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
   config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
     mocks.verify_partial_doubles = true
   end
-
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
 end

data/spec/support/minterstate_table.rb

@@ -0,0 +1,11 @@
+module MinterStateHelper
+  # Simple truncation is not enough, since we also need seed data
+  def reset_minter_state_table
+    MinterState.destroy_all
+    MinterState.create!(
+      namespace: 'default',
+      template: '.reeddeeddk',
+      seq: 0
+    )
+  end
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+
+class TestAppGenerator < Rails::Generators::Base
+  source_root "./spec/test_app_templates"
+
+  # if you need to generate any additional configuration
+  # into the test app, this generator will be run immediately
+  # after setting up the application
+
+  def install_engine
+    generate 'active_fedora:noid:install'
+  end
+end

data/spec/unit/config_spec.rb

@@ -1,8 +1,7 @@
-require 'spec_helper'
-
 describe ActiveFedora::Noid::Config do
   it { is_expected.to respond_to(:template) }
   it { is_expected.to respond_to(:statefile) }
+  it { is_expected.to respond_to(:namespace) }
   it { is_expected.to respond_to(:translate_id_to_uri) }
   it { is_expected.to respond_to(:translate_uri_to_id) }
 
@@ -39,77 +38,35 @@ describe ActiveFedora::Noid::Config do
 
     context "with a hash code uri" do
       let(:uri) { "http://localhost:8983/fedora/rest/test/hh/63/vz/22/hh63vz22q#g123" }
-      it { is_expected.to eq 'hh63vz22q#g123' }
+    it { is_expected.to eq 'hh63vz22q#g123' }
     end
 
-    context 'with a short custom template' do
+    describe 'with a short custom template' do
       let(:uri) { "http://localhost:8983/fedora/rest/test/ab/cd/abcd/members" }
       let(:custom_template) { '.reeee' }
       before { config.template = custom_template }
       subject { translator.call(uri) }
-  
+
       it { is_expected.to eq 'abcd/members' }
     end
 
-    context 'with an even shorter custom template' do
+    describe 'with an even shorter custom template' do
       let(:uri) { "http://localhost:8983/fedora/rest/test/ab/c/abc/members" }
       let(:custom_template) { '.reee' }
       before { config.template = custom_template }
       subject { translator.call(uri) }
-  
+
       it { is_expected.to eq 'abc/members' }
     end
 
-    context 'with a long custom template' do
+    describe 'with a long custom template' do
       let(:uri) { "http://localhost:8983/fedora/rest/test/ab/cd/ef/gh/abcdefghijklmnopqrstuvwxyz/members" }
       let(:custom_template) { '.reeeeeeeeeeeeeeeeeeeeeeeeee' }
       before { config.template = custom_template }
       subject { translator.call(uri) }
-  
-      it { is_expected.to eq 'abcdefghijklmnopqrstuvwxyz/members' }
-    end
-  end
-
-  describe '#translate_id_to_uri' do
-    let(:config) { described_class.new }
-    let(:translator) { config.translate_id_to_uri }
-    let(:id) { "hh63vz2/members" }
-    let(:ActiveFedora) { double(ActiveFedora) }
-    subject { translator.call(id) }
-    before do
-      allow(ActiveFedora).to receive_message_chain("fedora.host") { "http://localhost:8983" }
-      allow(ActiveFedora).to receive_message_chain("fedora.base_path") { "/fedora/rest/test" }
-    end
 
-    it { is_expected.to eq "http://localhost:8983/fedora/rest/test/hh/63/vz/2/hh63vz2/members" }
-
-    context "with a hash code id" do
-      let(:id) { 'hh63vz2#g123' }
-      it { is_expected.to eq "http://localhost:8983/fedora/rest/test/hh/63/vz/2/hh63vz2#g123" }
-    end
-
-    context 'with a short custom template' do
-      let(:id) { "abcd/members" }
-      let(:custom_template) { '.reeee' }
-      before { config.template = custom_template }
-      subject { translator.call(id) }
-      it { is_expected.to eq "http://localhost:8983/fedora/rest/test/ab/cd/abcd/members" }
-    end
-
-    context 'with an even shorter custom template' do
-      let(:id) { 'abc/members' }
-      let(:custom_template) { '.reee' }
-      before { config.template = custom_template }
-      subject { translator.call(id) }
-      it { is_expected.to eq "http://localhost:8983/fedora/rest/test/ab/c/abc/members" }
+      it { is_expected.to eq 'abcdefghijklmnopqrstuvwxyz/members' }
     end
 
-    context 'with a long custom template' do
-      let(:id) { "abcdefghijklmnopqrstuvwxyz/members" }
-      let(:custom_template) { '.reeeeeeeeeeeeeeeeeeeeeeeeee' }
-      before { config.template = custom_template }
-      subject { translator.call(id) }
-      it { is_expected.to eq "http://localhost:8983/fedora/rest/test/ab/cd/ef/gh/abcdefghijklmnopqrstuvwxyz/members" }
-    end
   end
 end

data/spec/unit/db_minter_spec.rb

@@ -0,0 +1,76 @@
+include MinterStateHelper
+
+describe ActiveFedora::Noid::Minter::Db do
+  before(:each) { reset_minter_state_table }
+  after( :all ) { reset_minter_state_table }
+
+  before :each do
+    # default novel mintings
+    allow(ActiveFedora::Base).to receive(:exists?).and_return(false)
+    allow(ActiveFedora::Base).to receive(:gone?).and_return(false)
+  end
+
+  let(:minter) { described_class.new }
+  let(:other) { described_class.new('.reedddk') }
+
+  describe '#initialize' do
+    it 'raises on bad templates' do
+      expect{ described_class.new('reeddeeddk') }.to raise_error(Noid::TemplateError)
+      expect{ described_class.new('')           }.to raise_error(Noid::TemplateError)
+    end
+    it 'returns object w/ default template' do
+      expect(minter).to be_instance_of described_class
+      expect(minter).to be_a Noid::Minter
+      expect(minter.template).to be_instance_of Noid::Template
+      expect(minter.template.to_s).to eq ActiveFedora::Noid.config.template
+    end
+    it 'accepts valid template arg' do
+      expect(other).to be_instance_of described_class
+      expect(other).to be_a Noid::Minter
+      expect(other.template).to be_instance_of Noid::Template
+      expect(other.template.to_s).to eq '.reedddk'
+    end
+  end
+
+  describe '#mint' do
+    subject { minter.mint }
+    it { is_expected.not_to be_empty }
+    it 'does not mint the same ID twice in a row' do
+      expect(subject).not_to eq described_class.new.mint
+    end
+    it 'is valid' do
+      expect(minter.valid?(subject)).to be true
+      expect(described_class.new.valid?(subject)).to be true
+    end
+    it 'is invalid under a different template' do
+      expect(described_class.new('.reedddk').valid?(subject)).to be false
+    end
+  end
+
+  context 'conflicts' do
+    let(:existing_pid) { 'ef12ef12f' }
+    let(:unique_pid) { 'bb22bb22b' }
+    before :each do
+      expect(minter).to receive(:next_id).and_return(existing_pid, unique_pid)
+    end
+
+    context 'when the pid already exists in Fedora' do
+      before do
+        expect(ActiveFedora::Base).to receive(:exists?).with(existing_pid).and_return(true)
+      end
+      it 'skips the existing pid' do
+        expect(minter.mint).to eq unique_pid
+      end
+    end
+
+    context 'when the pid already existed in Fedora and now is gone' do
+      let(:gone_pid) { existing_pid }
+      before do
+        expect(ActiveFedora::Base).to receive(:gone?).with(gone_pid).and_return(true)
+      end
+      it 'skips the deleted pid' do
+        expect(minter.mint).to eq unique_pid
+      end
+    end
+  end
+end

data/spec/unit/noid_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe ActiveFedora::Noid do
   describe '#configure' do
     it { is_expected.to respond_to(:configure) }
@@ -15,21 +13,5 @@ describe ActiveFedora::Noid do
     subject { ActiveFedora::Noid.treeify(id) }
     let(:id) { 'abc123def45' }
     it { is_expected.to eq 'ab/c1/23/de/abc123def45' }
-    context 'with a seven-digit identifier' do
-      let(:id) { 'abc123z' }
-      it { is_expected.to eq 'ab/c1/23/z/abc123z' }
-    end
-    context 'with an empty string' do
-      let(:id) { '' }
-      it 'raises ArgumentError' do
-        expect { subject }.to raise_error(ArgumentError)
-      end
-    end
-    context 'with a nil' do
-      let(:id) { nil }
-      it 'raises ArgumentError' do
-        expect { subject }.to raise_error(ArgumentError)
-      end
-    end
   end
 end

data/spec/unit/service_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe ActiveFedora::Noid::Service do
   describe 'public API' do
     it { is_expected.to respond_to(:valid?) }

data/spec/unit/synchronized_minter_spec.rb

@@ -1,80 +1,70 @@
-require 'spec_helper'
-require 'active_fedora'
-
 describe ActiveFedora::Noid::SynchronizedMinter do
-  it { is_expected.to respond_to(:mint) }
+  before :each do
+    # default novel mintings
+    allow(ActiveFedora::Base).to receive(:exists?).and_return(false)
+    allow(ActiveFedora::Base).to receive(:gone?).and_return(false)
+  end
 
+  let(:minter) { described_class.new }
+
+  it { is_expected.to respond_to(:mint) }
   it 'has a default statefile' do
     expect(subject.statefile).to eq ActiveFedora::Noid.config.statefile
   end
-
   it 'has a default template' do
-    expect(subject.template).to eq ActiveFedora::Noid.config.template
+    expect(subject.template.to_s).to eq ActiveFedora::Noid.config.template
   end
 
   describe '#initialize' do
     let(:template) { '.rededk' }
     let(:statefile) { '/tmp/foobar' }
 
-    subject { ActiveFedora::Noid::SynchronizedMinter.new(template, statefile) }
+    subject { described_class.new(template, statefile) }
 
     it 'respects the custom template' do
-      expect(subject.template).to eq template
+      expect(subject.template.to_s).to eq template
     end
-
     it 'respects the custom statefile' do
       expect(subject.statefile).to eq statefile
     end
   end
 
   describe '#mint' do
-    before do
-      allow(ActiveFedora::Base).to receive(:exists?).and_return(false)
-      allow(ActiveFedora::Base).to receive(:gone?).and_return(false)
-    end
-
-    subject { ActiveFedora::Noid::Service.new.mint }
-
+    subject { minter.mint }
     it { is_expected.not_to be_empty }
-
     it 'does not mint the same ID twice in a row' do
-      expect(subject).not_to eq ActiveFedora::Noid::Service.new.mint
+      expect(subject).not_to eq described_class.new.mint
     end
-
     it 'is valid' do
-      expect(ActiveFedora::Noid::Service.new.valid?(subject)).to be true
+      expect(minter.valid?(subject)).to be true
+      expect(described_class.new.valid?(subject)).to be true
     end
   end
 
-  context "when the pid already exists in Fedora" do
-    let(:existing_pid) { 'ef12ef12f' }
+  context 'conflicts' do
     let(:unique_pid) { 'bb22bb22b' }
-
-    before do
-      allow_any_instance_of(ActiveFedora::Noid::SynchronizedMinter).to receive(:next_id).and_return(existing_pid, unique_pid)
-      allow(ActiveFedora::Base).to receive(:exists?).with(existing_pid).and_return(true)
-      allow(ActiveFedora::Base).to receive(:exists?).with(unique_pid).and_return(false)
-      allow(ActiveFedora::Base).to receive(:gone?).and_return(false)
-    end
-
-    it 'skips the existing pid' do
-      expect(subject.mint).to eq unique_pid
+    let(:existing_pid) { 'ef12ef12f' }
+    before :each do
+      expect(minter).to receive(:next_id).and_return(existing_pid, unique_pid)
     end
-  end
-
-  context "when the pid already existed in Fedora and now is gone" do
-    let(:gone_pid) { 'ef12ef12f' }
-    let(:unique_pid) { 'bb22bb22b' }
 
-    before do
-      allow_any_instance_of(ActiveFedora::Noid::SynchronizedMinter).to receive(:next_id).and_return(gone_pid, unique_pid)
-      allow(ActiveFedora::Base).to receive(:gone?).with(gone_pid).and_return(true)
-      allow(ActiveFedora::Base).to receive(:gone?).with(unique_pid).and_return(false)
-      allow(ActiveFedora::Base).to receive(:exists?).and_return(false)
+    context 'when the pid already exists in Fedora' do
+      before do
+        expect(ActiveFedora::Base).to receive(:exists?).with(existing_pid).and_return(true)
+      end
+      it 'skips the existing pid' do
+        expect(minter.mint).to eq unique_pid
+      end
     end
 
-    it 'skips the deleted pid' do
-      expect(subject.mint).to eq unique_pid
+    context 'when the pid already existed in Fedora and now is gone' do
+      let(:gone_pid) { existing_pid }
+      before do
+        expect(ActiveFedora::Base).to receive(:gone?).with(gone_pid).and_return(true)
+      end
+      it 'skips the deleted pid' do
+        expect(minter.mint).to eq unique_pid
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-noid
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Michael J. Giarlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -36,14 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: engine_cart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: Noid identifier services for ActiveFedora-based applications.
 email:
 - leftwing@alumni.rutgers.edu
@@ -94,6 +136,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -101,14 +144,25 @@ files:
 - README.md
 - Rakefile
 - active_fedora-noid.gemspec
+- app/models/minter_state.rb
+- db/migrate/20160610010003_create_minter_states.rb
 - lib/active_fedora/noid.rb
 - lib/active_fedora/noid/config.rb
+- lib/active_fedora/noid/engine.rb
+- lib/active_fedora/noid/minter/base.rb
+- lib/active_fedora/noid/minter/db.rb
 - lib/active_fedora/noid/service.rb
 - lib/active_fedora/noid/synchronized_minter.rb
 - lib/active_fedora/noid/version.rb
+- lib/generators/active_fedora/noid/install_generator.rb
+- lib/generators/active_fedora/noid/seed_generator.rb
 - lib/tasks/noid_tasks.rake
+- spec/models/minter_state_spec.rb
 - spec/spec_helper.rb
+- spec/support/minterstate_table.rb
+- spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/unit/config_spec.rb
+- spec/unit/db_minter_spec.rb
 - spec/unit/noid_spec.rb
 - spec/unit/service_spec.rb
 - spec/unit/synchronized_minter_spec.rb
@@ -119,7 +173,7 @@ metadata: {}
 post_install_message: |
   NOTE: ActiveFedora::Noid 1.0.0 included a change that breaks existing minter
   statefiles. Run the `active_fedora:noid:migrate_statefile` rake task to migrate
-  your statefile. (If you're using a custom statefile, not /tmp/minter-state,, set
+  your statefile. (If you're using a custom statefile, not /tmp/minter-state, set
   an environment variable called AFNOID_STATEFILE with its path.)
 rdoc_options: []
 require_paths:
@@ -131,18 +185,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Noid identifier services for ActiveFedora-based applications
 test_files:
+- spec/models/minter_state_spec.rb
 - spec/spec_helper.rb
+- spec/support/minterstate_table.rb
+- spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/unit/config_spec.rb
+- spec/unit/db_minter_spec.rb
 - spec/unit/noid_spec.rb
 - spec/unit/service_spec.rb
 - spec/unit/synchronized_minter_spec.rb