hydra-access-controls 10.3.2 → 10.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41551b5b4c585cf81dcf873b800b5699dc6c1b22
-  data.tar.gz: a81738e509b739baf6d816ad0ec58f68a1b880f9
+  metadata.gz: 7d9f4e9a294e4eb06926d2cda789c8b1feb24609
+  data.tar.gz: 84ea038cc5f00777a46865971fab5ef1fc363bd3
 SHA512:
-  metadata.gz: a4979abd13373922171646bd2bf6cbf79c8c016e3c45b145be961cf778a4818d71151345ed0bfa8defa41ab3f32cfbe7de2a1a0a5d3280d600c2377d4811575b
-  data.tar.gz: 25049f1bb1d157fa2512c045644543851c88020c60f8875ee2c4b993f5619a0f57394a01d5e84b56ff5f15d69ff35cb34f17987f0b4e8d5f0ded3e5dfcce2051
+  metadata.gz: c061f202f781cd99fdfae4ffc0910bd66e9d49d50052cd87ea77a5b8f7ec44a21271769b22f66ee0a34d37c5277c28f776730013510b91a4d4be3492bc052045
+  data.tar.gz: 21c4e5e27a1b6b1b516bc50906d76821eb8388892a114b9aea06ab34d77ea965cf7576a3fc51c7f7a6862f0e1cb739a92009e5eee5169c45e3761b3f5bdae5b0

data/app/models/hydra/access_controls/permission.rb

@@ -37,7 +37,7 @@ module Hydra::AccessControls
     end
 
     def agent_name
-      parsed_agent.last
+      URI.decode(parsed_agent.last)
     end
 
     def access
@@ -58,14 +58,18 @@ module Hydra::AccessControls
       raise "Can't build agent #{inspect}" unless name && type
       self.agent = case type
                    when 'group'
-                     Agent.new(::RDF::URI.new("#{GROUP_AGENT_URL_PREFIX}##{name}"))
+                     build_agent_resource(GROUP_AGENT_URL_PREFIX, name)
                    when 'person'
-                     Agent.new(::RDF::URI.new("#{PERSON_AGENT_URL_PREFIX}##{name}"))
+                     build_agent_resource(PERSON_AGENT_URL_PREFIX, name)
                    else
                      raise ArgumentError, "Unknown agent type #{type.inspect}"
                    end
     end
 
+    def build_agent_resource(prefix, name)
+      Agent.new(::RDF::URI.new("#{prefix}##{URI.encode(name)}"))
+    end
+
     def build_access(access)
       raise "Can't build access #{inspect}" unless access
       self.mode = case access

data/spec/unit/permission_spec.rb

@@ -45,4 +45,19 @@ describe Hydra::AccessControls::Permission do
       expect(perm2).to_not eq perm3
     end
   end
+
+  describe "URI escaping" do
+    let(:permission) { described_class.new(type: 'person', name: 'john doe', access: 'read') }
+    let(:permission2) { described_class.new(type: 'group', name: 'hydra devs', access: 'read') }
+
+    it "should escape agent when building" do
+      expect(permission.agent.first.rdf_subject.to_s).to eq 'http://projecthydra.org/ns/auth/person#john%20doe'
+      expect(permission2.agent.first.rdf_subject.to_s).to eq 'http://projecthydra.org/ns/auth/group#hydra%20devs'
+    end
+
+    it "should unescape agent when parsing" do
+      expect(permission.agent_name).to eq 'john doe'
+      expect(permission2.agent_name).to eq 'hydra devs'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 10.3.2
+  version: 10.3.3
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra