hydra-core 6.0.0.pre7 → 6.0.0.pre8

data/lib/generators/hydra/head_generator.rb

@@ -26,7 +26,6 @@ class HeadGenerator < Rails::Generators::Base
          
   # Copy all files in templates/config directory to host config
   def create_configuration_files
-    #CatalogController
     copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
 
     # Initializers
@@ -36,7 +35,6 @@ class HeadGenerator < Rails::Generators::Base
         "\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
@@ -46,50 +44,10 @@ class HeadGenerator < Rails::Generators::Base
     copy_file "config/role_map_test.yml", "config/role_map_test.yml"
    
     # Fedora & Solr YAML files
-    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
-  def add_mime_types
-    puts "Updating Mime Types"
-    insert_into_file "config/initializers/mime_types.rb", :before => 'Mime::Type.register_alias "text/plain", :refworks_marc_txt' do <<EOF
-# Mime Types Added By Hydra Head:
-
-# Mime::Type.register "text/html", :html
-# Mime::Type.register "application/pdf", :pdf
-# Mime::Type.register "image/jpeg2000", :jp2
-Mime::Type.register_alias "text/html", :textile
-Mime::Type.register_alias "text/html", :inline
-
-EOF
-    end
+    invoke('active_fedora:config')
+    copy_file "config/jetty.yml", "config/jetty.yml"
   end
   
-  #
-  # Migrations
-  #
-  
-  # Implement the required interface for Rails::Generators::Migration.
-  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-  def self.next_migration_number(dirname)
-    unless @prev_migration_nr
-      @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-    else
-      @prev_migration_nr += 1
-    end
-    @prev_migration_nr.to_s
-  end
-
   # Add Hydra behaviors to the user model
   def inject_hydra_user_behavior
     file_path = "app/models/#{model_name.underscore}.rb"
@@ -103,28 +61,6 @@ EOF
     end    
   end
   
-  # Add Hydra behaviors and Filters to CatalogController
-  def inject_hydra_catalog_behavior
-    puts "Adding Hydra behaviors to CatalogController"
-    controller_name = "catalog_controller"
-    file_path = "app/controllers/#{controller_name.underscore}.rb"
-    if File.exists?(file_path) 
-      insert_into_file file_path, :after => 'include Blacklight::Catalog' do      
-        "\n  # Extend Blacklight::Catalog with Hydra behaviors (primarily editing)." +
-        "\n  include Hydra::Controller::ControllerBehavior\n"  +
-        "\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  # This filters out objects that you want to exclude from search results, like FileAssets" +  
-        "\n  CatalogController.solr_search_params_logic += [:exclude_unwanted_models]" 
-
-      end
-    else
-      puts "     \e[31mFailure\e[0m  Could not find #{model_name.underscore}.rb.  To add Hydra behaviors to your Blacklight::Catalog Controllers, you must include the Hydra::Controller::ControllerBehavior module in the Controller class definition.  See the Hydra::Controller::ControllerBehavior section in the Hydra API Docs for more info." 
-    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
@@ -133,23 +69,5 @@ EOF
     end
   end
   
-  # Add Hydra to the application controller
-  def inject_hydra_controller_behavior    
-    puts "Adding Hydra behaviors to ApplicationController"
-    controller_name = "ApplicationController"
-    file_path = "app/controllers/#{controller_name.underscore}.rb"
-    if File.exists?(file_path) 
-      insert_into_file file_path, :after => 'include Blacklight::Controller' do 
-        "  \n# Adds Hydra behaviors into the application controller \n" +        
-        "  include Hydra::Controller::ControllerBehavior\n"
-      end
-    else
-      puts "     \e[31mFailure\e[0m  Could not find #{model_name.underscore}.rb.  To add Hydra behaviors to your Blacklight::Catalog Controllers, you must include the Hydra::Controller::ControllerBehavior module in the Controller class definition.  See the Hydra::Controller::ControllerBehavior section in the Hydra API Docs for more info." 
-    end
-  end
-  
-  
-
-  
 end # HeadGenerator
 end # Hydra

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

@@ -4,6 +4,14 @@ require 'blacklight/catalog'
 class CatalogController < ApplicationController  
 
   include Blacklight::Catalog
+  include Hydra::Controller::ControllerBehavior
+  # These before_filters apply the hydra access controls
+  before_filter :enforce_show_permissions, :only=>:show
+  # This applies appropriate access controls to all solr queries
+  CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]
+  # This filters out objects that you want to exclude from search results, like FileAssets
+  CatalogController.solr_search_params_logic += [:exclude_unwanted_models]
+
 
   configure_blacklight do |config|
     config.default_solr_params = { 
@@ -39,13 +47,13 @@ class CatalogController < ApplicationController
     #
     # :show may be set to false if you don't want the facet to be drawn in the 
     # facet bar
-    config.add_facet_field 'object_type_tsim', :label => 'Format' 
-    config.add_facet_field 'pub_tsim', :label => 'Publication Year' 
-    config.add_facet_field 'subject_topic_tsim', :label => 'Topic', :limit => 20 
-    config.add_facet_field 'language_tsim', :label => 'Language', :limit => true 
-    config.add_facet_field 'lc_1letter_tsim', :label => 'Call Number' 
-    config.add_facet_field 'subject_geo_tsim', :label => 'Region' 
-    config.add_facet_field 'subject_era_tsim', :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
@@ -57,32 +65,32 @@ 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 'title_tsim', :label => 'Title:' 
-    config.add_index_field 'title_vern_tsim', :label => 'Title:' 
-    config.add_index_field 'author_tsim', :label => 'Author:' 
-    config.add_index_field 'author_vern_tsim', :label => 'Author:' 
-    config.add_index_field 'format', :label => 'Format:' 
-    config.add_index_field 'language_facet', :label => 'Language:'
-    config.add_index_field 'published_tsim', :label => 'Published:'
-    config.add_index_field 'published_vern_tsim', :label => 'Published:'
-    config.add_index_field 'lc_callnum_tsim', :label => 'Call number:'
+    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 'title_tsim', :label => 'Title:' 
-    config.add_show_field 'title_vern_tsim', :label => 'Title:' 
-    config.add_show_field 'subtitle_tsim', :label => 'Subtitle:' 
-    config.add_show_field 'subtitle_vern_tsim', :label => 'Subtitle:' 
-    config.add_show_field 'author_tsim', :label => 'Author:' 
-    config.add_show_field 'author_vern_tsim', :label => 'Author:' 
-    config.add_show_field 'format', :label => 'Format:' 
-    config.add_show_field 'url_fulltext_tsim', :label => 'URL:'
-    config.add_show_field 'url_suppl_tsim', :label => 'More Information:'
-    config.add_show_field 'language_facet', :label => 'Language:'
-    config.add_show_field 'published_tsim', :label => 'Published:'
-    config.add_show_field 'published_vern_tsim', :label => 'Published:'
-    config.add_show_field 'lc_callnum_tsim', :label => 'Call number:'
-    config.add_show_field 'isbn_tsim', :label => 'ISBN:'
+    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:'
+    config.add_show_field solr_name('published', :stored_searchable, type: :string), :label => 'Published:'
+    config.add_show_field solr_name('published_vern', :stored_searchable, type: :string), :label => 'Published:'
+    config.add_show_field solr_name('lc_callnum', :stored_searchable, type: :string), :label => 'Call number:'
+    config.add_show_field solr_name('isbn', :stored_searchable, type: :string), :label => 'ISBN:'
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields

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

@@ -20,7 +20,5 @@ if Hydra.respond_to?(:configure)
       :embargo_release_date => ActiveFedora::SolrService.solr_name("embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
     }
     
-    # specify the user model
-    config[:user_model] = 'User'
   end
 end

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.0.0.pre7"
+  VERSION = "6.0.0.pre8"
 end
 

data/lib/hydra/controller/controller_behavior.rb

@@ -34,5 +34,11 @@ module Hydra::Controller::ControllerBehavior
   def user_key
     current_user.user_key if current_user
   end
-  
+
+  module ClassMethods
+    # get the solr name for a field with this name and using the given solrizer descriptor
+    def solr_name(name, *opts)
+      ActiveFedora::SolrService.solr_name(name, *opts)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre7
+  version: 6.0.0.pre8
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.pre7
+        version: 6.0.0.pre8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.pre7
+        version: 6.0.0.pre8
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement