hydra-access-controls 6.4.2 → 6.5.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d210d30d1d16eaf9fd257ca3e3f4a62ff3366842
-  data.tar.gz: 77eb224f39e50722244cf75fc32c95ad07546208
+  metadata.gz: 58f7fe363bfe546c4b71a9dcbb957f891ed47196
+  data.tar.gz: 01cbe8640cdb8da959c7db447f64d68997408225
 SHA512:
-  metadata.gz: 073cfb5759b3d8be62cbf3f27804d66279920de562655a2ad94d89136f74cc9134a334bef828837db602e71680a852b79f9d9c5a5400f91d9f6ac1b986305f0c
-  data.tar.gz: d1e6d9284a74f9776c544060ceb8b401a9f705ad02aabc68d689cad00b0bff4733f403bf01ce16177e5164ff2096ea1fea05f2228d4e66955591aac2845ef30c
+  metadata.gz: a1cf8e0953ce0fe6870b7fa74e166615baab44a8fa83fd1018f7b59b4adfac72fd58e0a71edc329018d2f4e03ff7c8a06ddde4402f3aa1b51aa461a67f359f4f
+  data.tar.gz: e53f7c53fbd15308bb1aef82966cbb8e73f615e8d832f38dd4e0e9d162a31fd586d506d5e8af79d39b3021dab6b9e0aa71d4d3acb65b5c48ac7bafde3d98def3

data/hydra-access-controls.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "active-fedora", '~> 6.7'
   gem.add_dependency 'cancan'
   gem.add_dependency 'deprecation'
-  gem.add_dependency 'blacklight', '~> 4.0' 
+  gem.add_dependency 'blacklight', '~> 4.7'
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency 'rspec'

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
-          release_date.nil? || Date.parse(release_date)
+          Date.parse(release_date)
         rescue 
           return "INVALID DATE"
         end

data/lib/hydra/permissions_query.rb

@@ -24,10 +24,8 @@ module Hydra
     # @param [Hash] extra_controller_params (optional)
     def get_permissions_solr_response_for_doc_id(id=nil, extra_controller_params={})
       raise Blacklight::Exceptions::InvalidSolrID.new("The application is trying to retrieve permissions without specifying an asset id") if id.nil?
-      #solr_response = Blacklight.solr.get permissions_solr_doc_params(id).merge(extra_controller_params)
-      #path = blacklight_config.solr_path
       solr_opts = permissions_solr_doc_params(id).merge(extra_controller_params)
-      response = Blacklight.solr.get('select', :params=> solr_opts)
+      response = ActiveFedora::SolrService.instance.conn.get('select', :params=>solr_opts)
       solr_response = Blacklight::SolrResponse.new(force_to_utf8(response), solr_opts)
 
       raise Blacklight::Exceptions::InvalidSolrID.new("The solr permissions search handler didn't return anything for id \"#{id}\"") if solr_response.docs.empty?

data/spec/factories.rb

@@ -82,23 +82,23 @@ FactoryGirl.define do
   end
   
   factory :default_access_asset, :parent=>:asset do |a|
-    permissions [{:name=>"joe_creator", :access=>"edit", :type=>"user"}]
+    permissions_attributes [{:name=>"joe_creator", :access=>"edit", :type=>"user"}]
   end
   
   factory :dept_access_asset, :parent=>:asset do |a|
-    permissions [{:name=>"africana-faculty", :access=>"read", :type=>"group"}, {:name=>"joe_creator", :access=>"edit", :type=>"user"}]
+    permissions_attributes [{:name=>"africana-faculty", :access=>"read", :type=>"group"}, {:name=>"joe_creator", :access=>"edit", :type=>"user"}]
   end
 
   factory :group_edit_asset, :parent=>:asset do |a|
-    permissions [{:name=>"africana-faculty", :access=>"edit", :type=>"group"}, {:name=>"calvin_collaborator", :access=>"edit", :type=>"user"}]
+    permissions_attributes [{:name=>"africana-faculty", :access=>"edit", :type=>"group"}, {:name=>"calvin_collaborator", :access=>"edit", :type=>"user"}]
   end
   
   factory :org_read_access_asset, :parent=>:asset do |a|
-    permissions [{:name=>"registered", :access=>"read", :type=>"group"}, {:name=>"joe_creator", :access=>"edit", :type=>"user"}, {:name=>"calvin_collaborator", :access=>"edit", :type=>"user"}]
+    permissions_attributes [{:name=>"registered", :access=>"read", :type=>"group"}, {:name=>"joe_creator", :access=>"edit", :type=>"user"}, {:name=>"calvin_collaborator", :access=>"edit", :type=>"user"}]
   end
   
   factory :open_access_asset, :parent=>:asset do |a|
-    permissions [{:name=>"public", :access=>"read", :type=>"group"}, {:name=>"joe_creator", :access=>"edit", :type=>"user"}, {:name=>"calvin_collaborator", :access=>"edit", :type=>"user"}]
+    permissions_attributes [{:name=>"public", :access=>"read", :type=>"group"}, {:name=>"joe_creator", :access=>"edit", :type=>"user"}, {:name=>"calvin_collaborator", :access=>"edit", :type=>"user"}]
   end
 
 end

data/spec/support/mods_asset.rb

@@ -1,8 +1,8 @@
 require 'active-fedora'
+
 class ModsAsset < ActiveFedora::Base
-  include Hydra::ModelMixins::RightsMetadata
-  has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
-  
+  include Hydra::AccessControls::Permissions
+ 
   # This is how we're associating admin policies with assets.  
   # You can associate them however you want, just use the :is_governed_by relationship
   belongs_to :admin_policy, :class_name=> "Hydra::AdminPolicy", :property=>:is_governed_by

data/spec/unit/hydra_rights_metadata_persistence_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe Hydra::Datastream::RightsMetadata do
   before :all do
     class RightsTest < ActiveFedora::Base
-      include Hydra::ModelMixins::RightsMetadata
-      has_metadata name: 'rightsMetadata', type: Hydra::Datastream::RightsMetadata
+      include Hydra::AccessControls::Permissions
     end
   end
 

data/spec/unit/hydra_rights_metadata_spec.rb

@@ -176,11 +176,6 @@ 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/permissions_spec.rb

@@ -115,6 +115,7 @@ describe Hydra::AccessControls::Permissions do
     it "should behave like #permissions_attributes=" do
       foo1 = Foo.new
       foo2 = Foo.new
+      Deprecation.stub(:warn).and_return(nil)
       foo1.permissions = [{type: "user", access: "edit", name: "editor"}]
       foo2.permissions_attributes = [{type: "user", access: "edit", name: "editor"}]
       foo1.permissions.should == foo2.permissions

data/spec/unit/rights_metadata_spec.rb

@@ -6,50 +6,50 @@ describe Hydra::ModelMixins::RightsMetadata do
     subject.discover_groups=['group1', 'group2']
     subject.edit_users=['user1']
     subject.read_users=['user2', 'user3']
-    subject.permissions.should include({:type=>"group", :access=>"discover", :name=>"group1"},
-        {:type=>"group", :access=>"discover", :name=>"group2"},
-        {:type=>"user", :access=>"read", :name=>"user2"},
-        {:type=>"user", :access=>"read", :name=>"user3"},
-        {:type=>"user", :access=>"edit", :name=>"user1"})
+    subject.permissions.should include(Hydra::AccessControls::Permission.new({:type=>"group", :access=>"discover", :name=>"group1"}),
+        Hydra::AccessControls::Permission.new({:type=>"group", :access=>"discover", :name=>"group2"}),
+        Hydra::AccessControls::Permission.new({:type=>"user", :access=>"read", :name=>"user2"}),
+        Hydra::AccessControls::Permission.new({:type=>"user", :access=>"read", :name=>"user3"}),
+        Hydra::AccessControls::Permission.new({:type=>"user", :access=>"edit", :name=>"user1"}))
   end
 
   describe "updating permissions" do
     it "should create new group permissions" do
-      subject.permissions = [{:name=>'group1', :access=>'discover', :type=>'group'}]
-      subject.permissions.should == [{:type=>'group', :access=>'discover', :name=>'group1'}]
+      subject.permissions_attributes = [{:name=>'group1', :access=>'discover', :type=>'group'}]
+      subject.permissions.should == [Hydra::AccessControls::Permission.new({:type=>'group', :access=>'discover', :name=>'group1'})]
     end
     it "should create new user permissions" do
-      subject.permissions = [{:name=>'user1', :access=>'discover', :type=>'user'}]
-      subject.permissions.should == [{:type=>'user', :access=>'discover', :name=>'user1'}]
+      subject.permissions_attributes = [{:name=>'user1', :access=>'discover', :type=>'user'}]
+      subject.permissions.should == [Hydra::AccessControls::Permission.new({:type=>'user', :access=>'discover', :name=>'user1'})]
     end
     it "should not replace existing groups" do
-      subject.permissions = [{:name=>'group1', :access=>'discover', :type=>'group'}]
-      subject.permissions = [{:name=>'group2', :access=>'discover', :type=>'group'}]
-      subject.permissions.should == [{:type=>'group', :access=>'discover', :name=>'group1'},
-                                   {:type=>'group', :access=>'discover', :name=>'group2'}]
+      subject.permissions_attributes = [{:name=>'group1', :access=>'discover', :type=>'group'}]
+      subject.permissions_attributes = [{:name=>'group2', :access=>'discover', :type=>'group'}]
+      subject.permissions.should == [Hydra::AccessControls::Permission.new({:type=>'group', :access=>'discover', :name=>'group1'}),
+                                   Hydra::AccessControls::Permission.new({:type=>'group', :access=>'discover', :name=>'group2'})]
     end
     it "should not replace existing users" do
-      subject.permissions = [{:name=>'user1', :access=>'discover', :type=>'user'}]
-      subject.permissions = [{:name=>'user2', :access=>'discover', :type=>'user'}]
-      subject.permissions.should == [{:type=>'user', :access=>'discover', :name=>'user1'},
-                                   {:type=>'user', :access=>'discover', :name=>'user2'}]
+      subject.permissions_attributes = [{:name=>'user1', :access=>'discover', :type=>'user'}]
+      subject.permissions_attributes = [{:name=>'user2', :access=>'discover', :type=>'user'}]
+      subject.permissions.should == [Hydra::AccessControls::Permission.new({:type=>'user', :access=>'discover', :name=>'user1'}),
+                                   Hydra::AccessControls::Permission.new({:type=>'user', :access=>'discover', :name=>'user2'})]
     end
     it "should update permissions on existing users" do
-      subject.permissions = [{:name=>'user1', :access=>'discover', :type=>'user'}]
-      subject.permissions = [{:name=>'user1', :access=>'edit', :type=>'user'}]
-      subject.permissions.should == [{:type=>'user', :access=>'edit', :name=>'user1'}]
+      subject.permissions_attributes = [{:name=>'user1', :access=>'discover', :type=>'user'}]
+      subject.permissions_attributes = [{:name=>'user1', :access=>'edit', :type=>'user'}]
+      subject.permissions.should == [Hydra::AccessControls::Permission.new({:type=>'user', :access=>'edit', :name=>'user1'})]
     end
     it "should update permissions on existing groups" do
-      subject.permissions = [{:name=>'group1', :access=>'discover', :type=>'group'}]
-      subject.permissions = [{:name=>'group1', :access=>'edit', :type=>'group'}]
-      subject.permissions.should == [{:type=>'group', :access=>'edit', :name=>'group1'}]
+      subject.permissions_attributes = [{:name=>'group1', :access=>'discover', :type=>'group'}]
+      subject.permissions_attributes = [{:name=>'group1', :access=>'edit', :type=>'group'}]
+      subject.permissions.should == [Hydra::AccessControls::Permission.new({:type=>'group', :access=>'edit', :name=>'group1'})]
     end
     it "should assign user permissions when :type == 'person'" do
-      subject.permissions = [{:name=>'user1', :access=>'discover', :type=>'person'}]
-      subject.permissions.should == [{:type=>'user', :access=>'discover', :name=>'user1'}]
+      subject.permissions_attributes = [{:name=>'user1', :access=>'discover', :type=>'person'}]
+      subject.permissions.should == [Hydra::AccessControls::Permission.new({:type=>'user', :access=>'discover', :name=>'user1'})]
     end
     it "should raise an ArgumentError when the :type hashkey is invalid" do
-      expect{subject.permissions = [{:name=>'user1', :access=>'read', :type=>'foo'}]}.to raise_error(ArgumentError)
+      expect{subject.permissions_attributes = [{:name=>'user1', :access=>'read', :type=>'foo'}]}.to raise_error(ArgumentError)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.4.2
+  version: 6.5.0.rc2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +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/permission_spec.rb
 - spec/unit/permissions_spec.rb
 - spec/unit/policy_aware_ability_spec.rb
 - spec/unit/policy_aware_access_controls_enforcement_spec.rb
@@ -187,12 +187,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra
@@ -213,7 +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/permission_spec.rb
 - spec/unit/permissions_spec.rb
 - spec/unit/policy_aware_ability_spec.rb
 - spec/unit/policy_aware_access_controls_enforcement_spec.rb