hydra-access-controls 7.0.0.rc1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58a77fa2bd284c19512fb6e9267dde6555b9ccf0
-  data.tar.gz: 6913b984630dd75785b575040b7e5bbd1da5447a
+  metadata.gz: eca7a77f8cb4ea32d7c4915e35a9da69cb3e109b
+  data.tar.gz: 27f3c6ae86554fffe20aa0befd33b5850cfb5391
 SHA512:
-  metadata.gz: ab4a35778989b898e957debeee6523f009ad0d7cb660545d8f9f194cde8f4f862b64d72d94f1641e6bbe0158b9280d1d9c44935d0803a1031970f316f096e3d8
-  data.tar.gz: 8fc2c4dbd5a58ac0ca82288e6e42904a930a3a432188635747147294959773a372a6f81627809e74a8f0c0aa766631bb58cd6916480182dbbcfc5ed66e89f162
+  metadata.gz: 16d9138368be86ed0307539b68f935d3dfb9533c050e78a13b2c8f90f9eb29f16e04bd3d33d01e29b3265648f5ef8959cd398bb1fa134d59f281d543fef308e9
+  data.tar.gz: a86f237e7f52ad1e88187ebb463db7e6c4daaf77f43421f7f8113a3fed8eb20e50cf6984a9fe2d2eba64e1e6a0621903130081aa0d9bde66dec1be181a312814

data/hydra-access-controls.gemspec

@@ -19,14 +19,14 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'activesupport'
-  gem.add_dependency "active-fedora", '~> 7.0.0.rc3'
+  gem.add_dependency "active-fedora", '~> 7.0.0'
   gem.add_dependency 'cancancan'
   gem.add_dependency 'deprecation'
-  gem.add_dependency "blacklight", '~> 5.0'
+  gem.add_dependency "blacklight", '~> 5.3'
 
   # sass-rails is typically generated into the app's gemfile by `rails new`
   # In rails 3 it's put into the "assets" group and thus not available to the
-  # app. Blacklight 5.2 requires bootstrap-sass which requires (but does not
+  # app. Blacklight 5.3 requires bootstrap-sass which requires (but does not
   # declare a dependency on) sass-rails
   gem.add_dependency 'sass-rails'
 

data/lib/hydra/access_controls_enforcement.rb

@@ -130,12 +130,4 @@ module Hydra::AccessControlsEnforcement
   def apply_superuser_permissions(permission_types, ability = current_ability)
     []
   end
-  
-  # This filters out objects that you want to exclude from search results.  By default it only excludes FileAssets
-  # @param solr_parameters the current solr parameters
-  # @param user_parameters the current user-subitted parameters
-  def exclude_unwanted_models(solr_parameters, user_parameters)
-    solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "-#{ActiveFedora::SolrService.solr_name("has_model", :symbol)}:\"info:fedora/afmodel:FileAsset\""
-  end
 end

data/lib/hydra/role_mapper_behavior.rb

@@ -1,5 +1,3 @@
-# this code will be moved/renamed to Hydra::AccessControl::RoleMapperBehavior (with the appropriate namespace changes) in Hydra 5.0
-require 'yaml'
 module Hydra::RoleMapperBehavior
   extend ActiveSupport::Concern
 
@@ -25,23 +23,47 @@ module Hydra::RoleMapperBehavior
     end
     
     def whois(r)
-      map[r]||[]
+      map[r] || []
     end
 
     def map
-      @map ||= YAML.load(File.open(File.join(Rails.root, "config/role_map_#{Rails.env}.yml")))
+      @map ||= load_role_map
     end
 
 
     def byname
-      return @byname if @byname
-      m = Hash.new{|h,k| h[k]=[]}
-      @byname = map.inject(m) do|memo, (role,usernames)| 
-        ((usernames if usernames.respond_to?(:each)) || [usernames]).each { |x| memo[x]<<role}
-        memo
+      @byname ||= map.each_with_object(Hash.new{ |h,k| h[k] = [] }) do |(role, usernames), memo| 
+        Array(usernames).each { |x| memo[x] << role}
       end
     end
-    
+
+    private
+      def load_role_map
+        require 'erb'
+        require 'yaml'
+
+        filename = 'config/role_map.yml'
+        file = File.join(Rails.root, filename)
+
+        unless File.exists?(file)
+          raise "You are missing a role map configuration file: #{filename}. Have you run \"rails generate hydra:head\"?"
+        end
+
+        begin
+          erb = ERB.new(IO.read(file)).result(binding)
+        rescue
+          raise("#{file} was found, but could not be parsed with ERB. \n#{$!.inspect}")
+        end
+
+        begin
+          yml = YAML::load(erb)
+        rescue
+          raise("#{filename} was found, but could not be parsed.\n")
+        end
+        return yml[Rails.env] if yml.is_a? Hash
+
+        raise("#{filename} was found, but was blank or malformed.\n")
+      end
   end
 end
 

data/spec/spec_helper.rb

@@ -22,7 +22,6 @@ require "support/user"
 require "factory_girl"
 require "factories"
 
-require 'support/blacklight'
 require 'support/rails'
 Object.logger = Logger.new(File.expand_path('../test.log', __FILE__))
 

data/spec/support/config/role_map.yml

@@ -0,0 +1,15 @@
+test:
+  archivist:
+    - archivist1@example.com
+    - archivist2@example.com
+    - leland_himself@example.com
+  admin_policy_object_editor:
+    - archivist1@example.com
+  donor:
+    - donor1@example.com
+    - leland_himself@example.com
+  researcher:
+    - researcher1@example.com
+  patron:
+    - patron1@example.com
+    - leland_himself@example.com

data/spec/unit/access_controls_enforcement_spec.rb

@@ -155,19 +155,6 @@ describe Hydra::AccessControlsEnforcement do
       end
     end
   end
-  
-  describe "exclude_unwanted_models" do
-    before(:each) do
-      stub_user = User.new :uid=>'archivist1@example.com'
-      subject.stub(:current_user).and_return(stub_user)
-      @solr_parameters = {}
-      @user_parameters = {}
-    end
-    it "should set solr query parameters to filter out FileAssets" do
-      subject.send(:exclude_unwanted_models, @solr_parameters, @user_parameters)
-      @solr_parameters[:fq].should include("-#{ActiveFedora::SolrService.solr_name("has_model", :symbol)}:\"info:fedora/afmodel:FileAsset\"")  
-    end
-  end
 
   describe "apply_user_permissions" do
     describe "when the user is a guest user (user key nil)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc1
+  version: 7.0.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc3
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc3
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -163,8 +163,7 @@ files:
 - lib/hydra/user.rb
 - spec/factories.rb
 - spec/spec_helper.rb
-- spec/support/blacklight.rb
-- spec/support/config/role_map_test.yml
+- spec/support/config/role_map.yml
 - spec/support/config/solr.yml
 - spec/support/mods_asset.rb
 - spec/support/rails.rb
@@ -202,9 +201,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.2.2
@@ -214,8 +213,7 @@ summary: Access controls for project hydra
 test_files:
 - spec/factories.rb
 - spec/spec_helper.rb
-- spec/support/blacklight.rb
-- spec/support/config/role_map_test.yml
+- spec/support/config/role_map.yml
 - spec/support/config/solr.yml
 - spec/support/mods_asset.rb
 - spec/support/rails.rb

data/spec/support/blacklight.rb

@@ -1,7 +0,0 @@
-require 'blacklight'
-
-module Blacklight
-  def self.solr_file
-    File.expand_path(File.join(File.dirname(__FILE__), "config", "solr.yml"))
-  end
-end

data/spec/support/config/role_map_test.yml

@@ -1,14 +0,0 @@
-archivist:
-  - archivist1@example.com
-  - archivist2@example.com
-  - leland_himself@example.com
-admin_policy_object_editor:
-  - archivist1@example.com
-donor:
-  - donor1@example.com
-  - leland_himself@example.com
-researcher:
-  - researcher1@example.com
-patron:
-  - patron1@example.com
-  - leland_himself@example.com