hydra-access-controls 9.0.0.rc3 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a64ed79e8667bcdef1d5d26d9fc0a82dc98ae5ae
-  data.tar.gz: 99da4fafbe99c24a6bc17b5767a036ba4eac9176
+  metadata.gz: 9dad3b88eb0367db1735dd5e60f70e163474431f
+  data.tar.gz: 19b7d120a816665c354b956e16748f0b21fd0968
 SHA512:
-  metadata.gz: d6d2fed2907a52c6fc74badeefa95918742d4c8b33c6e9ca2dbd33dd0dd2010d21083bac9f51187f793c544e82536fad102aabca15f2343c254840555af4d1a1
-  data.tar.gz: 10d2fcaded37c8e62306cf2203beaf2a1193f5ee44e66e6a13f7e86ffe926bc207357928c63ac845594a4163ba6f03977fa2acf71c5bac56847899563f5e0e0a
+  metadata.gz: 2e96001b89dc8f592253781ec5d99de6fe9880b51d7ec92717975c129285f9bde669ff80563dd2b44a96d938928ea314480cf5c837579c8cff5fa2efd7a4ccc7
+  data.tar.gz: 42d76b3a6fc9376a2ca65fed28d9139f7333cef47dc89631cf3e112f572b3724db44b3dae152c8f733e13bbec5c048111432df82a59375298a82a022b9b7b083

data/app/models/concerns/hydra/with_depositor.rb

@@ -0,0 +1,14 @@
+module Hydra::WithDepositor
+  # Adds metadata about the depositor to the asset and
+  # grants edit permissions to the +depositor+
+  # @param [String, #user_key] depositor
+  def apply_depositor_metadata(depositor)
+    depositor_id = depositor.respond_to?(:user_key) ? depositor.user_key : depositor
+
+    if respond_to? :depositor
+      self.depositor = depositor_id
+    end
+    self.edit_users += [depositor_id]
+    true
+  end
+end

data/hydra-access-controls.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_dependency 'activesupport'
-  gem.add_dependency "active-fedora", '~> 9.0.0.rc2'
-  gem.add_dependency 'cancancan'
-  gem.add_dependency 'deprecation'
+  gem.add_dependency 'activesupport', '~> 4.0'
+  gem.add_dependency "active-fedora", '~> 9.0.0'
+  gem.add_dependency 'cancancan', '~> 1.8'
+  gem.add_dependency 'deprecation', '~> 0.1.0'
   gem.add_dependency "blacklight", '~> 5.3'
 
   # sass-rails is typically generated into the app's gemfile by `rails new`
@@ -30,6 +30,6 @@ Gem::Specification.new do |gem|
   # declare a dependency on) sass-rails
   gem.add_dependency 'sass-rails'
 
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency "rake", '~> 10.1'
+  gem.add_development_dependency 'rspec' '~> 3.1'
 end

data/lib/hydra/access_controls_enforcement.rb

@@ -10,7 +10,7 @@ module Hydra::AccessControlsEnforcement
     # CatalogController.include ModuleDefiningNewMethod
     # CatalogController.solr_access_filters_logic += [:new_method]
     # CatalogController.solr_access_filters_logic.delete(:we_dont_want)
-    self.solr_access_filters_logic = [:apply_group_permissions, :apply_user_permissions, :apply_superuser_permissions ]
+    self.solr_access_filters_logic = [:apply_group_permissions, :apply_user_permissions]
 
   end
 
@@ -117,9 +117,4 @@ module Hydra::AccessControlsEnforcement
       end
       user_access_filters
   end
-
-  # override to apply super user permissions
-  def apply_superuser_permissions(permission_types, ability = current_ability)
-    []
-  end
 end

data/spec/spec_helper.rb

@@ -28,6 +28,7 @@ require_relative '../app/models/hydra/access_controls/access_control_list'
 require_relative '../app/models/hydra/access_controls/permission'
 require_relative '../app/models/hydra/access_controls/embargo'
 require_relative '../app/models/hydra/access_controls/lease'
+require_relative '../app/models/concerns/hydra/with_depositor'
 require_relative '../app/services/hydra/lease_service'
 require_relative '../app/services/hydra/embargo_service'
 require_relative '../app/validators/hydra/future_date_validator'

data/spec/unit/with_depositor_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Hydra::WithDepositor do
+  before do
+    class TestClass
+      include Hydra::WithDepositor
+      attr_accessor :edit_users, :depositor
+      def initialize
+        @edit_users = []
+      end
+    end
+  end
+
+  after { Object.send(:remove_const, :TestClass) }
+
+  subject { TestClass.new }
+
+  describe "#apply_depositor_metadata" do
+    it "should add edit access" do
+      subject.apply_depositor_metadata('naomi')
+      expect(subject.edit_users).to eq ['naomi']
+    end
+
+    it "should not overwrite people with edit access" do
+      subject.edit_users = ['jessie']
+      subject.apply_depositor_metadata('naomi')
+      expect(subject.edit_users).to match_array ['naomi', 'jessie']
+    end
+
+    it "should set depositor" do
+      subject.apply_depositor_metadata('chris')
+      expect(subject.depositor).to eq 'chris'
+    end
+
+    it "should accept objects that respond_to? :user_key" do
+      stub_user = double(:user, user_key: 'monty')
+      subject.apply_depositor_metadata(stub_user)
+      expect(subject.depositor).to eq 'monty'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.0.0.rc3
+  version: 9.0.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,64 +10,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.rc2
+        version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.rc2
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -100,18 +100,18 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec~> 3.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,6 +143,7 @@ files:
 - app/models/concerns/hydra/access_controls/with_access_right.rb
 - app/models/concerns/hydra/admin_policy_behavior.rb
 - app/models/concerns/hydra/rights.rb
+- app/models/concerns/hydra/with_depositor.rb
 - app/models/hydra/access_controls/access_control_list.rb
 - app/models/hydra/access_controls/embargo.rb
 - app/models/hydra/access_controls/lease.rb
@@ -194,6 +195,7 @@ files:
 - spec/unit/role_mapper_spec.rb
 - spec/unit/visibility_spec.rb
 - spec/unit/with_access_right_spec.rb
+- spec/unit/with_depositor_spec.rb
 - spec/validators/future_date_validator_spec.rb
 - tasks/hydra-access-controls.rake
 homepage: http://projecthydra.org
@@ -211,12 +213,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra
@@ -245,5 +247,6 @@ test_files:
 - spec/unit/role_mapper_spec.rb
 - spec/unit/visibility_spec.rb
 - spec/unit/with_access_right_spec.rb
+- spec/unit/with_depositor_spec.rb
 - spec/validators/future_date_validator_spec.rb
 has_rdoc: