hydra-access-controls 5.0.0.rc1 → 5.0.0

data/Rakefile

@@ -5,8 +5,7 @@ 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 "lib/tasks/hydra_jetty.rake"
-import "lib/tasks/hydra-access-controls.rake"
+import "tasks/hydra-access-controls.rake"
 
 desc 'Default: run specs.'
 task :default => :spec

data/lib/hydra/access_controls_enforcement.rb

@@ -5,6 +5,7 @@ module Hydra::AccessControlsEnforcement
 
   included do
     include Hydra::AccessControlsEvaluation
+    include Blacklight::SolrHelper # for force_to_utf8
     class_attribute :solr_access_filters_logic
 
     # Set defaults. Each symbol identifies a _method_ that must be in
@@ -154,7 +155,7 @@ module Hydra::AccessControlsEnforcement
       raise Hydra::AccessDenied.new "You do not have sufficient privileges to create a new document."
     end
   end
-  deprecation_deprecate :enforce_edit_permissions
+  deprecation_deprecate :enforce_create_permissions
 
   ## proxies to enforce_edit_permssions.  This method is here for you to override
   def enforce_update_permissions(opts={})
@@ -175,7 +176,7 @@ module Hydra::AccessControlsEnforcement
   # Currently does nothing, instead relies on 
   # @param [Hash] opts (optional, not currently used)
   def enforce_index_permissions(opts={})
-    # Do nothing. Relies on enforce_search_permissions being included in the Controller's solr_search_params_logic
+    # Do nothing. Relies on add_access_controls_to_solr_params being in the Controller's solr_search_params_logic
     return true
   end
   

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
-  prerelease: 6
+  version: 5.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -152,8 +152,6 @@ files:
 - lib/hydra/policy_aware_access_controls_enforcement.rb
 - lib/hydra/role_mapper_behavior.rb
 - lib/hydra/user.rb
-- lib/tasks/hydra-access-controls.rake
-- lib/tasks/hydra_jetty.rake
 - spec/factories.rb
 - spec/spec_helper.rb
 - spec/support/blacklight.rb
@@ -172,6 +170,7 @@ files:
 - spec/unit/policy_aware_access_controls_enforcement_spec.rb
 - spec/unit/rights_metadata_spec.rb
 - spec/unit/role_mapper_spec.rb
+- tasks/hydra-access-controls.rake
 homepage: http://projecthydra.org
 licenses: []
 post_install_message: 
@@ -187,9 +186,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/tasks/hydra_jetty.rake

@@ -1,55 +0,0 @@
-# re-using hydra_jetty.rake from hydra-head
-
-namespace :jetty do
-  desc "Apply all configs to Testing Server (relies on hydra:jetty:config tasks unless you override it)"
-  task :config do
-    Rake::Task["hydra:jetty:config"].invoke
-  end
-end
-
-namespace :hydra do
-  namespace :jetty do
-    desc "Copies the default Solr & Fedora configs into the bundled Hydra Testing Server"
-    task :config do
-      Rake::Task["hydra:jetty:config_fedora"].invoke
-      Rake::Task["hydra:jetty:config_solr"].invoke
-    end
-    
-    desc "Copies the contents of solr_conf into the Solr development-core and test-core of Testing Server"
-    task :config_solr do
-      FileList['solr_conf/conf/*'].each do |f|  
-        cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
-        cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
-      end
-    end
-
-    desc "Copies a custom fedora config for the bundled Hydra Testing Server"
-    task :config_fedora do
-      # load a custom fedora.fcfg - 
-      if defined?(Rails.root)
-        app_root = Rails.root
-      else
-        app_root = File.join(File.dirname(__FILE__),"..")
-      end
-       
-      fcfg = File.join(app_root,"fedora_conf","conf","development","fedora.fcfg")
-      if File.exists?(fcfg)
-        puts "copying over development/fedora.fcfg"
-        cp("#{fcfg}", 'jetty/fedora/default/server/config/', :verbose => true)
-      else
-        puts "#{fcfg} file not found -- skipping fedora config"
-      end
-      fcfg = File.join(app_root,"fedora_conf","conf","test","fedora.fcfg")
-      if File.exists?(fcfg)
-        puts "copying over test/fedora.fcfg"
-        cp("#{fcfg}", 'jetty/fedora/test/server/config/', :verbose => true)
-      else
-        puts "#{fcfg} file not found -- skipping fedora config"
-      end
-    end
-
-    desc "Copies the default SOLR config files and starts up the fedora instance."
-    task :load => [:config, 'jetty:start']
-
-  end
-end