active-fedora 9.6.1 → 9.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed9af0497efe12a99da6783dc8fb7aaaf2a1c130
-  data.tar.gz: cea4cf641038e3edcb68a53a8c174ddba6035c49
+  metadata.gz: 4563e9a6719b7d7ba4b3c1c13a94062707acfd24
+  data.tar.gz: 67c92763ade10866c4682153e6df9d69d761d0a1
 SHA512:
-  metadata.gz: 957e5864be7ef7001eed269400e65e7ae95c5a421078ca56d0243638a51e8442df00e76037097603d894193fdef20edc965ce52d10781fef7ba97de9cf916d15
-  data.tar.gz: df5e24a7c95c5e06958e21fb246b0b66210b7523c576ed56356d646973c13bef029000e7f153f7ad60b2e1679f59e7724232e1001c57d4f58104ade1532b26b0
+  metadata.gz: add632d1ed1e804dc8624a91925be4d43347acb4d15d0119b293dc99b0c40de8168ea62fb42a6e1d21b9df7592ba4def6b2f8c3fc7d7178a30239cc9ed01218e
+  data.tar.gz: c8b1040b21118e8438691f07228765f1aaa1ed9f6645966c79c64e14c3d46463a1bc64e8159f9dd02e752533be40d33c198440fc86af1f04dc805f2b31b67b80

data/History.txt

@@ -1,7 +1,12 @@
+v9.6.2
+  2015-11-07: Fixes for new version of rubocop [Justin Coyne]
+
+  2015-11-07: Escape square brackets in URIs. Fixes #941 [Justin Coyne]
+
 v9.6.1
   2015-11-02: Don't try to parse nil dates. Fixes #937 [Justin Coyne]
 
-v9.6.0 (yanked)
+v9.6.0 (yanked due to error parsing nil dates)
   2015-11-02: Loosen dependency on rdf-rdfxml [Justin Coyne]
 
   2015-10-29: Allow developers to override resource_class. [Trey Terrell]

data/lib/active_fedora/caching_connection.rb

@@ -31,7 +31,8 @@ module ActiveFedora
 
     # Enable the cache within the block.
     def cache
-      old, @cache_enabled = @cache_enabled, true
+      old = @cache_enabled
+      @cache_enabled = true
       yield
     ensure
       @cache_enabled = old
@@ -48,7 +49,8 @@ module ActiveFedora
 
     # Disable the query cache within the block.
     def uncached
-      old, @cache_enabled = @cache_enabled, false
+      old = @cache_enabled
+      @cache_enabled = false
       yield
     ensure
       @cache_enabled = old

data/lib/active_fedora/core/fedora_id_translator.rb

@@ -2,6 +2,7 @@ module ActiveFedora::Core
   class FedoraIdTranslator
     SLASH = '/'.freeze
     def self.call(id)
+      id = URI.escape(id, '[]'.freeze)
       id = "/#{id}" unless id.start_with? SLASH
       unless ActiveFedora.fedora.base_path == SLASH || id.start_with?("#{ActiveFedora.fedora.base_path}/")
         id = ActiveFedora.fedora.base_path + id

data/lib/active_fedora/query_result_builder.rb

@@ -41,7 +41,7 @@ module ActiveFedora
         best_model_match = model_value if best_model_match > model_value
       end
 
-      ActiveFedora::Base.logger.warn "Could not find a model for #{hit['id']}, defaulting to ActiveFedora::Base" unless best_model_match if ActiveFedora::Base.logger
+      ActiveFedora::Base.logger.warn "Could not find a model for #{hit['id']}, defaulting to ActiveFedora::Base" if ActiveFedora::Base.logger && !best_model_match
       best_model_match || ActiveFedora::Base
     end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.6.1"
+  VERSION = "9.6.2"
 end

data/spec/unit/core/fedora_id_translator_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.6.1
+  version: 9.6.2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr