hydra-core 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6823b327eeb35861172d4fe2f92b00519d103d0b
-  data.tar.gz: 32142650a0e2b2117501ddaa661c365af11c76b8
+  metadata.gz: ba071d2871ac8165ecd78b2e5341dd61a8733487
+  data.tar.gz: a394ec1a0f3b5dfb34fdc1c42285b342186dd407
 SHA512:
-  metadata.gz: 4badc4b07b639c500d8176c2c0e79bf2dbd840330c3122767636d8290c7d5c29a322cc2332d1c9e5f53f46b87ac4996405e9cdc689d5e19f4d1924f84cd92fd8
-  data.tar.gz: 20ec96f1b7fc208e67cb5dfafd793b2faca66f383fcf1854f15594855ad9e0a5f587111598d8b78e4fd8ddb36196b17ad82c4d374fc404f464bb9237809f5397
+  metadata.gz: d1ba398230df3af4aa86b67e43dc957d48061c005e810fd180e4f67b94455b3a589cd817424f9250602a3e33ac99885870cfa5be797ca35e16b2d448815a191c
+  data.tar.gz: 1c99ce599d1ec788b87b028e5955270cf55d3eedd54dd4de2ab9afa4913840cb153ad3e9a10347cb390d6ac514009c885e7bd876e79c70d89c28a319cb5aa56a

data/lib/generators/hydra/cucumber_support_generator.rb

@@ -1,29 +1,29 @@
 # -*- encoding : utf-8 -*-
 require 'rails/generators'
-require 'rails/generators/migration'     
+require 'rails/generators/migration'
 
 module Hydra
 class CucumberSupportGenerator < Rails::Generators::Base
-  
+
   source_root File.expand_path('../../../../test_support/features', __FILE__)
-  
+
   argument :features_dir, :type => :string , :default => "features"
-        
+
   desc """
   This Generator copies Hydra's cucumber step definitions and paths into your application's features directory.
   We have plans to provide the step definitions directly through the hydra-head gem without requiring this step of copying the files.
-  In the meantime, you need to copy the files in order to use them. 
-  
+  In the meantime, you need to copy the files in order to use them.
+
   Defaults to assuming that your cucumber features live in a directory called \"features\".  To pass in an alternative path to your features directory,
-  
+
   rails generate hydra:cucumber_support test_support/features
-  
+
   """
-  
+
   def copy_cucumber_support
     directory("step_definitions", "#{features_dir}/step_definitions")
     copy_file("support/paths.rb", "#{features_dir}/support/paths.rb")
   end
-  
+
 end
 end

data/lib/generators/hydra/head_generator.rb

@@ -1,29 +1,43 @@
 # -*- encoding : utf-8 -*-
 require 'rails/generators'
-require 'rails/generators/migration'     
+require 'rails/generators/migration'
 
 module Hydra
 class HeadGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
-  
+
   source_root File.expand_path('../templates', __FILE__)
-  
+
   argument     :model_name, :type => :string , :default => "user"
-  
+
     desc """
   This generator makes the following changes to your application:
     1. Creates a database migration for superusers if they do not exist in /db/migrate
-    2. Adds additional mime types to you application in the file '/config/initializers/mime_types.rb'   
-    3. Creates config/initializers/hydra_config.rb 
+    2. Adds additional mime types to you application in the file '/config/initializers/mime_types.rb'
+    3. Creates config/initializers/hydra_config.rb
     4. Creates config/fedora.yml and config/solr.yml which you may need to modify to tell the hydra head where to find fedora & solr
-    5. Creates a number of role_map config files that are used in the placeholder user roles implementation 
+    5. Creates a number of role_map config files that are used in the placeholder user roles implementation
   Enjoy building your Hydra Head!
          """
-  
+
   #
   # Config Files & Initializers
   #
-         
+
+  def inject_test_framework
+    application("\n" <<
+      "    config.generators do |g|\n" <<
+      "      g.test_framework :rspec, :spec => true\n" <<
+      "    end\n\n"
+    )
+
+    gem_group :development, :test do
+      gem "rspec-rails"
+      gem 'jettywrapper'
+    end
+
+  end
+
   # Copy all files in templates/config directory to host config
   def create_configuration_files
     copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
@@ -31,10 +45,10 @@ class HeadGenerator < Rails::Generators::Base
     # Initializers
     file_path = "config/initializers/hydra_config.rb"
     copy_file "config/initializers/hydra_config.rb", file_path
-    insert_into_file file_path, :after => '# specify the user model' do      
-        "\n    config[:user_model] = '#{model_name.classify}'" 
+    insert_into_file file_path, :after => '# specify the user model' do
+        "\n    config[:user_model] = '#{model_name.classify}'"
     end
-    
+
     copy_file "config/initializers/action_dispatch_http_upload_monkey_patch.rb", "config/initializers/action_dispatch_http_upload_monkey_patch.rb"
 
     # Role Mappings
@@ -42,24 +56,24 @@ class HeadGenerator < Rails::Generators::Base
     copy_file "config/role_map_development.yml", "config/role_map_development.yml"
     copy_file "config/role_map_production.yml", "config/role_map_production.yml"
     copy_file "config/role_map_test.yml", "config/role_map_test.yml"
-   
+
     # Fedora & Solr YAML files
     invoke('active_fedora:config')
   end
-  
+
   # Add Hydra behaviors to the user model
   def inject_hydra_user_behavior
     file_path = "app/models/#{model_name.underscore}.rb"
-    if File.exists?(file_path) 
-      inject_into_class file_path, model_name.classify do 
+    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"        
+        "\n include Hydra::User\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" 
-    end    
+      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"
+    end
   end
-  
+
   # Inject call to HydraHead.add_routes in config/routes.rb
   def inject_hydra_routes
     insert_into_file "config/routes.rb", :after => 'Blacklight.add_routes(self)' do
@@ -67,6 +81,6 @@ class HeadGenerator < Rails::Generators::Base
       "\n  HydraHead.add_routes(self)"
     end
   end
-  
+
 end # HeadGenerator
 end # Hydra

data/lib/generators/hydra/jetty_generator.rb

@@ -3,19 +3,19 @@ require 'jettywrapper'
 
 module Hydra
   class Jetty < Rails::Generators::Base
-    
-    desc """ 
-Installs a jetty container with a solr and fedora installed in it. 
+
+    desc """
+Installs a jetty container with a solr and fedora installed in it.
 
 Requires system('unzip... ') to work, probably won't work on Windows.
 
 """
-    
-    def download_jetty         
+
+    def download_jetty
       Jettywrapper.unzip
     end
-   
-    
+
+
   end
 end
 

data/lib/generators/hydra/templates/catalog_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'blacklight/catalog'
 
-class CatalogController < ApplicationController  
+class CatalogController < ApplicationController
 
   include Blacklight::Catalog
   include Hydra::Controller::ControllerBehavior
@@ -14,9 +14,9 @@ class CatalogController < ApplicationController
 
 
   configure_blacklight do |config|
-    config.default_solr_params = { 
+    config.default_solr_params = {
       :qt => 'search',
-      :rows => 10 
+      :rows => 10
     }
 
     # solr field configuration for search results/index views
@@ -35,25 +35,25 @@ class CatalogController < ApplicationController
     # * If left unset, then all facet values returned by solr will be displayed.
     # * If set to an integer, then "f.somefield.facet.limit" will be added to
     # solr request, with actual solr request being +1 your configured limit --
-    # you configure the number of items you actually want _tsimed_ in a page.    
+    # you configure the number of items you actually want _tsimed_ in a page.
     # * If set to 'true', then no additional parameters will be sent to solr,
     # but any 'sniffed' request limit parameters will be used for paging, with
-    # paging at requested limit -1. Can sniff from facet.limit or 
+    # paging at requested limit -1. Can sniff from facet.limit or
     # f.specific_field.facet.limit solr request params. This 'true' config
     # can be used if you set limits in :default_solr_params, or as defaults
     # on the solr side in the request handler itself. Request handler defaults
     # sniffing requires solr requests to be made with "echoParams=all", for
-    # app code to actually have it echo'd back to see it.  
+    # app code to actually have it echo'd back to see it.
     #
-    # :show may be set to false if you don't want the facet to be drawn in the 
+    # :show may be set to false if you don't want the facet to be drawn in the
     # facet bar
-    config.add_facet_field solr_name('object_type', :facetable), :label => 'Format' 
-    config.add_facet_field solr_name('pub_date', :facetable), :label => 'Publication Year' 
-    config.add_facet_field solr_name('subject_topic', :facetable), :label => 'Topic', :limit => 20 
-    config.add_facet_field solr_name('language', :facetable), :label => 'Language', :limit => true 
-    config.add_facet_field solr_name('lc1_letter', :facetable), :label => 'Call Number' 
-    config.add_facet_field solr_name('subject_geo', :facetable), :label => 'Region' 
-    config.add_facet_field solr_name('subject_era', :facetable), :label => 'Era'  
+    config.add_facet_field solr_name('object_type', :facetable), :label => 'Format'
+    config.add_facet_field solr_name('pub_date', :facetable), :label => 'Publication Year'
+    config.add_facet_field solr_name('subject_topic', :facetable), :label => 'Topic', :limit => 20
+    config.add_facet_field solr_name('language', :facetable), :label => 'Language', :limit => true
+    config.add_facet_field solr_name('lc1_letter', :facetable), :label => 'Call Number'
+    config.add_facet_field solr_name('subject_geo', :facetable), :label => 'Region'
+    config.add_facet_field solr_name('subject_era', :facetable), :label => 'Era'
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
@@ -64,26 +64,26 @@ class CatalogController < ApplicationController
 
 
     # solr fields to be displayed in the index (search results) view
-    #   The ordering of the field names is the order of the display 
-    config.add_index_field solr_name('title', :stored_searchable, type: :string), :label => 'Title:' 
-    config.add_index_field solr_name('title_vern', :stored_searchable, type: :string), :label => 'Title:' 
-    config.add_index_field solr_name('author', :stored_searchable, type: :string), :label => 'Author:' 
-    config.add_index_field solr_name('author_vern', :stored_searchable, type: :string), :label => 'Author:' 
-    config.add_index_field solr_name('format', :symbol), :label => 'Format:' 
+    #   The ordering of the field names is the order of the display
+    config.add_index_field solr_name('title', :stored_searchable, type: :string), :label => 'Title:'
+    config.add_index_field solr_name('title_vern', :stored_searchable, type: :string), :label => 'Title:'
+    config.add_index_field solr_name('author', :stored_searchable, type: :string), :label => 'Author:'
+    config.add_index_field solr_name('author_vern', :stored_searchable, type: :string), :label => 'Author:'
+    config.add_index_field solr_name('format', :symbol), :label => 'Format:'
     config.add_index_field solr_name('language', :stored_searchable, type: :string), :label => 'Language:'
     config.add_index_field solr_name('published', :stored_searchable, type: :string), :label => 'Published:'
     config.add_index_field solr_name('published_vern', :stored_searchable, type: :string), :label => 'Published:'
     config.add_index_field solr_name('lc_callnum', :stored_searchable, type: :string), :label => 'Call number:'
 
     # solr fields to be displayed in the show (single result) view
-    #   The ordering of the field names is the order of the display 
-    config.add_show_field solr_name('title', :stored_searchable, type: :string), :label => 'Title:' 
-    config.add_show_field solr_name('title_vern', :stored_searchable, type: :string), :label => 'Title:' 
-    config.add_show_field solr_name('subtitle', :stored_searchable, type: :string), :label => 'Subtitle:' 
-    config.add_show_field solr_name('subtitle_vern', :stored_searchable, type: :string), :label => 'Subtitle:' 
-    config.add_show_field solr_name('author', :stored_searchable, type: :string), :label => 'Author:' 
-    config.add_show_field solr_name('author_vern', :stored_searchable, type: :string), :label => 'Author:' 
-    config.add_show_field solr_name('format', :symbol), :label => 'Format:' 
+    #   The ordering of the field names is the order of the display
+    config.add_show_field solr_name('title', :stored_searchable, type: :string), :label => 'Title:'
+    config.add_show_field solr_name('title_vern', :stored_searchable, type: :string), :label => 'Title:'
+    config.add_show_field solr_name('subtitle', :stored_searchable, type: :string), :label => 'Subtitle:'
+    config.add_show_field solr_name('subtitle_vern', :stored_searchable, type: :string), :label => 'Subtitle:'
+    config.add_show_field solr_name('author', :stored_searchable, type: :string), :label => 'Author:'
+    config.add_show_field solr_name('author_vern', :stored_searchable, type: :string), :label => 'Author:'
+    config.add_show_field solr_name('format', :symbol), :label => 'Format:'
     config.add_show_field solr_name('url_fulltext_tsim', :stored_searchable, type: :string), :label => 'URL:'
     config.add_show_field solr_name('url_suppl_tsim', :stored_searchable, type: :string), :label => 'More Information:'
     config.add_show_field solr_name('language', :stored_searchable, type: :string), :label => 'Language:'
@@ -104,43 +104,43 @@ class CatalogController < ApplicationController
     # The :key is what will be used to identify this BL search field internally,
     # as well as in URLs -- so changing it after deployment may break bookmarked
     # urls.  A display label will be automatically calculated from the :key,
-    # or can be specified manually to be different. 
+    # or can be specified manually to be different.
 
     # This one uses all the defaults set by the solr request handler. Which
     # solr request handler? The one set in config[:default_solr_parameters][:qt],
-    # since we aren't specifying it otherwise. 
-    
+    # since we aren't specifying it otherwise.
+
     config.add_search_field 'all_fields', :label => 'All Fields'
-    
+
 
     # Now we see how to over-ride Solr request handler defaults, in this
     # case for a BL "search field", which is really a dismax aggregate
-    # of Solr search fields. 
-    
+    # of Solr search fields.
+
     config.add_search_field('title') do |field|
       # :solr_local_parameters will be sent using Solr LocalParams
       # syntax, as eg {! qf=$title_qf }. This is neccesary to use
       # Solr parameter de-referencing like $title_qf.
       # See: http://wiki.apache.org/solr/LocalParams
-      field.solr_local_parameters = { 
+      field.solr_local_parameters = {
         :qf => '$title_qf',
         :pf => '$title_pf'
       }
     end
-    
+
     config.add_search_field('author') do |field|
-      field.solr_local_parameters = { 
+      field.solr_local_parameters = {
         :qf => '$author_qf',
         :pf => '$author_pf'
       }
     end
-    
+
     # Specifying a :qt only to show it's possible, and so our internal automated
-    # tests can test it. In this case it's the same as 
-    # config[:default_solr_parameters][:qt], so isn't actually neccesary. 
+    # tests can test it. In this case it's the same as
+    # config[:default_solr_parameters][:qt], so isn't actually neccesary.
     config.add_search_field('subject') do |field|
       field.qt = 'search'
-      field.solr_local_parameters = { 
+      field.solr_local_parameters = {
         :qf => '$subject_qf',
         :pf => '$subject_pf'
       }
@@ -155,11 +155,11 @@ class CatalogController < ApplicationController
     config.add_sort_field 'author_tesi asc, title_tesi asc', :label => 'author'
     config.add_sort_field 'title_tesi asc, pub_date_dtsi desc', :label => 'title'
 
-    # If there are more than this many search results, no spelling ("did you 
+    # If there are more than this many search results, no spelling ("did you
     # mean") suggestion is offered.
     config.spell_max = 5
   end
 
 
 
-end 
+end

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

@@ -2,7 +2,7 @@ development:
   user: fedoraAdmin
   password: fedoraAdmin
   url: http://127.0.0.1:8983/fedora
-test: &TEST  
+test: &TEST
   user: fedoraAdmin
   password: fedoraAdmin
   url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/fedora-test" %>

data/lib/generators/hydra/templates/config/initializers/hydra_config.rb

@@ -23,6 +23,6 @@ if Hydra.respond_to?(:configure)
       :owner => ActiveFedora::SolrService.solr_name("depositor", indexer),
       :embargo_release_date => ActiveFedora::SolrService.solr_name("embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
     }
-    
+
   end
 end

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

@@ -1,5 +1,5 @@
 # This is a sample config file that does not have multiple solr instances. You will also need to be sure to
-# edit the fedora.yml file to match the solr URL for active-fedora. 
+# edit the fedora.yml file to match the solr URL for active-fedora.
 development:
   url: http://localhost:8983/solr/development
 test: &TEST
@@ -7,4 +7,4 @@ test: &TEST
 cucumber:
   <<: *TEST
 production:
-  url: http://your.production.server:8080/bl_solr/core0 
+  url: http://your.production.server:8080/bl_solr/core0

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.2.0"
+  VERSION = "6.2.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 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: 2013-05-23 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.2.1
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement