hydra-access-controls 6.4.1 → 6.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c7889e840d3022c5487081cbb7e11c7abad06ab
-  data.tar.gz: b8323dbda12665dc1ee7d29bcc5b194dcd09f7fa
+  metadata.gz: d210d30d1d16eaf9fd257ca3e3f4a62ff3366842
+  data.tar.gz: 77eb224f39e50722244cf75fc32c95ad07546208
 SHA512:
-  metadata.gz: b8e37c30ce82f7a2ac0c5f3d737ccc76ac0001675486d5bce88212b65ab786af187df510552ab05329f5da2e90da036e0e2022430d9c53f5c48aae4fd01198e9
-  data.tar.gz: 8b6be814f5af9b0c997c2dff7bbaa2c1a0f568135da51bc6411f92ef3555fa2271fd0228187d1f4d9d1111c9b5c2bb0104659f6197357bb31f3dbb08f7ec5bd8
+  metadata.gz: 073cfb5759b3d8be62cbf3f27804d66279920de562655a2ad94d89136f74cc9134a334bef828837db602e71680a852b79f9d9c5a5400f91d9f6ac1b986305f0c
+  data.tar.gz: d1e6d9284a74f9776c544060ceb8b401a9f705ad02aabc68d689cad00b0bff4733f403bf01ce16177e5164ff2096ea1fea05f2228d4e66955591aac2845ef30c

data/hydra-access-controls.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'activesupport'
-  gem.add_dependency "active-fedora", '~> 6.6'
+  gem.add_dependency "active-fedora", '~> 6.7'
   gem.add_dependency 'cancan'
   gem.add_dependency 'deprecation'
   gem.add_dependency 'blacklight', '~> 4.0' 

data/lib/hydra/access_controls/permission.rb

@@ -1,5 +1,6 @@
 module Hydra::AccessControls
   class Permission
+
     def initialize(args)
       @vals = {name: args[:name], access: args[:access], type: args[:type]}
     end
@@ -8,8 +9,12 @@ module Hydra::AccessControls
       false
     end
 
+    def to_hash
+      @vals
+    end
+
     def [] var
-      @vals[var]
+      to_hash[var]
     end
 
     def name

data/lib/hydra/admin_policy.rb

@@ -14,10 +14,10 @@ class Hydra::AdminPolicy < ActiveFedora::Base
     
   end
 
-  delegate_to :descMetadata, [:title, :description], multiple: false
-  delegate :license_title, to: 'rightsMetadata', at: [:license, :title], multiple: false
-  delegate :license_description, to: 'rightsMetadata', at: [:license, :description], multiple: false
-  delegate :license_url, to: 'rightsMetadata', at: [:license, :url], multiple: false
+  has_attributes :title, :description, datastream: :descMetadata, multiple: false
+  has_attributes :license_title, datastream: 'rightsMetadata', at: [:license, :title], multiple: false
+  has_attributes :license_description, datastream: 'rightsMetadata', at: [:license, :description], multiple: false
+  has_attributes :license_url, datastream: 'rightsMetadata', at: [:license, :url], multiple: false
 
   # easy access to edit_groups, etc
   include Hydra::AccessControls::Permissions 

data/lib/hydra/datastream/rights_metadata.rb

@@ -170,7 +170,7 @@ module Hydra
       def embargo_release_date=(release_date)
         release_date = release_date.to_s if release_date.is_a? Date
         begin
-          Date.parse(release_date)
+          release_date.nil? || Date.parse(release_date)
         rescue 
           return "INVALID DATE"
         end

data/spec/unit/hydra_rights_metadata_spec.rb

@@ -176,6 +176,11 @@ describe Hydra::Datastream::RightsMetadata do
     it "should only accept valid date values" do
       
     end
+    it "should accept a nil value after having a date value" do
+      @sample.embargo_release_date=("2010-12-01")
+      @sample.embargo_release_date=(nil)
+      @sample.embargo_release_date.should == nil
+    end
   end
   describe "embargo_release_date" do
     it "should return solr formatted date" do

data/spec/unit/permission.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Hydra::AccessControls::Permission do
+  describe "hash-like key access" do
+    let(:perm) { described_class.new(type: 'user', name: 'bob', access: 'read') }
+    it "should return values" do
+      perm[:type].should == 'user'
+      perm[:name].should == 'bob'
+      perm[:access].should == 'read'
+    end
+  end
+  describe "#to_hash" do
+    subject { described_class.new(type: 'user', name: 'bob', access: 'read') }
+    its(:to_hash) { should == {type: 'user', name: 'bob', access: 'read'} }
+  end
+  describe "equality comparison" do
+    let(:perm1) { described_class.new(type: 'user', name: 'bob', access: 'read') }
+    let(:perm2) { described_class.new(type: 'user', name: 'bob', access: 'read') }
+    let(:perm3) { described_class.new(type: 'user', name: 'jane', access: 'read') }
+    it "should be equal if all values are equal" do
+      perm1.should == perm2
+    end
+    it "should be unequal if some values are unequal" do
+      perm1.should_not == perm3
+      perm2.should_not == perm3
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.4.2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '6.6'
+        version: '6.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '6.6'
+        version: '6.7'
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +163,7 @@ files:
 - spec/unit/hydra_rights_metadata_persistence_spec.rb
 - spec/unit/hydra_rights_metadata_spec.rb
 - spec/unit/inheritable_rights_metadata_spec.rb
+- spec/unit/permission.rb
 - spec/unit/permissions_spec.rb
 - spec/unit/policy_aware_ability_spec.rb
 - spec/unit/policy_aware_access_controls_enforcement_spec.rb
@@ -191,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra
@@ -212,6 +213,7 @@ test_files:
 - spec/unit/hydra_rights_metadata_persistence_spec.rb
 - spec/unit/hydra_rights_metadata_spec.rb
 - spec/unit/inheritable_rights_metadata_spec.rb
+- spec/unit/permission.rb
 - spec/unit/permissions_spec.rb
 - spec/unit/policy_aware_ability_spec.rb
 - spec/unit/policy_aware_access_controls_enforcement_spec.rb