hydra-access-controls 10.6.0 → 10.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 194c22619390bf832d9525d0560f36cf82c81591
-  data.tar.gz: 6dc606293605fa52c7347d99540c2761be4c4e22
+SHA256:
+  metadata.gz: c717d8b64aa57e3baf983b4941afe227aaeaa4d0b82908ec1580305df87bb04d
+  data.tar.gz: 929fff58673109ed89c24d5c3fb0b4d4051d2d465ec34d7766ee9c437adcfccd
 SHA512:
-  metadata.gz: 2fb11965a6ba204c99d8cc10ac9883d9c716e677d4cc407e365eb8da99834e5d796b704130a8889175d1edeb4b38e13925aed0c6a25e19f8c78970673bbdf73e
-  data.tar.gz: eec346cdd2746922f3e0b8e777555ad980b8853c156e9ff4787d666d16a6f4ca70a920380665ce97bd8bd34952c36b659e95fa030845e3bb4745c581994b9b3f
+  metadata.gz: f869c751327ced2026ddce996719d2f77a909da1e782c7d70cb79f3ffa2125a90cb12342a361360f2c448b56135fc949b13f32eb78c3e83f8b78cfd312dce62a
+  data.tar.gz: 073c4713f9b97aa30900ec4209ea73817491e675884835724d8e8861fd8ba131a792c52040fc8dee8ca1ba315db1705cda21afee2ffebb720813a50af302a036

data/app/models/concerns/hydra/access_controls/permissions.rb

@@ -22,7 +22,7 @@ module Hydra
       end
 
       def permission_delegate
-        (access_control || create_access_control).tap { |d| d.owner = self }
+        (access_control || build_access_control).tap { |d| d.owner = self }
       end
 
       def to_solr(solr_doc = {})

data/hydra-access-controls.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'activesupport', '>= 4', '< 6'
   gem.add_dependency "active-fedora", '>= 10.0.0', '< 13'
-  gem.add_dependency 'cancancan', '~> 1.8'
-  gem.add_dependency 'deprecation', '~> 1.0'
   gem.add_dependency "blacklight", '>= 5.16'
   gem.add_dependency "blacklight-access_controls", '~> 0.6.0'
+  gem.add_dependency 'cancancan', '~> 1.8'
+  gem.add_dependency 'deprecation', '~> 1.0'
 
   gem.add_development_dependency "rake", '~> 10.1'
   gem.add_development_dependency 'rspec', '~> 3.1'

data/spec/spec_helper.rb

@@ -11,12 +11,22 @@ Hydra::Engine.config.autoload_paths.each { |path| $LOAD_PATH.unshift path }
 
 require 'byebug' unless ENV['CI']
 
-if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+def coverage_needed?
+  ENV['COVERAGE'] || ENV['TRAVIS']
+end
+
+if RUBY_VERSION =~ /^1.9/ && coverage_needed?
   require 'simplecov'
-  require 'simplecov-rcov'
+  require 'coveralls'
 
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start
+  SimpleCov.root(File.expand_path('../../../', __FILE__))
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+    [
+      SimpleCov::Formatter::HTMLFormatter,
+      Coveralls::SimpleCov::Formatter
+    ]
+  )
+  SimpleCov.start('rails')
 end
 
 # Since we're not doing a Rails Engine test, we have to load these classes manually:
@@ -52,4 +62,3 @@ RSpec.configure do |config|
     ActiveFedora::Cleaner.clean!
   end
 end
-

data/spec/unit/permissions_spec.rb

@@ -28,9 +28,8 @@ describe Hydra::AccessControls::Permissions do
   end
 
   describe "building a new permission" do
-    before { subject.save! }
-
     it "sets the accessTo association" do
+      subject.save!
       perm = subject.permissions.build(name: 'user1', type: 'person', access: 'read')
       expect(perm.access_to_id).to eq subject.id
     end
@@ -38,9 +37,13 @@ describe Hydra::AccessControls::Permissions do
     it "autosaves the permissions" do
       subject.permissions.build(name: 'user1', type: 'person', access: 'read')
       subject.save!
-      subject.reload
       foo = Foo.find(subject.id)
-      expect(foo.permissions.to_a).not_to eq []
+
+      expect(foo.permissions)
+        .to contain_exactly(have_attributes(access:       'read',
+                                            access_to_id: subject.id,
+                                            agent_name:   'user1',
+                                            type:         'person'))
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 10.6.0
+  version: 10.6.1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,61 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13'
 - !ruby/object:Gem::Dependency
-  name: cancancan
+  name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '5.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '5.16'
 - !ruby/object:Gem::Dependency
-  name: deprecation
+  name: blacklight-access_controls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: blacklight
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.16'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.16'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: blacklight-access_controls
+  name: deprecation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -236,8 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra