hydra-core 9.0.0.rc2 → 9.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfd6ca42ed2dab7c3a851dcc1adfa878b8729a1b
-  data.tar.gz: d6c0908393c4d24fc5ba3aefb45bb01432c5b7e7
+  metadata.gz: 1d78684487930080bec86b38178c7db06a8d5b27
+  data.tar.gz: f4ff2193e8a2c8bcef376e8c27e38d9d55ba2a4d
 SHA512:
-  metadata.gz: cbfe289139025b4c65247d87dc7f634699404f80d48c7161d43445b5f6a8048efc05993f3ffce6146f3a00b2ebdcdc09a68a342fec60ab75e0505e376904c010
-  data.tar.gz: 34e2407cc7a77d2bfcd658d846fad291a5193c495e328436a4eacb315320b139e7006395c91b78c79bb0863c52a5deb884f198f571e366acc69ac38039626a1b
+  metadata.gz: 919c39a8ce1ef2e19039f6a3d9510e20acf465b313f558814623f8fcb83c43ebf369c79891e52d3a0b9fdd4c357fb8986c4c0b770b2fd549f9e79cdf7621394f
+  data.tar.gz: 1ab0e63052e322ae86a20d8ad05584ceea032c5a41e3e42b79d7798a7325d10f16f392ac25f1313c9fb5fcc3641fe91975a0d50de65aa6c6d520024b5f19d7da

data/app/controllers/concerns/hydra/controller/controller_behavior.rb

@@ -1,10 +1,10 @@
 # Include this module into any of your Controller classes to add Hydra functionality
 #
-# The primary function of this module is to mix in a number of other Hydra Modules, including 
+# The primary function of this module is to mix in a number of other Hydra Modules, including
 #   Hydra::AccessControlsEnforcement
 #
-# @example 
-#  class CustomHydraController < ApplicationController  
+# @example
+#  class CustomHydraController < ApplicationController
 #    include Hydra::Controller::ControllerBehavior
 #  end
 #
@@ -14,27 +14,29 @@ module Hydra::Controller::ControllerBehavior
   included do
     # Other modules to auto-include
     include Hydra::AccessControlsEnforcement
-  
+
     # Catch permission errors
-    rescue_from CanCan::AccessDenied do |exception|
-      if (exception.action == :edit)
-        redirect_to({:action=>'show'}, :alert => exception.message)
-      elsif current_user and current_user.persisted?
-        redirect_to root_path, :alert => exception.message
-      else
-        session["user_return_to"] = request.url
-        redirect_to new_user_session_path, :alert => exception.message
-      end
-    end
+    rescue_from CanCan::AccessDenied, with: :deny_access
   end
-  
-  
+
   # get the currently configured user identifier.  Can be overridden to return whatever (ie. login, email, etc)
   # defaults to using whatever you have set as the Devise authentication_key
   def user_key
     current_user.user_key if current_user
   end
 
+  # Override this method if you wish to customize the way access is denied
+  def deny_access(exception)
+    if exception.action == :edit
+      redirect_to({ action: 'show' }, alert: exception.message)
+    elsif current_user and current_user.persisted?
+      redirect_to root_path, alert: exception.message
+    else
+      session['user_return_to'.freeze] = request.url
+      redirect_to new_user_session_path, alert: exception.message
+    end
+  end
+
   module ClassMethods
     # get the solr name for a field with this name and using the given solrizer descriptor
     def solr_name(name, *opts)

data/hydra-core.gemspec

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 version = File.read(File.expand_path("../../HYDRA_VERSION", __FILE__)).strip
 
-
 Gem::Specification.new do |gem|
   gem.authors     = ["Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors"]
   gem.email       = ["hydra-tech@googlegroups.com"]
@@ -19,12 +18,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-
-  gem.add_dependency "rails", '>= 3.2.3', '< 5' 
+  gem.add_dependency "rails", '>= 3.2.3', '< 5'
   gem.add_dependency 'block_helpers'
   gem.add_dependency 'hydra-access-controls', version
-  gem.add_dependency 'jettywrapper', ">=1.4.1"
-  
+  gem.add_dependency 'jettywrapper', '>= 2.0.0'
+
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'rspec-rails'

data/lib/generators/hydra/head_generator.rb

@@ -69,8 +69,8 @@ module Hydra
       file_path = "app/models/#{model_name.underscore}.rb"
       if File.exists?(file_path)
         inject_into_class file_path, model_name.classify do
-          "# Connects this user object to Hydra behaviors. " +
-          "\n include Hydra::User\n"
+          "  # Connects this user object to Hydra behaviors.\n" +
+          "  include Hydra::User\n\n"
         end
       else
         puts "     \e[31mFailure\e[0m  Hydra requires a user object in order to apply access controls. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g hydra:head client"

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "9.0.0.rc2"
+  VERSION = "9.0.0.rc3"
 end

data/lib/railties/hydra_jetty.rake

@@ -7,47 +7,20 @@ end
 
 namespace :hydra do
   namespace :jetty do
-    desc "Copies the default Solr & Fedora configs into the bundled Hydra Testing Server"
+    desc "Copies the default Solr config 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|  
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.0.0.rc2
+  version: 9.0.0.rc3
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,28 +51,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.0.rc2
+        version: 9.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.0.rc2
+        version: 9.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement