active_fedora-noid 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dfe7eb78a1ea93066a65a212cee6470d330c313
-  data.tar.gz: 45975a62c716cabe2e686e03cb4d444fb226d1eb
+  metadata.gz: 58331d11f13b03e0afbb2768cefd92dc9c9f407e
+  data.tar.gz: 8ce905f51981b34871da889019175afbb51a255e
 SHA512:
-  metadata.gz: 18546143cd33f6e2cc59af5080afb96510bed1e32ffbda3115317081b21a927ca1a9a7a699aebb0bc0077d2ca3e820fd4859e072c046d82c4576ea24f059d271
-  data.tar.gz: 5d6acecefb830f970673e5a451cba0e94989f8e636bb9eb6f8f834f8eab9c489552be7eb8f6d5f56909692b307ed8cc1126566f9137756213f0de36516b1263b
+  metadata.gz: f518f02cd6051a6a890d837eda8de798c586fe4a24ada26b6a2480f6ab5e75f04c9374af38865a22cc07df3277448b011ea582fc32c89a41c9cc2407c874ebc3
+  data.tar.gz: c57803c1c8970842d232e1217257fe7a51f0717dcca2fae9d45db511bb29f955c572a4e3611930573408ad6f2705fa263f19dc87fb06f7b53258e66ab14b2033

data/lib/active_fedora/noid/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module Noid
-    VERSION = '1.1.1'.freeze
+    VERSION = '1.1.2'.freeze
   end
 end

data/lib/active_fedora/noid.rb

@@ -15,7 +15,9 @@ module ActiveFedora
       end
 
       def treeify(identifier)
-        (identifier.scan(/..?/).first(4) + [identifier]).join('/')
+        head = identifier.split('/').first
+        head.gsub!(/#.*/, '')
+        (head.scan(/..?/).first(4) + [identifier]).join('/')
       end
     end
   end

data/spec/unit/config_spec.rb

@@ -39,10 +39,10 @@ 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
 
-    describe 'with a short custom template' do
+    context '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 }
@@ -51,7 +51,7 @@ describe ActiveFedora::Noid::Config do
       it { is_expected.to eq 'abcd/members' }
     end
 
-    describe 'with an even shorter custom template' do
+    context '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 }
@@ -60,7 +60,7 @@ describe ActiveFedora::Noid::Config do
       it { is_expected.to eq 'abc/members' }
     end
 
-    describe 'with a long custom template' do
+    context '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 }
@@ -68,6 +68,48 @@ describe ActiveFedora::Noid::Config do
   
       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" }
+    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/noid_spec.rb

@@ -15,5 +15,9 @@ 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
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-noid
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Michael J. Giarlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -146,4 +146,3 @@ test_files:
 - spec/unit/noid_spec.rb
 - spec/unit/service_spec.rb
 - spec/unit/synchronized_minter_spec.rb
-has_rdoc: