hydra-core 5.0.0.rc1 → 5.0.0

data/hydra-core.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |gem|
 
 
   gem.add_dependency "rails", '~>3.2.3' 
-  gem.add_dependency "blacklight", '~> 4.0.0'  
+  gem.add_dependency "blacklight", '~> 4.0'  
   gem.add_dependency "devise"
-  gem.add_dependency "active-fedora", '~> 5.0.0'
+  gem.add_dependency "active-fedora", '~> 5.0'
   gem.add_dependency 'RedCloth', '=4.2.9'
   gem.add_dependency 'block_helpers'
   gem.add_dependency 'sanitize'

data/lib/generators/hydra/head_generator.rb

@@ -49,12 +49,17 @@ class HeadGenerator < Rails::Generators::Base
     copy_file "config/solr_mappings.yml", "config/solr_mappings.yml"
 
     # Fedora & Solr YAML files
-    copy_file "config/fedora.yml", "config/fedora.yml"
-    copy_file "config/solr.yml", "config/solr.yml"
-   
-    # Fedora & Solr Config files
-    directory "fedora_conf"
-    directory "solr_conf"
+    begin
+      invoke('active_fedora:config')
+    rescue NoMethodError
+      # Looks like we are falling back on the old way of doing this
+      copy_file "config/fedora.yml", "config/fedora.yml"
+      copy_file "config/solr.yml", "config/solr.yml"
+      copy_file "config/jetty.yml", "config/jetty.yml"
+      # Fedora & Solr Config files
+      directory "fedora_conf"
+      directory "solr_conf"
+    end
   end
   
   # Register mimetypes required by hydra-head
@@ -113,9 +118,9 @@ EOF
         "\n  # These before_filters apply the hydra access controls" +
         "\n  before_filter :enforce_show_permissions, :only=>:show" +
         "\n  # This applies appropriate access controls to all solr queries" +  
-        "\n  CatalogController.solr_search_params_logic << :add_access_controls_to_solr_params" +  
+        "\n  CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]" +  
         "\n  # This filters out objects that you want to exclude from search results, like FileAssets" +  
-        "\n  CatalogController.solr_search_params_logic << :exclude_unwanted_models" 
+        "\n  CatalogController.solr_search_params_logic += [:exclude_unwanted_models]" 
 
       end
     else

data/lib/generators/hydra/templates/config/jetty.yml

@@ -0,0 +1,5 @@
+default:
+  jetty_port: 8983
+  java_opts:
+    - "-XX:MaxPermSize=128m" 
+    - "-Xmx256m"

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "5.0.0.rc1"
+  VERSION = "5.0.0"
 end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
-  prerelease: 6
+  version: 5.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -10,7 +10,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: rails
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +328,7 @@ files:
 - lib/generators/hydra/templates/config/fedora.yml
 - lib/generators/hydra/templates/config/initializers/action_dispatch_http_upload_monkey_patch.rb
 - lib/generators/hydra/templates/config/initializers/hydra_config.rb
+- lib/generators/hydra/templates/config/jetty.yml
 - lib/generators/hydra/templates/config/role_map_cucumber.yml
 - lib/generators/hydra/templates/config/role_map_development.yml
 - lib/generators/hydra/templates/config/role_map_production.yml
@@ -407,9 +408,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