active_fedora-noid 0.3.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ccbc2239b7c60748fb0fde64de2810dae5bc1ec
-  data.tar.gz: c76dd79fe28f8d2304f7d9e2e167b286a3a9a07d
+  metadata.gz: c19bc92adee3e3f65792c9c8a3d06fff8c3e334f
+  data.tar.gz: b9ddf9a82a9989b270867472363897801d88c108
 SHA512:
-  metadata.gz: d87e041f9caacf82a0ec9c69bb7860b08925deedbfec266352b64436038c0a11645deca8652ed1b31f1963c6d10f4c449041bcdeb8f8d2b8df2e6467f25d19ed
-  data.tar.gz: 4da0a6a9178291ab0bd1aa947f280bea8841cd578a5b9e990afeb2c3833165bd6150fe4b8d4679f8b3f59993fa11e4215b933d3d94313e0288169fb15829b00b
+  metadata.gz: 9b2b10510a8ae40a4cc4d4518d577dd26f5642903460cbdbc5f1ab87fa4a66347adb8492dc28cec50ac3d4ca6a8424437d98bbeadf9ef207d11270289c6ca57b
+  data.tar.gz: ea939be13d5d4582ed33052b4abd70e249ee48f46dd559308c2ab705cef14671935c64fc477a160b6a2450b9de6d0fc0bdf2f013ce97a731f7472eded2b68366

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 cache: bundler
+script:
+  - bundle exec rake spec environment=test
 sudo: false
 rvm:
   - 2.2
@@ -17,4 +19,4 @@ notifications:
     channels:
       - "irc.freenode.org#projecthydra"
     template:
-      - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"
+      - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"

data/Rakefile

@@ -3,3 +3,5 @@ require 'rspec/core/rake_task'
 
 task default: :spec
 RSpec::Core::RakeTask.new
+
+import './lib/tasks/noid_tasks.rake'

data/active_fedora-noid.gemspec

@@ -23,4 +23,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec', '~> 3.2'
+
+  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
+an environment variable called AFNOID_STATEFILE with its path.)
+END
+
 end

data/lib/active_fedora/noid/config.rb

@@ -12,14 +12,25 @@ module ActiveFedora
       end
 
       def translate_uri_to_id
-        lambda { |uri| URI(uri).path.split('/', 9).last }
+        lambda { |uri| URI(uri).path.split('/', baseparts).last }
       end
 
       def translate_id_to_uri
         lambda do |id|
-          "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/#{ActiveFedora::Noid.treeify(id)}"
+          "#{baseurl}/#{ActiveFedora::Noid.treeify(id)}"
         end
       end
+
+      private
+
+      def baseurl
+        "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}"
+      end
+
+      def baseparts
+        treeparts = [(template.gsub(/\.[rsz]/,'').length.to_f/2).ceil, 4].min
+        baseurl.count('/') + treeparts
+      end
     end
   end
 end

data/lib/active_fedora/noid/synchronized_minter.rb

@@ -1,6 +1,4 @@
 require 'noid'
-require 'yaml'
-
 module ActiveFedora
   module Noid
     class SynchronizedMinter
@@ -34,16 +32,22 @@ module ActiveFedora
         @statefile ||= ActiveFedora::Noid.config.statefile
       end
 
+      def state_for(io_object)
+        Marshal.load(io_object.read)
+      rescue TypeError, ArgumentError
+        { template: template }
+      end
+
       def next_id
         id = ''
         ::File.open(statefile, ::File::RDWR|::File::CREAT, 0644) do |f|
           f.flock(::File::LOCK_EX)
-          yaml = ::YAML::load(f.read) || { template: template }
-          minter = ::Noid::Minter.new(yaml)
+          state = state_for(f)
+          minter = ::Noid::Minter.new(state)
           id = minter.mint
           f.rewind
-          yaml = ::YAML::dump(minter.dump)
-          f.write yaml
+          new_state = Marshal.dump(minter.dump)
+          f.write(new_state)
           f.flush
           f.truncate(f.pos)
         end

data/lib/active_fedora/noid/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module Noid
-    VERSION = '0.3.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/tasks/noid_tasks.rake

@@ -0,0 +1,29 @@
+require 'active_fedora/noid'
+require 'noid'
+require 'yaml'
+
+namespace :active_fedora do
+  namespace :noid do
+    desc 'Migrate minter state file from YAML to Marshal'
+    task :migrate_statefile 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, File::RDWR | File::CREAT, 0644) do |f|
+        f.flock(File::LOCK_EX)
+        begin
+          yaml_state = YAML.load(f)
+        rescue Psych::SyntaxError
+          raise "File not valid YAML: #{statefile}\nAborting."
+        end
+        minter = Noid::Minter.new(yaml_state)
+        f.rewind
+        new_state = Marshal.dump(minter.dump)
+        f.write(new_state)
+        f.flush
+        f.truncate(f.pos)
+      end
+      puts "Done!"
+    end
+  end
+end

data/spec/unit/config_spec.rb

@@ -25,10 +25,44 @@ describe ActiveFedora::Noid::Config do
   end
 
   describe '#translate_uri_to_id' do
-    let(:translator) { described_class.new.translate_uri_to_id }
+    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(: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" }
+    end
 
     it { is_expected.to eq 'hh63vz22q/members' }
+
+    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
+
+    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
+
+    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
 end

data/spec/unit/synchronized_minter_spec.rb

@@ -4,8 +4,8 @@ require 'active_fedora'
 describe ActiveFedora::Noid::SynchronizedMinter do
   it { is_expected.to respond_to(:mint) }
 
-  it 'has a default template' do
-    expect(subject.template).to eq ActiveFedora::Noid.config.template
+  it 'has a default statefile' do
+    expect(subject.statefile).to eq ActiveFedora::Noid.config.statefile
   end
 
   it 'has a default template' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-noid
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael J. Giarlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -100,6 +100,7 @@ files:
 - lib/active_fedora/noid/service.rb
 - lib/active_fedora/noid/synchronized_minter.rb
 - lib/active_fedora/noid/version.rb
+- lib/tasks/noid_tasks.rake
 - spec/spec_helper.rb
 - spec/unit/config_spec.rb
 - spec/unit/noid_spec.rb
@@ -109,7 +110,11 @@ homepage: https://github.com/projecthydra-labs/active_fedora-noid
 licenses:
 - Apache2
 metadata: {}
-post_install_message: 
+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
+  an environment variable called AFNOID_STATEFILE with its path.)
 rdoc_options: []
 require_paths:
 - lib
@@ -125,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Noid identifier services for ActiveFedora-based applications