active_fedora-noid 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7053ed97886ba613915252ff2a773d3355577aa
-  data.tar.gz: b5c5d8f381ee2d0c78d1ee5d3fa4c97e281d91d6
+  metadata.gz: 77f3bb9f61240306a75e00c8c4fc7d4c314110d7
+  data.tar.gz: 5310a81c3a8b3573d9dd756263de8a5ada773f47
 SHA512:
-  metadata.gz: 06e120b319deeb12f6d92de5c5d9d9bb1c8765fcf23c7bcdcfe2310685b83869193c8995aa808bf10191f68ba2854c0e3ca574935a9694b92cba4559ee0ed1bb
-  data.tar.gz: 777c190afa32118fc4f0ab931aec01b9df8309c0fd29ffaafd8d71ff8e13bf31c3b99b390c72685b82d3f67cf117386537ac7633d7a17ea19ebe0837b7435d00
+  metadata.gz: a95ae3bae159006fdf2c89257b939693a77f92a7ee1c3e948e05164e703d7757219bb8a4d95557c74d87c0cb498f3605053398669dbb6886a8cf9fe6c1e1a88c
+  data.tar.gz: e9b5e44da2b1d277891aa75b6e0f3b353e740da925ab53a67f144032ac88995b2d65be96204f70414b6d303e05c72bc3ef02ca590d371da0bd7a0fb3b718170d

data/.rubocop.yml

@@ -7,3 +7,6 @@ AllCops:
 
 Rails:
   Enabled: true
+
+RSpec/NestedGroups:
+  MaxNesting: 4

data/README.md

@@ -121,26 +121,26 @@ ActiveFedora::Noid.configure do |config|
 end
 ```
 
-**NOTE 1**: If you switch to a new minter, it will not automatically start with the same state as the old minter. AF::Noid does include a couple of rake tasks for copying state from database-backed minters to file-backed ones and vice versa:
-
-``` bash
-# For migrating minter state from a file to a database
-$ rake active_fedora:noid:migrate:file_to_database
-# For migrating minter state from a database to a file
-$ rake active_fedora:noid:migrate:database_to_file
-```
-
-**NOTE 2**: If you decide to use the database-backed minter, you may notice that your test suite now fails miserably if it is configured to clear out the application database between tests. If so, you may add the following to e.g. `spec/spec_helper.rb` to set the default minter in the test suite as the file-backed one:
+Using the database-backed minter can cause problems with your test suite, where it is often sensible to wipe out database rows between tests (which destroys the database-backed minter's state, which renders it unusable). To deal with this and still get the benefits of using the database-backed minter in development and production environments, you'll also want to add the following helper to your `spec/spec_helper.rb`:
 
 ```ruby
 require 'active_fedora/noid/rspec'
 
 RSpec.configure do |config|
-  config.include(ActiveFedora::Noid::RSpec)
+  include ActiveFedora::Noid::RSpec
+
+  config.before(:suite) { disable_production_minter! }
+  config.after(:suite)  { enable_production_minter! }
 end
+```
+
+If you switch to the new database-backed minter and want to include in that minter the state of your current file-backed minter, AF::Noid 2.0.0 provides a new rake task that will copy your minter's state from the filesystem to the database:
 
-before(:suite) { disable_production_minter! }
-after(:suite)  { enable_production_minter! }
+```bash
+# For migrating minter state from a file to a database
+$ rake active_fedora:noid:migrate:file_to_database
+# For migrating minter state from a database to a file
+$ rake active_fedora:noid:migrate:database_to_file
 ```
 
 ### Identifier template

data/active_fedora-noid.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'rubocop', '~> 0.42.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.5'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.8.0'
   spec.add_development_dependency 'engine_cart', '~> 1.0'
 end

data/app/models/minter_state.rb

@@ -3,4 +3,13 @@ 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' }
+
+  # Creates an initial row for the namespace.
+  # @return [MinterState] the initial minter state
+  def self.seed!(namespace:, template:)
+    create!(
+      namespace: namespace,
+      template: template
+    )
+  end
 end

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

@@ -44,7 +44,12 @@ module ActiveFedora
         end
 
         def instance
-          MinterState.lock.find_by(
+          MinterState.lock.find_by!(
+            namespace: ActiveFedora::Noid.config.namespace,
+            template: ActiveFedora::Noid.config.template
+          )
+        rescue ActiveRecord::RecordNotFound
+          MinterState.seed!(
             namespace: ActiveFedora::Noid.config.namespace,
             template: ActiveFedora::Noid.config.template
           )

data/lib/active_fedora/noid/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module ActiveFedora
   module Noid
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

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

@@ -20,7 +20,7 @@ Seeds DB from ActiveFedora::Noid.config (or command-line overrides)
       end
 
       def seed_row
-        MinterState.create!(
+        MinterState.seed!(
           namespace: namespace,
           template: template
         )

data/spec/support/shared_examples/minter.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 shared_examples 'a minter' do
   describe '#mint' do
-    subject     { minter.mint }
-    let(:other) { described_class.new('.reedddk') }
+    subject { minter.mint }
 
     it { is_expected.not_to be_empty }
 
@@ -19,8 +18,11 @@ shared_examples 'a minter' do
       expect(described_class.new('.reedddk').valid?(subject)).to be false
     end
 
-    it 'is invalid under a different template' do
-      expect(other).not_to be_valid(minter.mint)
+    context 'with a different template' do
+      let(:other) { described_class.new('.reedddk') }
+      it 'is invalid under a different template' do
+        expect(other).not_to be_valid(minter.mint)
+      end
     end
   end
 

data/spec/unit/db_minter_spec.rb

@@ -4,6 +4,7 @@ include MinterStateHelper
 describe ActiveFedora::Noid::Minter::Db do
   before { reset_minter_state_table }
   after(:all) { reset_minter_state_table }
+  subject(:db_minter) { described_class.new }
 
   before do
     # default novel mintings
@@ -11,10 +12,8 @@ describe ActiveFedora::Noid::Minter::Db do
     allow(ActiveFedora::Base).to receive(:gone?).and_return(false)
   end
 
-  let(:other) { described_class.new('.reedddk') }
-
   it_behaves_like 'a minter' do
-    let(:minter) { described_class.new }
+    let(:minter) { db_minter }
   end
 
   describe '#initialize' do
@@ -23,41 +22,54 @@ describe ActiveFedora::Noid::Minter::Db do
       expect { described_class.new('')           }.to raise_error(Noid::TemplateError)
     end
     it 'returns object w/ default template' do
-      expect(subject).to be_instance_of described_class
-      expect(subject).to be_a Noid::Minter
-      expect(subject.template).to be_instance_of Noid::Template
-      expect(subject.template.to_s).to eq ActiveFedora::Noid.config.template
+      expect(db_minter).to be_instance_of described_class
+      expect(db_minter).to be_a Noid::Minter
+      expect(db_minter.template).to be_instance_of Noid::Template
+      expect(db_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'
+    context 'with a user provided template' do
+      let(:db_minter) { described_class.new('.reedddk') }
+
+      it 'accepts valid template arg' do
+        expect(db_minter).to be_instance_of described_class
+        expect(db_minter).to be_a Noid::Minter
+        expect(db_minter.template).to be_instance_of Noid::Template
+        expect(db_minter.template.to_s).to eq '.reedddk'
+      end
     end
   end
 
   describe '#read' do
-    it 'returns a hash' do
-      expect(subject.read).to be_a(Hash)
-    end
-    it 'has the expected namespace' do
-      expect(subject.read[:namespace]).to eq ActiveFedora::Noid.config.namespace
+    subject { db_minter.read }
+
+    context 'when the database has been initialized' do
+      it 'has the expected namespace and template' do
+        expect(subject).to include(namespace: ActiveFedora::Noid.config.namespace,
+                                   template: ActiveFedora::Noid.config.template)
+      end
     end
-    it 'has the expected template' do
-      expect(subject.read[:template]).to eq ActiveFedora::Noid.config.template
+
+    context 'when the database has not been initialized' do
+      before do
+        MinterState.destroy_all
+      end
+      it 'has the expected namespace and template' do
+        expect(subject).to include(namespace: ActiveFedora::Noid.config.namespace,
+                                   template: ActiveFedora::Noid.config.template)
+      end
     end
   end
 
   describe '#write!' do
-    let(:starting_state) { subject.read }
+    let(:starting_state) { db_minter.read }
     let(:minter) { Noid::Minter.new(starting_state) }
     before { minter.mint }
     it 'changes the state of the minter' do
-      expect { subject.write!(minter) }.to change { subject.read[:seq] }
+      expect { db_minter.write!(minter) }.to change { db_minter.read[:seq] }
         .from(starting_state[:seq]).to(minter.seq)
-        .and change { subject.read[:counters] }
+        .and change { db_minter.read[:counters] }
         .from(starting_state[:counters]).to(minter.counters)
-        .and change { subject.read[:rand] }
+        .and change { db_minter.read[:rand] }
         .from(starting_state[:rand]).to(Marshal.dump(minter.instance_variable_get(:@rand)))
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-noid
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Michael J. Giarlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -140,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Noid identifier services for ActiveFedora-based applications