hydra-access-controls 5.0.0.pre11 → 5.0.0.pre12

data/hydra-access-controls.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["hydra-tech@googlegroups.com"]
   gem.description   = %q{Access controls for project hydra}
   gem.summary       = %q{Access controls for project hydra}
-  gem.homepage      = ""
+  gem.homepage      = "http://projecthydra.org"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,6 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = version
 
+  gem.required_ruby_version = '>= 1.9.3'
+
   gem.add_dependency 'activesupport'
   gem.add_dependency 'active-fedora'
   gem.add_dependency 'cancan'

data/lib/hydra/ability.rb

@@ -1,8 +1,11 @@
-require "blacklight"
-# this code will move to lib/hydra/access_controls/ability.rb (with the appropriate namespace changes) in Hydra 5.0
 # Code for [CANCAN] access to Hydra models
 module Hydra::Ability
-  include Hydra::AccessControlsEnforcement
+  extend ActiveSupport::Concern
+  
+  included do
+    include Hydra::AccessControlsEnforcement
+    include Blacklight::SolrHelper
+  end
 
   def self.user_class
     Hydra.config[:user_model] ?  Hydra.config[:user_model].constantize : ::User

data/lib/hydra/access_controls_enforcement.rb

@@ -1,8 +1,9 @@
 # will move to lib/hydra/access_control folder/namespace in release 5.x
 module Hydra::AccessControlsEnforcement
+  extend ActiveSupport::Concern
   
-  def self.included(klass)
-    klass.send(:include, Hydra::AccessControlsEvaluation)
+  included do
+    include Hydra::AccessControlsEvaluation
   end
   
   #
@@ -53,7 +54,12 @@ module Hydra::AccessControlsEnforcement
   # @param [Hash] extra_controller_params (optional)
   def get_permissions_solr_response_for_doc_id(id=nil, extra_controller_params={})
     raise Blacklight::Exceptions::InvalidSolrID.new("The application is trying to retrieve permissions without specifying an asset id") if id.nil?
-    solr_response = Blacklight.solr.find permissions_solr_doc_params(id).merge(extra_controller_params)
+    #solr_response = Blacklight.solr.get permissions_solr_doc_params(id).merge(extra_controller_params)
+    #path = blacklight_config.solr_path
+    solr_opts = permissions_solr_doc_params(id).merge(extra_controller_params)
+    response = Blacklight.solr.get('select', :params=> solr_opts)
+    solr_response = Blacklight::SolrResponse.new(force_to_utf8(response), solr_opts)
+
     raise Blacklight::Exceptions::InvalidSolrID.new("The solr permissions search handler didn't return anything for id \"#{id}\"") if solr_response.docs.empty?
     document = SolrDocument.new(solr_response.docs.first, solr_response)
     [solr_response, document]
@@ -138,7 +144,7 @@ module Hydra::AccessControlsEnforcement
   end
 
   ## proxies to enforce_edit_permssions.  This method is here for you to override
-  def enforce_delete_permissions(opts={})
+  def enforce_destroy_permissions(opts={})
     enforce_edit_permissions(opts)
   end
 

data/lib/hydra/admin_policy.rb

@@ -9,9 +9,7 @@ class Hydra::AdminPolicy < ActiveFedora::Base
   # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
   has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata 
 
-  has_metadata :name =>'descMetadata', :type => ActiveFedora::QualifiedDublinCoreDatastream do |ds|
-    ds.field :license_url
-  end
+  has_metadata :name =>'descMetadata', :type => ActiveFedora::QualifiedDublinCoreDatastream
 
   delegate_to :descMetadata, [:title, :description], :unique=>true
   delegate :license_title, :to=>'rightsMetadata', :at=>[:license, :title], :unique=>true

data/lib/hydra/user.rb

@@ -1,9 +1,7 @@
 # Injects behaviors into User model so that it will work with Hydra Access Controls
 # By default, this module assumes you are using the User model created by Blacklight, which uses Devise.
 # To integrate your own User implementation into Hydra, override this Module or define your own User model in app/models/user.rb within your Hydra head.
-require 'deprecation'
 module Hydra::User
-  extend Deprecation
   
   def self.included(klass)
     # Other modules to auto-include
@@ -24,19 +22,4 @@ module Hydra::User
       self.send("find_by_#{Devise.authentication_keys.first}".to_sym, key)
     end
   end
-
-  # This method should display the unique identifier for this user
-  # the unique identifier is what access controls will be enforced against. 
-  def unique_id
-    return to_s
-  end
-  deprecation_deprecate :unique_id
-
-
-  # For backwards compatibility with the Rails2 User models in Hydra/Blacklight
-  def login
-    return unique_id
-  end
-  deprecation_deprecate :login
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre11
+  version: 5.0.0.pre12
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -172,7 +172,7 @@ files:
 - spec/unit/policy_aware_access_controls_enforcement_spec.rb
 - spec/unit/rights_metadata_spec.rb
 - spec/unit/role_mapper_spec.rb
-homepage: ''
+homepage: http://projecthydra.org
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: