hydra-access-controls 9.6.0 → 9.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d858683ef55ada03ab8db4ae2236c36b842895cf
-  data.tar.gz: 1607be72ddad76b1f526ca62181d50a7724950bc
+  metadata.gz: 7c58ea8bad5ed33299fd0f5480b6d86c24632222
+  data.tar.gz: 8ab1983715088d885525195e9b83650820640957
 SHA512:
-  metadata.gz: 74f0875cd669674a81eecc48586fdb10ec1c900ece56e76611ec7258acb4d2411c2b46a2ee08c637fa06b177f9f8f149f626dcf933101f3b6ad1a94fe6115009
-  data.tar.gz: 41d8e8afbcc05366e4116e808b99f3c4d4c693754652426e258c72cd3357a4018bea46981d2f913ea0ec831d45cbe051ca0a1fc665a4fc98beebf43f88e74cea
+  metadata.gz: 6ed852d469c5f272c5ece361d6cc022b30c9a5eade790210193a5cdbcda488a5f039ad778b9d015547aa6460108700b4fe0b8e574dd554e8806c22d24d4bfaa0
+  data.tar.gz: abb73fcfe4ea54c55a8a7fdb794120cb62484c4a029f9a4930c085a8893fcedd4497735ef2dcf62bd6df9b35c3b53d86943d21325070f8cc56ca0bc5ab0cd4f3

data/Rakefile

@@ -3,7 +3,6 @@ require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
 APP_ROOT= File.expand_path(File.join(File.dirname(__FILE__),".."))
-require 'jettywrapper'
 # re-using hydra_jetty.rake from hydra-head
 import "tasks/hydra-access-controls.rake"
 

data/config/fedora.yml

@@ -1,10 +1,10 @@
 development:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://localhost:8983/fedora/rest
+  url: http://localhost:8984/rest
   base_path: /dev
 test:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://localhost:8983/fedora/rest
+  url: http://localhost:8986/rest
   base_path: /test

data/config/solr.yml

@@ -1,4 +1,4 @@
 development:
   url: http://localhost:<%= ENV['TEST_JETTY_PORT'] || 8983 %>/solr/development
-test: 
-  url: http://localhost:<%= ENV['TEST_JETTY_PORT'] || 8983 %>/solr/test
+test:
+  url: http://localhost:<%= ENV['TEST_JETTY_PORT'] || 8985 %>/solr/hydra-test

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', '~> 4.0'
-  gem.add_dependency "active-fedora", '~> 9.0'
+  gem.add_dependency "active-fedora", '~> 9.8'
   gem.add_dependency 'cancancan', '~> 1.8'
   gem.add_dependency 'deprecation', '~> 0.2'
   gem.add_dependency "blacklight", '>= 5.16'

data/lib/hydra-access-controls.rb

@@ -19,7 +19,6 @@ module Hydra
   autoload :RoleMapperBehavior
   autoload :PermissionsQuery
   autoload :PermissionsCache
-  autoload :PermissionsSolrDocument
   autoload :IpBasedGroups
 
   class << self

data/spec/support/config/blacklight.yml

@@ -3,4 +3,4 @@ development:
   url: http://localhost:<%= ENV['TEST_JETTY_PORT'] || 8983 %>/solr/development
 test:
   adapter: solr
-  url: http://localhost:<%= ENV['TEST_JETTY_PORT'] || 8983 %>/solr/test
+  url: http://localhost:<%= ENV['TEST_JETTY_PORT'] || 8985 %>/solr/hydra-test

data/tasks/hydra-access-controls.rake

@@ -1,18 +1,16 @@
 namespace "hydra-access" do
   desc "Run Continuous Integration"
-  task "ci" do
-    require 'jettywrapper'
-    jetty_params = Jettywrapper.load_config.merge(
-        {:jetty_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty'),
-          :startup_wait => 15, 
-          :jetty_port => ENV['TEST_JETTY_PORT'] || 8983
-        }
-    )
-    Rake::Task['jetty:config'].invoke
-    error = nil
-    error = Jettywrapper.wrap(jetty_params) do
-      Rake::Task['spec'].invoke
+  task :ci do
+    ENV['environment'] = "test"
+    solr_params = { port: 8985, verbose: true, managed: true }
+    fcrepo_params = { port: 8986, verbose: true, managed: true,
+                      no_jms: true, fcrepo_home_dir: 'fcrepo4-test-data' }
+    SolrWrapper.wrap(solr_params) do |solr|
+      solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "config")) do
+        FcrepoWrapper.wrap(fcrepo_params) do
+          Rake::Task['spec'].invoke
+        end
+      end
     end
-    raise "test failures: #{error}" if error
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.6.0
+  version: 9.7.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '9.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '9.8'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,7 @@ files:
 - app/models/hydra/access_controls/embargo.rb
 - app/models/hydra/access_controls/lease.rb
 - app/models/hydra/access_controls/permission.rb
+- app/models/hydra/permissions_solr_document.rb
 - app/models/role_mapper.rb
 - app/services/hydra/embargo_service.rb
 - app/services/hydra/lease_service.rb
@@ -170,7 +171,6 @@ files:
 - lib/hydra/ip_based_groups.rb
 - lib/hydra/permissions_cache.rb
 - lib/hydra/permissions_query.rb
-- lib/hydra/permissions_solr_document.rb
 - lib/hydra/policy_aware_ability.rb
 - lib/hydra/policy_aware_access_controls_enforcement.rb
 - lib/hydra/role_mapper_behavior.rb
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra