active-fedora 10.3.0.rc2 → 10.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfce14d5c623e569206f59c02700d667e34bde26
-  data.tar.gz: ead2d01f58a36fc8afac60ddfc9825fd1e581d53
+  metadata.gz: 3f4e8471f5df940e6d52c76f150fd1532aff2e7d
+  data.tar.gz: 79be63a9635f81dfe7a0017fe8890900e4ff598c
 SHA512:
-  metadata.gz: c61d8f7606b23f0cbff48e4280711cab4b1237d245590b775cead65ca4b65907ee6b000b8bcef23bafd41cc2bb8f84dd194edb220589f9e510e2712a47885cc8
-  data.tar.gz: b5af3107ec86f44ab5e56926e678601430f855ea8c962e193dc90eff90b2db46fde9bc6de6ed68f36cc64a7173986d6d56b05848b0f79e02b5c7788101758656
+  metadata.gz: c2ff90b7a1a95255a21f55d72c55a488087087147629b29615380a041ba8da465a61274e850b52299955951f7a85bf398e4d0709db552cfb418d4ad2693b524f
+  data.tar.gz: 193eac22abf48bb8b3817d92d36fb25f977155648ee8f7c2493d271be6d01c4b2f0d4b587c501b2fe668a0f82d0e7cd0a4eba16af506d84da7136c5664ca0ff6

data/lib/active_fedora/fedora.rb

@@ -23,11 +23,15 @@ module ActiveFedora
     end
 
     def host
-      @config[:url]
+      @config[:url].sub(/\/$/, BLANK)
     end
 
     def base_path
-      @config[:base_path] || '/'
+      @config[:base_path] || SLASH
+    end
+
+    def base_uri
+      host + base_path.sub(/\/$/, BLANK)
     end
 
     def user

data/lib/active_fedora/indexing.rb

@@ -84,7 +84,7 @@ module ActiveFedora
         end
 
         def reindex_everything
-          descendants = descendant_uris(ActiveFedora::Base.id_to_uri(''))
+          descendants = descendant_uris(ActiveFedora.fedora.base_uri)
           descendants.shift # Discard the root uri
           descendants.each do |uri|
             logger.debug "Re-index everything ... #{uri}"

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "10.3.0.rc2".freeze
+  VERSION = "10.3.0".freeze
 end

data/spec/unit/base_spec.rb

@@ -260,7 +260,7 @@ describe ActiveFedora::Base do
             end
 
             it "updates the resource" do
-              expect(test_object.resource.rdf_subject).to eq ::RDF::URI.new("#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/#{@this_id}")
+              expect(test_object.resource.rdf_subject).to eq ::RDF::URI.new("#{ActiveFedora.fedora.base_uri}/#{@this_id}")
               expect(test_object.title).to eq ['foo']
             end
           end

data/spec/unit/core/fedora_id_translator_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe ActiveFedora::Core::FedoraIdTranslator do
   describe ".call" do
     let(:result) { described_class.call(id) }
     context "when given an id" do
-      let(:good_uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "/banana" }
+      let(:good_uri) { ActiveFedora.fedora.base_uri + "/banana" }
       let(:id) { "banana" }
       it "returns a fedora URI" do
         expect(result).to eq good_uri
@@ -18,7 +18,7 @@ RSpec.describe ActiveFedora::Core::FedoraIdTranslator do
       end
 
       context "with characters that need escaping" do
-        let(:good_uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "/%5Bfrob%5D" }
+        let(:good_uri) { ActiveFedora.fedora.base_uri + "/%5Bfrob%5D" }
         let(:id) { "[frob]" }
         it "returns a good fedora URI" do
           expect(result).to eq good_uri

data/spec/unit/core/fedora_uri_translator_spec.rb

@@ -4,13 +4,13 @@ RSpec.describe ActiveFedora::Core::FedoraUriTranslator do
   describe ".call" do
     let(:result) { described_class.call(uri) }
     context "when given a Fedora URI" do
-      let(:uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "/6" }
+      let(:uri) { ActiveFedora.fedora.base_uri + "/6" }
       it "returns the id" do
         expect(result).to eq '6'
       end
     end
     context "when given a URI missing a slash" do
-      let(:uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "602-a" }
+      let(:uri) { ActiveFedora.fedora.base_uri + "602-a" }
       it "returns the id" do
         expect(result).to eq "602-a"
       end

data/spec/unit/core_spec.rb

@@ -109,7 +109,7 @@ describe ActiveFedora::Base do
     subject { described_class.id_to_uri(id) }
 
     context "with no custom proc is set" do
-      it { should eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/123456w" }
+      it { is_expected.to eq "#{ActiveFedora.fedora.base_uri}/123456w" }
       it "justs call #translate_id_to_uri" do
         allow(described_class).to receive(:translate_id_to_uri).and_call_original
         allow(ActiveFedora::Core::FedoraIdTranslator).to receive(:call).and_call_original
@@ -122,11 +122,11 @@ describe ActiveFedora::Base do
 
     context "when custom proc is set" do
       before do
-        described_class.translate_id_to_uri = lambda { |id| "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/foo/#{id}" }
+        described_class.translate_id_to_uri = lambda { |id| "#{ActiveFedora.fedora.base_uri}/foo/#{id}" }
       end
       after { described_class.translate_id_to_uri = nil }
 
-      it { should eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/foo/123456w" }
+      it { is_expected.to eq "#{ActiveFedora.fedora.base_uri}/foo/123456w" }
     end
 
     context "with an empty base path" do
@@ -145,8 +145,8 @@ describe ActiveFedora::Base do
   end
 
   describe "uri_to_id" do
-    let(:uri) { "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/foo/123456w" }
-    subject { described_class.uri_to_id(uri) }
+    let(:uri) { "#{ActiveFedora.fedora.base_uri}/foo/123456w" }
+    subject(:uri_id) { described_class.uri_to_id(uri) }
 
     context "with no custom proc is set" do
       it { should eq 'foo/123456w' }

data/spec/unit/file_spec.rb

@@ -51,14 +51,14 @@ describe ActiveFedora::File do
       context "and it's initialized with the URI" do
         let(:file) { described_class.new(parent.uri + "/FOO1") }
         it "works" do
-          expect(subject.to_s).to eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/1234/FOO1"
+          expect(subject.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
         end
       end
 
       context "and it's initialized with an ID" do
         let(:file) { described_class.new(parent.id + "/FOO1") }
         it "works" do
-          expect(subject.to_s).to eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/1234/FOO1"
+          expect(subject.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 10.3.0.rc2
+  version: 10.3.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -743,12 +743,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.