blacklight-access_controls 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e7cd1735e1adbfc7b730e61d0b6deb065ef3d6c
-  data.tar.gz: d1d6ad746309d9c725eee9afee7a5d2000cfa262
+  metadata.gz: 66b7d11bbb0aacac0df560454fcaa9197d497f0d
+  data.tar.gz: 6972e1277bd9fe2de05767128e2e7a5e5aed16ab
 SHA512:
-  metadata.gz: 79b64f8758122bb057404ececc2322b8eb5b25511d96ad5a937234259860e1959dc45f79fbbef8c1f3ad4423e6fc81543363a78bf2ce780b8514d672d2e4fa64
-  data.tar.gz: 8b0e425f6f6f93e3087803a25b00212ece6dcb1d240cc5abd7d2004198f44183e3017c4b4702449fd56a15622327b0f92414349563344c960319579bbbdd6ae3
+  metadata.gz: bafe87cf20a214cd8391860e189cf7ded1c169a1b95a096e5bfd5d9085d9aa476d8871d808ba36fd2e8bfee718f531034b19cf134769efbd57642071be2f3868
+  data.tar.gz: cee89b0b791178f86ade6bfd44b863cb2ae704549499df94100ffbe5f1586992309a471f878376d168b4a49ce10c9b987797199c342b190a63ea212561898bd0

data/.solr_wrapper.yml

@@ -0,0 +1,5 @@
+# Place any default configuration for solr_wrapper here
+# port: 8983
+collection:
+  dir: solr_conf/conf/
+  name: blacklight-core

data/.travis.yml

@@ -1,22 +1,15 @@
 language: ruby
 sudo: false
-cache:
-  directories:
-  - /tmp/solr-5.3.0
 
 notifications:
   email: false
 
 rvm:
-  - 2.3.0
+  - 2.3.1
 
 env:
- - "RAILS_VERSION=4.2.5"
-
-notifications:
-  irc: "irc.freenode.org#blacklight"
-  email:
-      - blacklight-commits@googlegroups.com
+ - "RAILS_VERSION=4.2.7.1"
+ - "RAILS_VERSION=5.0.0.1"
 
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile

@@ -3,12 +3,11 @@ source "https://rubygems.org"
 # Specify gem dependencies in blacklight-access_controls.gemspec
 gemspec
 
-# -------------------------
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.0
-# engine_cart stanza: 0.8.0
+# engine_cart: 0.10.0
+# engine_cart stanza: 0.10.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
 if File.exist?(file)
   begin
     eval_gemfile file
@@ -19,14 +18,22 @@ if File.exist?(file)
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
 
-  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+  if ENV['RAILS_VERSION']
+    if ENV['RAILS_VERSION'] == 'edge'
+      gem 'rails', github: 'rails/rails'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+    else
+      gem 'rails', ENV['RAILS_VERSION']
+    end
+  end
 
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  else
-    gem 'sass-rails', "< 5.0"
+  case ENV['RAILS_VERSION']
+  when /^4.2/
+    gem 'responders', '~> 2.0'
+    gem 'sass-rails', '>= 5.0'
+    gem 'coffee-rails', '~> 4.1.0'
+  when /^4.[01]/
+    gem 'sass-rails', '< 5.0'
   end
 end
 # END ENGINE_CART BLOCK
-# -------------------------

data/README.textile

@@ -1,4 +1,5 @@
 h1. Blacklight Access Controls
+!https://travis-ci.org/projectblacklight/blacklight-access_controls.svg?branch=master!:https://travis-ci.org/projectblacklight/blacklight-access_controls
 
 Provides access controls for Blacklight-based applications.
 

data/Rakefile

@@ -22,18 +22,10 @@ def solr_config_dir
 end
 
 namespace :solr do
-  desc 'Configure solr cores'
-  task :config do
-    SolrWrapper.wrap do |solr|
-      solr.create(name: 'development', dir: solr_config_dir)
-      solr.create(name: 'test', dir: solr_config_dir)
-    end
-  end
-
   desc 'Run test suite (with solr wrapper)'
   task :spec do
     SolrWrapper.wrap do |solr|
-      solr.with_collection(name: 'test', dir: solr_config_dir) do # |collection_name|
+      solr.with_collection(name: 'blacklight-core', dir: solr_config_dir) do # |collection_name|
         Rake::Task['spec'].invoke
       end
     end

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/blacklight-access_controls.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency "blacklight", '~> 6.0'
   gem.add_dependency "deprecation", '~> 1.0'
 
-  gem.add_development_dependency "rake", '~> 10.1'
+  gem.add_development_dependency "rake", '~> 11.3'
   gem.add_development_dependency 'rspec', '~> 3.1'
-  gem.add_development_dependency "engine_cart", "~> 0.8"
+  gem.add_development_dependency "engine_cart", "~> 1.0"
   gem.add_development_dependency "solr_wrapper"
   gem.add_development_dependency "factory_girl_rails", "~> 4.0"
   gem.add_development_dependency "database_cleaner"

data/lib/blacklight/access_controls/permissions_query.rb

@@ -27,10 +27,10 @@ module Blacklight::AccessControls
       raise Blacklight::Exceptions::InvalidSolrID, 'The application is trying to retrieve permissions without specifying an asset id' if id.nil?
       solr_opts = permissions_solr_doc_params(id).merge(extra_controller_params)
       response = Blacklight.default_index.connection.get('select', params: solr_opts)
-      solr_response = Blacklight::Solr::Response.new(response, solr_opts)
+      solr_response = Blacklight::Solr::Response.new(response, solr_opts, document_model: permissions_document_class)
 
       raise Blacklight::Exceptions::InvalidSolrID, "The solr permissions search handler didn't return anything for id \"#{id}\"" if solr_response.docs.empty?
-      permissions_document_class.new(solr_response.docs.first, solr_response)
+      solr_response.docs.first
     end
 
     #

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'engine_cart'
 EngineCart.load_application!
 
 require 'blacklight-access_controls'
+
 require 'factory_girl_rails'
 require 'database_cleaner'
 

data/spec/test_app_templates/blacklight.yml

@@ -12,7 +12,7 @@
 
 development:
   adapter: solr
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/development" %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>
 test: &test
   adapter: solr
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/test" %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-access_controls
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".solr_wrapper.yml"
 - ".travis.yml"
 - Gemfile
 - README.textile