hydra-access-controls 10.0.0.beta4 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 697875b4c0783cb03ecfb27ba997d17953b42a39
-  data.tar.gz: b53e2dfedad344e1880372df5bfb46b279b8fb00
+  metadata.gz: abc166652363f95967842a0c5f8918e4a016b867
+  data.tar.gz: 95021128e8573f082257e7ed9a8a2fd2e25e0fe9
 SHA512:
-  metadata.gz: 508a09425f81350d092737008a543a6710efc6fefec8e522e74ad2ec4461323410cc3867193633e0f597291b0055f1f8faa619fd2b200306a31cd0764588ab19
-  data.tar.gz: 316c0fdf59bc1a7a1635561bca827eb6fb3ebc826b0269e379452d001f8bc6f268ebb391031a7a990c85d9af07df3eaa3fb6a709d0f8b1de63f76eb51f610152
+  metadata.gz: fab8f81b8dbc2ac92f674d8a5cd266eb3b90e8db09e7a1a61e5e6fa70138bf234ff911b3bf23ed9df2c435366f577c7368c3aea92a10e4c0e8d3aec6514e3adb
+  data.tar.gz: 33e32eadaade2db65b9c71a5ea6f291ae3565254d7759038fd2d1a4e3cbf449cfcb76d522c8e88581c9edd5751f7f84998f3bebd7ec01b191c30e5e92f204a58

data/hydra-access-controls.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   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.1'
+  gem.add_dependency "blacklight-access_controls", '~> 0.4'
 
   gem.add_development_dependency "rake", '~> 10.1'
   gem.add_development_dependency 'rspec', '~> 3.1'

data/lib/active_fedora/accessible_by.rb

@@ -11,7 +11,8 @@ ActiveFedora::QueryMethods.module_eval do
       when :update, :edit, :create, :new, :destroy then [:edit]
     end
 
-    spawn.where!(gated_discovery_filters(permission_types, ability).join(" OR "))
+    filters = gated_discovery_filters(permission_types, ability).join(" OR ")
+    spawn.where!(filters)
   end
 end
 

data/spec/unit/access_controls_enforcement_spec.rb

@@ -1,170 +1,5 @@
 require 'spec_helper'
 
 describe Hydra::AccessControlsEnforcement do
-  before do
-    allow(Devise).to receive(:authentication_keys).and_return(['uid'])
-  end
-  let(:controller) { MockController.new }
-  let(:method_chain) { MockController.search_params_logic }
-  let(:search_builder) { MockSearchBuilder.new(method_chain, controller) }
-
-  class MockController
-    def self.search_params_logic
-      [:add_access_controls_to_solr_params]
-    end
-  end
-
-  class MockSearchBuilder < Blacklight::SearchBuilder
-    include Blacklight::Solr::SearchBuilderBehavior
-    include Hydra::AccessControlsEnforcement
-    attr_accessor :params
-
-    def current_ability
-      @current_ability ||= Ability.new(current_user)
-    end
-
-    def session
-    end
-
-    delegate :logger, to: :Rails
-  end
-
-  subject { search_builder }
-
-  describe "When I am searching for content" do
-    before do
-      @solr_parameters = {}
-    end
-    context "Given I am not logged in" do
-      before do
-        allow(subject).to receive(:current_user).and_return(User.new(:new_record=>true))
-        subject.send(:apply_gated_discovery, @solr_parameters)
-      end
-
-      it "Then I should be treated as a member of the 'public' group" do
-        expect(@solr_parameters[:fq].first).to eq 'edit_access_group_ssim:public OR discover_access_group_ssim:public OR read_access_group_ssim:public'
-      end
-      it "Then I should not be treated as a member of the 'registered' group" do
-        expect(@solr_parameters[:fq].first).to_not match(/registered/)
-      end
-      it "Should changed based on the discovery_perissions" do
-        @solr_parameters = {}
-        discovery_permissions = ["read","edit"]
-        subject.send(:apply_gated_discovery, @solr_parameters)
-        ["edit","read"].each do |type|
-          expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:public/)
-        end
-      end
-    end
-
-    context "Given I am a registered user" do
-      before do
-        @user = FactoryGirl.build(:martia_morocco)
-        @user.new_record = false
-        allow(User).to receive(:find_by_user_key).and_return(@user)
-        # This is a pretty fragile way to stub it...
-        allow(RoleMapper).to receive(:byname).and_return(@user.user_key=>["faculty", "africana-faculty"])
-        allow(subject).to receive(:current_user).and_return(@user)
-        subject.send(:apply_gated_discovery, @solr_parameters)
-      end
-      it "Then I should be treated as a member of the 'public' and 'registered' groups" do
-        ["discover","edit","read"].each do |type|
-          expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:public/)
-          expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:registered/)
-        end
-      end
-      it "Then I should see assets that I have discover, read, or edit access to" do
-        ["discover","edit","read"].each do |type|
-          expect(@solr_parameters[:fq].first).to match(/#{type}_access_person_ssim\:#{@user.user_key}/)
-        end
-      end
-      it "Then I should see assets that my groups have discover, read, or edit access to" do
-        ["faculty", "africana-faculty"].each do |group_id|
-          ["discover","edit","read"].each do |type|
-            expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:#{group_id}/)
-          end
-        end
-      end
-      it "Should changed based on the discovery_perissions" do
-        @solr_parameters = {}
-        discovery_permissions = ["read","edit"]
-        subject.send(:apply_gated_discovery, @solr_parameters)
-        ["faculty", "africana-faculty"].each do |group_id|
-          ["edit","read"].each do |type|
-            expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:#{group_id}/)
-          end
-        end
-      end
-    end
-  end
-
-  describe "apply_gated_discovery" do
-    before(:each) do
-      @stub_user = User.new :uid=>'archivist1@example.com'
-      allow(RoleMapper).to receive(:roles).with(@stub_user).and_return(["archivist","researcher"])
-      allow(subject).to receive(:current_user).and_return(@stub_user)
-      @solr_parameters = {}
-    end
-    it "should set query fields for the user id checking against the discover, access, read fields" do
-      subject.send(:apply_gated_discovery, @solr_parameters)
-      ["discover","edit","read"].each do |type|
-        expect(@solr_parameters[:fq].first).to match(/#{type}_access_person_ssim\:#{@stub_user.user_key}/)
-      end
-    end
-    it "should set query fields for all roles the user is a member of checking against the discover, access, read fields" do
-      subject.send(:apply_gated_discovery, @solr_parameters)
-      ["discover","edit","read"].each do |type|
-        expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:archivist/)
-        expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:researcher/)
-      end
-    end
-
-    it "should escape slashes in the group names" do
-      allow(RoleMapper).to receive(:roles).with(@stub_user).and_return(["abc/123","cde/567"])
-      subject.send(:apply_gated_discovery, @solr_parameters)
-      ["discover","edit","read"].each do |type|
-        expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:abc\\\/123/)
-        expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:cde\\\/567/)
-      end
-    end
-    it "should escape spaces in the group names" do
-      allow(RoleMapper).to receive(:roles).with(@stub_user).and_return(["abc 123","cd/e 567"])
-      subject.send(:apply_gated_discovery, @solr_parameters)
-      ["discover","edit","read"].each do |type|
-        expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:abc\\ 123/)
-        expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:cd\\\/e\\ 567/)
-      end
-    end
-    it "should escape colons in the group names" do
-      allow(RoleMapper).to receive(:roles).with(@stub_user).and_return(["abc:123","cde:567"])
-      subject.send(:apply_gated_discovery, @solr_parameters)
-      ["discover","edit","read"].each do |type|
-        expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:abc\\:123/)
-        expect(@solr_parameters[:fq].first).to match(/#{type}_access_group_ssim\:cde\\:567/)
-      end
-    end
-  end
-
-  describe "apply_user_permissions" do
-    describe "when the user is a guest user (user key nil)" do
-      before do
-        stub_user = User.new
-        allow(subject).to receive(:current_user).and_return(stub_user)
-      end
-      it "should not create filters" do
-        expect(subject.send(:apply_user_permissions, ["edit","discover","read"])).to eq []
-      end
-    end
-    describe "when the user is a guest user (user key empty string)" do
-      before do
-        stub_user = User.new :uid=>''
-        allow(subject).to receive(:current_user).and_return(stub_user)
-      end
-      it "should not create filters" do
-        expect(subject.send(:apply_user_permissions, ["edit","discover","read"])).to eq []
-      end
-    end
-  end
+  # Contents have moved to blacklight-access_controls
 end
-
-

data/spec/unit/accessible_by_spec.rb

@@ -7,10 +7,6 @@ describe "active_fedora/accessible_by" do
   let(:public_obj) {FactoryGirl.create(:asset)}
   let(:editable_obj) {FactoryGirl.create(:asset)}
 
-  # let(:private_obj) {FactoryGirl.create(:default_access_asset)}
-  # let(:public_obj) {FactoryGirl.create(:open_access_asset)}
-  # let(:editable_obj) {FactoryGirl.create(:group_edit_asset)}
-
   before do
     private_obj.permissions_attributes = [{ name: "joe_creator", access: "edit", type: "person" }]
     private_obj.save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 10.0.0.beta4
+  version: 10.0.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,14 +94,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -225,9 +225,9 @@ 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.5.1