active_fedora-noid 2.0.0.beta5 → 2.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46a4ec828c77c893dd8fade4ab2cc8bf69c1a5d2
-  data.tar.gz: d711fda28782d2a779cd3cc0a50e1b8d42aae48f
+  metadata.gz: e04703fc928d905a2fdabb0bdf8c967e1b4fef9f
+  data.tar.gz: 0d40c8fb02c9542e9437650dc4fa412f9e123682
 SHA512:
-  metadata.gz: 5306a476358ae3063a3b5bac116c4c33fdf242638837dcd571558f7b72d28ada8511ba5bbbe97d263a5e4c2b14ed727ac810ab63ffd85da90ffb52cce2114f74
-  data.tar.gz: a048a5717613df9efafc4f525d6ce5693ce52c2b9e087fe0602eab09d45d6521ab74f1a69655fe36322f5e2b85355698497215b35f1ef96866a951a328e1c9ac
+  metadata.gz: b6263908c04be9f4e91ae44e21451b3bfd6a32cde46d5e6b612887cd278df4e5b5e15f1852a6bd04e226430eadaca546e18749b536141d223f8f9f0f8e3679d8
+  data.tar.gz: cbf2b293055b1505e4f8c45038ae1764b1cef69c2423cdbbfcfdded6608b854bed38a2ee8a3f1a14545e911de33e3558baff788d6c8cdf67f74448de2c9089b3

data/.rubocop.yml

@@ -0,0 +1,9 @@
+require: rubocop-rspec
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.3
+  DisplayCopNames: true
+
+Rails:
+  Enabled: true

data/.rubocop_todo.yml

@@ -0,0 +1,96 @@
+require: rubocop-rspec
+
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-10-25 09:12:51 -0700 using RuboCop version 0.42.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 47
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 176
+
+# Offense count: 2
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/unit/db_minter_spec.rb'
+    - 'spec/unit/file_minter_spec.rb'
+
+# Offense count: 5
+# Configuration parameters: CustomTransform.
+RSpec/FilePath:
+  Exclude:
+    - 'spec/unit/config_spec.rb'
+    - 'spec/unit/db_minter_spec.rb'
+    - 'spec/unit/file_minter_spec.rb'
+    - 'spec/unit/noid_spec.rb'
+    - 'spec/unit/service_spec.rb'
+
+# Offense count: 9
+RSpec/LeadingSubject:
+  Exclude:
+    - 'spec/unit/config_spec.rb'
+    - 'spec/unit/file_minter_spec.rb'
+
+# Offense count: 4
+RSpec/MessageChain:
+  Exclude:
+    - 'spec/unit/config_spec.rb'
+
+# Offense count: 5
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: allow, expect
+RSpec/MessageExpectation:
+  Exclude:
+    - 'spec/support/shared_examples/minter.rb'
+    - 'spec/unit/service_spec.rb'
+
+# Offense count: 7
+RSpec/MultipleExpectations:
+  Max: 5
+
+# Offense count: 36
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/support/shared_examples/minter.rb'
+    - 'spec/unit/config_spec.rb'
+    - 'spec/unit/db_minter_spec.rb'
+    - 'spec/unit/file_minter_spec.rb'
+    - 'spec/unit/noid_spec.rb'
+    - 'spec/unit/service_spec.rb'
+
+# Offense count: 11
+# Configuration parameters: MaxNesting.
+RSpec/NestedGroups:
+  Exclude:
+    - 'spec/unit/config_spec.rb'
+    - 'spec/unit/noid_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/unit/config_spec.rb'
+    - 'spec/unit/service_spec.rb'
+
+# Offense count: 11
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'app/models/minter_state.rb'
+    - 'db/migrate/20160610010003_create_minter_states.rb'
+    - 'db/migrate/20161021203429_rename_minter_state_random_to_rand.rb'
+    - 'lib/active_fedora/noid.rb'
+    - 'lib/active_fedora/noid/config.rb'
+    - 'lib/active_fedora/noid/minter/base.rb'
+    - 'lib/active_fedora/noid/minter/db.rb'
+    - 'lib/active_fedora/noid/minter/file.rb'
+    - 'lib/active_fedora/noid/service.rb'
+    - 'lib/generators/active_fedora/noid/install_generator.rb'
+    - 'lib/generators/active_fedora/noid/seed_generator.rb'

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in active_fedora-noid.gemspec
@@ -36,7 +37,7 @@ else
   when /^4.2/
     gem 'responders', '~> 2.0'
     gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
+    gem 'coffee-rails', '~> 4.2.0'
   when /^4.[01]/
     gem 'sass-rails', '< 5.0'
   end

data/README.md

@@ -1,11 +1,13 @@
-[![Version](https://badge.fury.io/rb/active_fedora-noid.png)](http://badge.fury.io/rb/active_fedora-noid)
+Code: [![Version](https://badge.fury.io/rb/active_fedora-noid.png)](http://badge.fury.io/rb/active_fedora-noid)
 [![Build Status](https://travis-ci.org/projecthydra-labs/active_fedora-noid.png?branch=master)](https://travis-ci.org/projecthydra-labs/active_fedora-noid)
-[![Coverage Status](https://coveralls.io/repos/projecthydra-labs/active_fedora-noid/badge.svg)](https://coveralls.io/r/projecthydra-labs/active_fedora-noid)
+[![Coverage Status](https://coveralls.io/repos/github/projecthydra-labs/active_fedora-noid/badge.svg?branch=master)](https://coveralls.io/github/projecthydra-labs/active_fedora-noid?branch=master)
 [![Code Climate](https://codeclimate.com/github/projecthydra-labs/active_fedora-noid/badges/gpa.svg)](https://codeclimate.com/github/projecthydra-labs/active_fedora-noid)
 [![Dependency Status](https://gemnasium.com/projecthydra-labs/active_fedora-noid.png)](https://gemnasium.com/projecthydra-labs/active_fedora-noid)
-[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
-[![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
+
+Docs: [![Documentation Status](https://inch-ci.org/github/projecthydra-labs/active_fedora-noid.svg?branch=master)](https://inch-ci.org/github/projecthydra-labs/active_fedora-noid)
 [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/active_fedora-noid)
+[![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
+[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 
 # ActiveFedora::Noid
 
@@ -21,7 +23,7 @@ Override your ActiveFedora-based applications with opaque [Noid](https://wiki.uc
     * [ActiveFedora integration](#activefedora-integration)
       * [Identifier/URI translation](#identifieruri-translation)
     * [Overriding default behavior](#overriding-default-behavior)
-      * [Minter state (for replayability)](#minter-state-for-replayability)
+      * [Use database-based minter state](#use-database-based-minter-state)
       * [Identifier template](#identifier-template)
       * [Custom minters](#custom-minters)
   * [Help](#help)
@@ -103,7 +105,13 @@ To better support multi-host production installations that expect a shared datab
 
 ### Use database-based minter state
 
-The database-based minter stores minter state information in your application's relational database. To use it, override the AF::Noid configuration in e.g. `config/initializers/active_fedora-noid.rb`:
+The database-based minter stores minter state information in your application's relational database. To use it, you'll first need to run the install generator:
+
+```bash
+$ rails generate active_fedora:noid:install
+```
+
+This will create the necessary database tables and seed the database minter. To start minting identifiers with the new minter, override the AF::Noid configuration in e.g. `config/initializers/active_fedora-noid.rb`:
 
 ```ruby
 require 'active_fedora/noid'
@@ -182,11 +190,11 @@ And the service will delegate minting and validating to an instance of your cust
 
 # Help
 
-If you have questions or need help, please email [the Hydra community tech list](mailto:hydra-tech@googlegroups.com) or stop by [the Hydra community IRC channel](irc://irc.freenode.net/projecthydra).
+If you have questions or need help, please email [the Hydra community tech list](mailto:hydra-tech@googlegroups.com) or stop by the #dev channel in [the Hydra community Slack team](https://wiki.duraspace.org/pages/viewpage.action?pageId=43910187#Getintouch!-Slack): [![Slack Status](http://slack.projecthydra.org/badge.svg)](http://slack.projecthydra.org/)
 
 # Acknowledgments
 
 This software has been developed by and is brought to you by the Hydra community.  Learn more at the
-[Project Hydra website](http://projecthydra.org)
+[Project Hydra website](http://projecthydra.org/).
 
-![Project Hydra Logo](https://github.com/uvalib/libra-oa/blob/a6564a9e5c13b7873dc883367f5e307bf715d6cf/public/images/powered_by_hydra.png?raw=true)
+![Project Hydra Logo](http://sufia.io/assets/images/hydra_logo.png)

data/Rakefile

@@ -1,12 +1,22 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
-
-task default: :ci
-RSpec::Core::RakeTask.new
+require 'rubocop/rake_task'
 
 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
+desc 'Run test suite'
+task :spec do
+  RSpec::Core::RakeTask.new
+end
+
+desc 'Run style checker'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.fail_on_error = true
 end
+
+desc 'Continuous Integration (generate test app and run tests)'
+task ci: ['rubocop', 'engine_cart:generate', 'spec']
+
+task default: :ci

data/active_fedora-noid.gemspec

@@ -1,29 +1,32 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'active_fedora/noid/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "active_fedora-noid"
+  spec.name          = 'active_fedora-noid'
   spec.version       = ActiveFedora::Noid::VERSION
-  spec.authors       = ["Michael J. Giarlo"]
-  spec.email         = ["leftwing@alumni.rutgers.edu"]
-  spec.summary       = %q{Noid identifier services for ActiveFedora-based applications}
-  spec.description   = %q{Noid identifier services for ActiveFedora-based applications.}
-  spec.homepage      = "https://github.com/projecthydra-labs/active_fedora-noid"
-  spec.license       = "Apache2"
+  spec.authors       = ['Michael J. Giarlo']
+  spec.email         = ['leftwing@alumni.rutgers.edu']
+  spec.summary       = 'Noid identifier services for ActiveFedora-based applications'
+  spec.description   = 'Noid identifier services for ActiveFedora-based applications.'
+  spec.homepage      = 'https://github.com/projecthydra-labs/active_fedora-noid'
+  spec.license       = 'Apache2'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^spec/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'active-fedora', '>= 9.7', '< 12'
   spec.add_dependency 'noid', '~> 0.9'
   spec.add_dependency 'rails', '>= 4.2.7.1', '< 6'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 11.0"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 11.0'
   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 'engine_cart', '~> 1.0'
 end

data/app/models/minter_state.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class MinterState < ActiveRecord::Base
   validates :namespace, presence: true, uniqueness: true
   validates :template, presence: true

data/db/migrate/20160610010003_create_minter_states.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CreateMinterStates < ActiveRecord::Migration
   def change
     create_table :minter_states do |t|

data/db/migrate/20161021203429_rename_minter_state_random_to_rand.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class RenameMinterStateRandomToRand < ActiveRecord::Migration
   def change
     rename_column :minter_states, :random, :rand

data/lib/active_fedora/noid.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_fedora/noid/version'
 require 'active_fedora/noid/config'
 require 'active_fedora/noid/engine'
@@ -7,7 +8,7 @@ require 'active_fedora/noid/minter'
 module ActiveFedora
   module Noid
     class << self
-      def configure(&block)
+      def configure
         yield config
       end
 
@@ -16,6 +17,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('/')

data/lib/active_fedora/noid/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveFedora
   module Noid
     class Config
@@ -39,7 +40,7 @@ module ActiveFedora
       end
 
       def baseparts
-        2 + [(template.gsub(/\.[rsz]/,'').length.to_f/2).ceil, 4].min
+        2 + [(template.gsub(/\.[rsz]/, '').length.to_f / 2).ceil, 4].min
       end
     end
   end

data/lib/active_fedora/noid/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails'
 
 module ActiveFedora

data/lib/active_fedora/noid/minter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'minter/base'
 require_relative 'minter/file'
 require_relative 'minter/db'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'noid'
 require 'active_fedora'
 
@@ -20,7 +21,7 @@ module ActiveFedora
         # @return [String] the minted identifier
         def mint
           Mutex.new.synchronize do
-            while true
+            loop do
               pid = next_id
               return pid unless ActiveFedora::Base.exists?(pid) || ActiveFedora::Base.gone?(pid)
             end
@@ -30,7 +31,7 @@ module ActiveFedora
         ##
         # @return [Hash] an object representing the current minter state
         def read
-          raise NotImplementedError.new('Implement #read in child class')
+          raise NotImplementedError, 'Implement #read in child class'
         end
 
         ##
@@ -40,7 +41,7 @@ module ActiveFedora
         #
         # @return [void]
         def write!(_)
-          raise NotImplementedError.new('Implement #write! in child class')
+          raise NotImplementedError, 'Implement #write! in child class'
         end
 
         protected
@@ -54,7 +55,7 @@ module ActiveFedora
         ##
         # @return [String] a new identifier.
         def next_id
-          raise NotImplementedError.new('Implement #next_id in child class')
+          raise NotImplementedError, 'Implement #next_id in child class'
         end
       end
     end

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

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
 require 'noid'
 
 module ActiveFedora
   module Noid
     module Minter
       class Db < Base
-
         def read
-          filtered_hash = instance.as_json.select { |key| ['template', 'counters', 'seq', 'rand', 'namespace'].include?(key) }
+          filtered_hash = instance.as_json.select { |key| %w(template counters seq rand namespace).include?(key) }
           filtered_hash['counters'] = JSON.parse(filtered_hash['counters'], symbolize_names: true) if filtered_hash['counters']
           filtered_hash.symbolize_keys
         end
@@ -46,7 +46,7 @@ module ActiveFedora
         def instance
           MinterState.lock.find_by(
             namespace: ActiveFedora::Noid.config.namespace,
-            template: ActiveFedora::Noid.config.template,
+            template: ActiveFedora::Noid.config.template
           )
         end
       end # class Db

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'noid'
 
 module ActiveFedora
@@ -32,7 +33,7 @@ module ActiveFedora
         protected
 
         def with_file
-          ::File.open(statefile, 'a+b', 0644) do |f|
+          ::File.open(statefile, 'a+b', 0o644) do |f|
             f.flock(::File::LOCK_EX)
             # Files opened in append mode seek to end of file
             f.rewind

data/lib/active_fedora/noid/rspec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.configure do |config|
   config.before(:suite) do
     ActiveFedora::Noid.configure do |noid_config|

data/lib/active_fedora/noid/service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'noid'
 
 module ActiveFedora
@@ -9,13 +10,9 @@ module ActiveFedora
         @minter = minter
       end
 
-      def valid?(identifier)
-        minter.valid? identifier
-      end
+      delegate :valid?, to: :minter
 
-      def mint
-        minter.mint
-      end
+      delegate :mint, to: :minter
 
       protected
 

data/lib/active_fedora/noid/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module ActiveFedora
   module Noid
-    VERSION = '2.0.0.beta5'.freeze
+    VERSION = '2.0.0.beta6'
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveFedora
   module Noid
     class InstallGenerator < Rails::Generators::Base

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

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 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
+      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)

data/lib/tasks/noid_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_fedora/noid'
 require 'noid'
 require 'yaml'
@@ -10,7 +11,7 @@ namespace :active_fedora do
         statefile = ENV.fetch('AFNOID_STATEFILE', ActiveFedora::Noid.config.statefile)
         raise "File not found: #{statefile}\nAborting" unless File.exist?(statefile)
         puts "Migrating #{statefile} from YAML to Marshal serialization..."
-        File.open(statefile, 'a+b', 0644) do |f|
+        File.open(statefile, 'a+b', 0o644) do |f|
           f.flock(File::LOCK_EX)
           f.rewind
           begin
@@ -23,7 +24,7 @@ namespace :active_fedora do
           new_state = Marshal.dump(minter.dump)
           f.write(new_state)
         end
-        puts "Done!"
+        puts 'Done!'
       end
 
       desc 'Migrate minter state from file to database'
@@ -35,7 +36,7 @@ namespace :active_fedora do
         minter = Noid::Minter.new(state)
         new_state = ActiveFedora::Noid::Minter::Db.new
         new_state.write!(minter)
-        puts "Done!"
+        puts 'Done!'
       end
 
       desc 'Migrate minter state from database to file'
@@ -47,7 +48,7 @@ namespace :active_fedora do
         minter = Noid::Minter.new(state)
         new_state = ActiveFedora::Noid::Minter::File.new
         new_state.write!(minter)
-        puts "Done!"
+        puts 'Done!'
       end
     end
   end

data/spec/models/minter_state_spec.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
 include MinterStateHelper
 
 describe MinterState, type: :model do
-  before(:each) { reset_minter_state_table }
-  after( :all ) { reset_minter_state_table }
+  before { 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 }.not_to raise_error
     expect(first.namespace).to eq 'default'
     expect(first.template).to eq '.reeddeeddk'
     expect(first.seq).to eq 0
@@ -16,24 +17,24 @@ describe MinterState, type: :model do
   end
   describe 'validation' do
     it 'blocks invalid template' do
-      expect{ state.save! }.to raise_error(ActiveRecord::RecordInvalid) # empty
+      expect { state.save! }.to raise_error(ActiveRecord::RecordInvalid) # empty
       state.template = 'bad_template'
-      expect{ state.save! }.to raise_error(ActiveRecord::RecordInvalid)
+      expect { state.save! }.to raise_error(ActiveRecord::RecordInvalid)
       state.template = 'reeddddk' # close, but missing '.'
-      expect{ state.save! }.to raise_error(ActiveRecord::RecordInvalid)
+      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!
+      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)
+      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 { state.save! }.not_to raise_error # OK!
       expect(described_class.group(:namespace).count).to eq('default' => 1, 'foobar' => 1)
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-ENV["RAILS_ENV"] ||= 'test'
+# frozen_string_literal: true
+ENV['RAILS_ENV'] ||= 'test'
 
 require 'coveralls'
 Coveralls.wear!
@@ -9,7 +10,7 @@ require 'active_fedora'
 require 'active_fedora/noid'
 require 'byebug' unless ENV['CI']
 
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|

data/spec/support/minterstate_table.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module MinterStateHelper
   # Simple truncation is not enough, since we also need seed data
   def reset_minter_state_table

data/spec/support/shared_examples/minter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 shared_examples 'a minter' do
   describe '#mint' do
     subject     { minter.mint }
@@ -27,7 +28,7 @@ shared_examples 'a minter' do
     let(:existing_pid) { 'ef12ef12f' }
     let(:unique_pid)   { 'bb22bb22b' }
 
-    before :each do
+    before do
       expect(subject).to receive(:next_id).and_return(existing_pid, unique_pid)
     end
 

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

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root "./spec/test_app_templates"
+  source_root './spec/test_app_templates'
 
   # if you need to generate any additional configuration
   # into the test app, this generator will be run immediately

data/spec/unit/config_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 describe ActiveFedora::Noid::Config do
   subject { described_class.new }
 
@@ -45,23 +46,23 @@ describe ActiveFedora::Noid::Config do
   describe '#translate_uri_to_id' do
     let(:config) { described_class.new }
     let(:translator) { config.translate_uri_to_id }
-    let(:uri) { "http://localhost:8983/fedora/rest/test/hh/63/vz/22/hh63vz22q/members" }
+    let(:uri) { 'http://localhost:8983/fedora/rest/test/hh/63/vz/22/hh63vz22q/members' }
     let(:ActiveFedora) { double(ActiveFedora) }
     subject { translator.call(uri) }
     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" }
+      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 'hh63vz22q/members' }
 
-    context "with a hash code uri" do
-      let(:uri) { "http://localhost:8983/fedora/rest/test/hh/63/vz/22/hh63vz22q#g123" }
+    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' }
     end
 
     context 'with a short custom template' do
-      let(:uri) { "http://localhost:8983/fedora/rest/test/ab/cd/abcd/members" }
+      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) }
@@ -70,7 +71,7 @@ describe ActiveFedora::Noid::Config do
     end
 
     context 'with an even shorter custom template' do
-      let(:uri) { "http://localhost:8983/fedora/rest/test/ab/c/abc/members" }
+      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) }
@@ -79,7 +80,7 @@ describe ActiveFedora::Noid::Config do
     end
 
     context 'with a long custom template' do
-      let(:uri) { "http://localhost:8983/fedora/rest/test/ab/cd/ef/gh/abcdefghijklmnopqrstuvwxyz/members" }
+      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) }
@@ -91,27 +92,27 @@ describe ActiveFedora::Noid::Config do
   describe '#translate_id_to_uri' do
     let(:config) { described_class.new }
     let(:translator) { config.translate_id_to_uri }
-    let(:id) { "hh63vz2/members" }
+    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" }
+      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" }
+    it { is_expected.to eq 'http://localhost:8983/fedora/rest/test/hh/63/vz/2/hh63vz2/members' }
 
-    context "with a hash code id" do
+    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" }
+      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(: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" }
+      it { is_expected.to eq 'http://localhost:8983/fedora/rest/test/ab/cd/abcd/members' }
     end
 
     context 'with an even shorter custom template' do
@@ -119,15 +120,15 @@ describe ActiveFedora::Noid::Config do
       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 'http://localhost:8983/fedora/rest/test/ab/c/abc/members' }
     end
 
     context 'with a long custom template' do
-      let(:id) { "abcdefghijklmnopqrstuvwxyz/members" }
+      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" }
+      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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 include MinterStateHelper
 
 describe ActiveFedora::Noid::Minter::Db do
-  before(:each) { reset_minter_state_table }
+  before { reset_minter_state_table }
   after(:all) { reset_minter_state_table }
 
-  before :each do
+  before do
     # default novel mintings
     allow(ActiveFedora::Base).to receive(:exists?).and_return(false)
     allow(ActiveFedora::Base).to receive(:gone?).and_return(false)
@@ -18,8 +19,8 @@ describe ActiveFedora::Noid::Minter::Db do
 
   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)
+      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(subject).to be_instance_of described_class
@@ -53,11 +54,11 @@ describe ActiveFedora::Noid::Minter::Db do
     before { minter.mint }
     it 'changes the state of the minter' do
       expect { subject.write!(minter) }.to change { subject.read[:seq] }
-                                           .from(starting_state[:seq]).to(minter.seq)
-                                       .and change { subject.read[:counters] }
-                                           .from(starting_state[:counters]).to(minter.counters)
-                                       .and change { subject.read[:rand] }
-                                           .from(starting_state[:rand]).to(Marshal.dump(minter.instance_variable_get(:@rand)))
+        .from(starting_state[:seq]).to(minter.seq)
+        .and change { subject.read[:counters] }
+        .from(starting_state[:counters]).to(minter.counters)
+        .and change { subject.read[:rand] }
+        .from(starting_state[:rand]).to(Marshal.dump(minter.instance_variable_get(:@rand)))
     end
   end
 end

data/spec/unit/file_minter_spec.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 describe ActiveFedora::Noid::Minter::File do
-  before :each do
+  before do
     # default novel mintings
     allow(ActiveFedora::Base).to receive(:exists?).and_return(false)
     allow(ActiveFedora::Base).to receive(:gone?).and_return(false)
@@ -47,12 +48,11 @@ describe ActiveFedora::Noid::Minter::File do
     before { minter.mint }
     it 'changes the state of the minter' do
       expect { subject.write!(minter) }.to change { subject.read[:seq] }
-                                           .from(starting_state[:seq]).to(minter.seq)
-                                       .and change { subject.read[:rand] }
-                                           .from(starting_state[:rand]).to(Marshal.dump(minter.instance_variable_get(:@rand)))
-                                       .and change { subject.read[:counters] }
-                                           .to(minter.counters)
-
+        .from(starting_state[:seq]).to(minter.seq)
+        .and change { subject.read[:rand] }
+        .from(starting_state[:rand]).to(Marshal.dump(minter.instance_variable_get(:@rand)))
+        .and change { subject.read[:counters] }
+        .to(minter.counters)
     end
   end
 end

data/spec/unit/noid_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 describe ActiveFedora::Noid do
   describe '#configure' do
     it { is_expected.to respond_to(:configure) }
@@ -10,12 +11,24 @@ describe ActiveFedora::Noid do
   end
 
   describe '#treeify' do
-    subject { ActiveFedora::Noid.treeify(id) }
+    subject { described_class.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,3 +1,4 @@
+# frozen_string_literal: true
 describe ActiveFedora::Noid::Service do
   describe 'public API' do
     it { is_expected.to respond_to(:valid?) }
@@ -11,7 +12,7 @@ describe ActiveFedora::Noid::Service do
   context 'with a custom minter' do
     let(:minter) { double('minter') }
     let(:identifier) { 'abc123' }
-    let(:new_service) { ActiveFedora::Noid::Service.new(minter) }
+    let(:new_service) { described_class.new(minter) }
 
     it 'allows injecting a custom minter' do
       expect(new_service.minter).to eq minter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-noid
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta5
+  version: 2.0.0.beta6
 platform: ruby
 authors:
 - Michael J. Giarlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -120,6 +120,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.42.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.42.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +171,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile