blacklight 6.0.2 → 6.1.0

data/app/models/record_mailer.rb

@@ -3,7 +3,12 @@
 class RecordMailer < ActionMailer::Base
   def email_record(documents, details, url_gen_params)
         
-    subject = I18n.t('blacklight.email.text.subject', :count => documents.length, :title => (documents.first.to_semantic_values[:title] rescue 'N/A') )
+    title = begin
+              documents.first.to_semantic_values[:title]
+            rescue
+              I18n.t('blacklight.email.text.default_title')
+            end
+    subject = I18n.t('blacklight.email.text.subject', :count => documents.length, :title => title )
 
     @documents      = documents
     @message        = details[:message]

data/app/models/search.rb

@@ -18,8 +18,8 @@ class Search < ActiveRecord::Base
   
   # delete old, unsaved searches
   def self.delete_old_searches(days_old)
-    raise ArgumentError.new('days_old is expected to be a number') unless days_old.is_a?(Numeric)
-    raise ArgumentError.new('days_old is expected to be greater than 0') if days_old <= 0
+    raise ArgumentError, 'days_old is expected to be a number' unless days_old.is_a?(Numeric)
+    raise ArgumentError, 'days_old is expected to be greater than 0' if days_old <= 0
     self.destroy_all(['created_at < ? AND user_id IS NULL', Time.zone.today - days_old])
   end
   

data/blacklight.gemspec

@@ -11,7 +11,10 @@ Gem::Specification.new do |s|
   s.email       = ["blacklight-development@googlegroups.com"]
   s.homepage    = "http://projectblacklight.org/"
   s.summary     = "Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr) index."
-  s.description = %{Blacklight is an open source Solr user interface discovery platform. You can use Blacklight to enable searching and browsing of your collections. Blacklight uses the Apache Solr search engine to search full text and/or metadata.}
+  s.description = %(Blacklight is an open source Solr user interface discovery platform.
+    You can use Blacklight to enable searching and browsing of your
+    collections. Blacklight uses the Apache Solr search engine to search
+    full text and/or metadata.)
   s.license     = "Apache 2.0"
 
   s.files         = `git ls-files -z`.split("\x0")
@@ -26,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency "globalid"
   s.add_dependency "nokogiri",  "~>1.6"     # XML Parser
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
-  s.add_dependency "rsolr",     "~> 1.0.11"  # Library for interacting with rSolr.
+  s.add_dependency "rsolr",     "~> 1.0", ">= 1.0.6"  # Library for interacting with rSolr.
   s.add_dependency "bootstrap-sass", "~> 3.2"
   s.add_dependency "deprecation"
   s.add_dependency "twitter-typeahead-rails", '~> 0.11'

data/config/locales/blacklight.de.yml

@@ -100,6 +100,7 @@ de:
         message: 'Meldung:'
         submit: 'Abgeben'
       text:
+        default_title: 'N/A'
         title: 'Titel: %{value}'
         author: 'Autor: %{value}'
         format: 'Format: %{value}'

data/config/locales/blacklight.en.yml

@@ -100,6 +100,7 @@ en:
         message: 'Message:'
         submit: 'Send'
       text:
+        default_title: 'N/A'
         title: 'Title: %{value}'
         author: 'Author: %{value}'
         format: 'Format: %{value}'

data/config/locales/blacklight.es.yml

@@ -100,6 +100,7 @@ es:
         message: 'Mensaje:'
         submit: 'Enviar'
       text:
+        default_title: 'N/A'
         title: 'Titulo: %{value}'
         author: 'Autor: %{value}'
         format: 'Formato: %{value}'

data/config/locales/blacklight.fr.yml

@@ -102,6 +102,7 @@ fr:
         message: 'Message :'
         submit: 'Envoyer'
       text:
+        default_title: 'N/A'
         title: 'Titre : %{value}'
         author: 'Auteur : %{value}'
         format: 'Format : %{value}'

data/config/locales/blacklight.it.yml

@@ -100,6 +100,7 @@ it:
         message: 'Messaggio:'
         submit: 'Invia'
       text:
+        default_title: 'N/A'
         title: 'Titolo: %{value}'
         author: 'Autore: %{value}'
         format: 'Formato: %{value}'

data/config/locales/blacklight.pt-BR.yml

@@ -99,6 +99,7 @@ pt-BR:
         message: 'Mensagem:'
         submit: 'Enviar'
       text:
+        default_title: 'N/A'
         title: 'Título: %{value}'
         author: 'Autor: %{value}'
         format: 'Formato: %{value}'

data/lib/blacklight.rb

@@ -63,7 +63,7 @@ module Blacklight
     require 'yaml'
 
     return @blacklight_yml if @blacklight_yml
-    unless File.exists?(blacklight_config_file)
+    unless File.exist?(blacklight_config_file)
       raise "You are missing a configuration file: #{blacklight_config_file}. Have you run \"rails generate blacklight:install\"?"
     end
 
@@ -74,7 +74,7 @@ module Blacklight
     end
 
     begin
-      @blacklight_yml = YAML::load(blacklight_erb)
+      @blacklight_yml = YAML.load(blacklight_erb)
     rescue => e
       raise("#{blacklight_config_file} was found, but could not be parsed.\n#{e.inspect}")
     end

data/lib/blacklight/abstract_repository.rb

@@ -22,14 +22,14 @@ module Blacklight
     # @param [String] document's unique key value
     # @param [Hash] additional query parameters
     def find(id, params = {})
-      fail NotImplementedError
+      raise NotImplementedError
     end
 
     ##
     # Execute a search query against a search index
     # @param [Hash] query parameters
     def search(params = {})
-      fail NotImplementedError
+      raise NotImplementedError
     end
 
     protected

data/lib/blacklight/configuration/field.rb

@@ -14,7 +14,7 @@ module Blacklight
     end
   
     def validate!
-      raise ArgumentError.new("Must supply a field name") if self.field.nil?
+      raise ArgumentError, "Must supply a field name" if self.field.nil?
     end
 
     def default_label

data/lib/blacklight/configuration/search_field.rb

@@ -11,7 +11,7 @@ module Blacklight
     end
 
     def validate!
-      raise ArgumentError.new("Must supply a search field key") if self.key.nil?
+      raise ArgumentError, "Must supply a search field key" if self.key.nil?
     end
   end
 end

data/lib/blacklight/configuration/sort_field.rb

@@ -12,7 +12,7 @@ module Blacklight
     end
 
     def validate!
-      raise ArgumentError.new("Must supply a sort string") if self.sort.nil?
+      raise ArgumentError.new, "Must supply a sort string" if self.sort.nil?
     end
   end
 end

data/lib/blacklight/search_builder.rb

@@ -210,14 +210,18 @@ module Blacklight
       end
     end
 
-    alias_method :per, :rows
+    alias per rows
 
     def sort
-      field = if blacklight_params[:sort].blank? and sort_field = blacklight_config.default_sort_field
+      sort_field = if blacklight_params[:sort].blank?
         # no sort param provided, use default
-        sort_field.sort
-      elsif sort_field = blacklight_config.sort_fields[blacklight_params[:sort]]
+        blacklight_config.default_sort_field
+      else
         # check for sort field key  
+        blacklight_config.sort_fields[blacklight_params[:sort]]
+      end
+
+      field = if sort_field.present?
         sort_field.sort
       else 
         # just pass the key through

data/lib/blacklight/search_state.rb

@@ -74,7 +74,7 @@ module Blacklight
       # Delete any request params from facet-specific action, needed
       # to redir to index action properly.
       request_keys = blacklight_config.facet_paginator_class.request_keys
-      new_params.extract! *request_keys.values
+      new_params.extract!(*request_keys.values)
 
       new_params
     end
@@ -101,7 +101,7 @@ module Blacklight
       p[:f] = (p[:f] || {}).dup
       p[:f][url_field] = (p[:f][url_field] || []).dup
       p[:f][url_field] = p[:f][url_field] - [value]
-      p[:f].delete(url_field) if p[:f][url_field].size == 0
+      p[:f].delete(url_field) if p[:f][url_field].empty?
       p.delete(:f) if p[:f].empty?
       p
     end
@@ -158,7 +158,7 @@ module Blacklight
       p[:f] = (p[:f] || {}).dup # the command above is not deep in rails3, !@#$!@#$
       p[:f][url_field] = (p[:f][url_field] || []).dup
 
-      if facet_config.single and not p[:f][url_field].empty?
+      if facet_config.single and p[:f][url_field].present?
         p[:f][url_field] = []
       end
 

data/lib/blacklight/solr/repository.rb

@@ -12,7 +12,7 @@ module Blacklight::Solr
                          .merge(blacklight_config.document_unique_id_param => id)
 
       solr_response = send_and_receive blacklight_config.document_solr_path || blacklight_config.solr_path, doc_params
-      raise Blacklight::Exceptions::RecordNotFound.new if solr_response.documents.empty?
+      raise Blacklight::Exceptions::RecordNotFound if solr_response.documents.empty?
       solr_response
     end
 
@@ -45,9 +45,9 @@ module Blacklight::Solr
         solr_response
       end
     rescue Errno::ECONNREFUSED => e
-      raise Blacklight::Exceptions::ECONNREFUSED.new("Unable to connect to Solr instance using #{connection.inspect}: #{e.inspect}")
+      raise Blacklight::Exceptions::ECONNREFUSED, "Unable to connect to Solr instance using #{connection.inspect}: #{e.inspect}"
     rescue RSolr::Error::Http => e
-      raise Blacklight::Exceptions::InvalidRequest.new(e.message)
+      raise Blacklight::Exceptions::InvalidRequest, e.message
     end
 
     protected

data/lib/blacklight/solr/request.rb

@@ -3,8 +3,8 @@ class Blacklight::Solr::InvalidParameter < ArgumentError; end
 
 class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess
 
-  SINGULAR_KEYS = %w{facet fl q qt rows start spellcheck spellcheck.q sort per_page wt hl group defType}
-  ARRAY_KEYS = %w{facet.field facet.query facet.pivot fq hl.fl}
+  SINGULAR_KEYS = %w(facet fl q qt rows start spellcheck spellcheck.q sort per_page wt hl group defType)
+  ARRAY_KEYS = %w(facet.field facet.query facet.pivot fq hl.fl)
 
   def initialize(constructor = {})
     if constructor.is_a?(Hash)

data/lib/blacklight/solr/response.rb

@@ -76,7 +76,7 @@ class Blacklight::Solr::Response < ActiveSupport::HashWithIndifferentAccess
   end
 
   def grouped?
-    self.has_key? "grouped"
+    self.key? "grouped"
   end
 
   def export_formats

data/lib/blacklight/solr/response/spelling.rb

@@ -11,7 +11,7 @@ module Blacklight::Solr::Response::Spelling
 
   class Base
 
-    attr :response
+    attr_reader :response
 
     def initialize(response)
       @response = response

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -52,8 +52,8 @@ module Blacklight::Solr
       # solr LocalParams in config, using solr LocalParams syntax.
       # http://wiki.apache.org/solr/LocalParams
       ##
-      if (search_field && hash = search_field.solr_local_parameters)
-        local_params = hash.collect do |key, val|
+      if search_field && search_field.solr_local_parameters.present?
+        local_params = search_field.solr_local_parameters.map do |key, val|
           key.to_s + "=" + solr_param_quote(val, :quote => "'")
         end.join(" ")
         solr_parameters[:q] = "{!#{local_params}}#{blacklight_params[:q]}"
@@ -91,7 +91,7 @@ module Blacklight::Solr
       end
 
       # :fq, map from :f.
-      if ( blacklight_params[:f])
+      if blacklight_params[:f]
         f_request_params = blacklight_params[:f]
 
         f_request_params.each_pair do |facet_field, value_list|
@@ -202,7 +202,7 @@ module Blacklight::Solr
               end
 
       page = blacklight_params.fetch(request_keys[:page], 1).to_i
-      offset = (page - 1) * (limit)
+      offset = (page - 1) * limit
 
       sort = blacklight_params[request_keys[:sort]]
       prefix = blacklight_params[request_keys[:prefix]]
@@ -281,7 +281,7 @@ module Blacklight::Solr
     def facet_value_to_fq_string(facet_field, value)
       facet_config = blacklight_config.facet_fields[facet_field]
 
-      solr_field = facet_config.field if facet_config and not facet_config.query
+      solr_field = facet_config.field if facet_config and !facet_config.query
       solr_field ||= facet_field
 
       local_params = []
@@ -307,9 +307,9 @@ module Blacklight::Solr
     def convert_to_term_value(value)
       case
       when (value.is_a?(DateTime) or value.is_a?(Time))
-        "#{value.utc.strftime("%Y-%m-%dT%H:%M:%SZ")}"
+        value.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
       when value.is_a?(Date)
-        "#{value.to_time(:local).strftime("%Y-%m-%dT%H:%M:%SZ")}"
+        value.to_time(:local).strftime("%Y-%m-%dT%H:%M:%SZ")
       else
         value.to_s
       end

data/lib/blacklight/utils.rb

@@ -85,11 +85,11 @@ module Blacklight
       end
 
       lazy_configs.each do |k,v|
-        if v.is_a? nested_class
-          hash[k] = v
-        else
-          hash[k] = nested_class.new v
-        end
+        hash[k] = if v.is_a? nested_class
+                    v
+                  else
+                    nested_class.new v
+                  end
       end
 
       super hash

data/lib/generators/blacklight/assets_generator.rb

@@ -4,7 +4,7 @@ module Blacklight
     source_root File.expand_path('../templates', __FILE__)
   
     def assets
-      copy_file "blacklight.css.scss", "app/assets/stylesheets/blacklight.css.scss"
+      copy_file "blacklight.scss", "app/assets/stylesheets/blacklight.scss"
 
       return if has_blacklight_assets?
 

data/lib/generators/blacklight/controller_generator.rb

@@ -6,20 +6,18 @@ module Blacklight
     
     argument     :controller_name  , type: :string , default: "catalog"
 
-    desc """
-  This generator makes the following changes to your application:
-   1. Injects behavior into your user application_controller.rb
-   2. Creates a Blacklight::Catalog-based controller
-   3. Adds routes for your controller
-
-  Thank you for Installing Blacklight.
-         """
+    desc <<-EOS
+      This generator makes the following changes to your application:
+       1. Injects behavior into your user application_controller.rb
+       2. Creates a Blacklight::Catalog-based controller
+       3. Adds routes for your controller
+    EOS
 
     # Add Blacklight to the application controller
     def inject_blacklight_controller_behavior
       inject_into_class "app/controllers/application_controller.rb", "ApplicationController" do
-        "  # Adds a few additional behaviors into the application controller \n" +
-        "  include Blacklight::Controller\n" +
+        "  # Adds a few additional behaviors into the application controller\n" \
+        "  include Blacklight::Controller\n" \
         "  layout 'blacklight'\n\n"
       end
     end
@@ -30,12 +28,12 @@ module Blacklight
     end
 
     def inject_blacklight_routes
-      route <<-EOF.strip_heredoc
-        concern :searchable, Blacklight::Routes::Searchable.new
+      route <<-EOF
+  concern :searchable, Blacklight::Routes::Searchable.new
 
-        resource :catalog, only: [:index], as: 'catalog', path: '/catalog', controller: 'catalog' do
-          concerns :searchable
-        end
+  resource :catalog, only: [:index], as: 'catalog', path: '/catalog', controller: 'catalog' do
+    concerns :searchable
+  end
       EOF
     end
   end

data/lib/generators/blacklight/document_generator.rb

@@ -9,10 +9,11 @@ module Blacklight
 
     argument     :model_name, :type => :string , :default => "solr_document"
 
-    desc """
-This generator makes the following changes to your application:
- 1. Creates a blacklight document in your /app/models directory
-"""
+    desc <<-EOS
+      This generator makes the following changes to your application:
+       1. Creates a blacklight document in your /app/models directory
+    EOS
+
     def create_solr_document
       template "solr_document.rb", "app/models/#{model_name}.rb"
     end

data/lib/generators/blacklight/install_generator.rb

@@ -13,32 +13,31 @@ module Blacklight
     class_option :devise      , type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
     class_option :jettywrapper, type: :boolean, default: false, desc: "Use jettywrapper to download and control Jetty"
     class_option :marc        , type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo ."
+    class_option :'skip-assets', type: :boolean, default: false, desc: "Skip generating javascript and css assets into the application"
 
-    desc """
-  This generator makes the following changes to your application:
-   1. Generates blacklight:models
-   2. Generates utilities for working with solr 
-   3. Adds globalid to the Gemfile
-   4. Creates a number of public assets, including images, stylesheets, and javascript
-   5. Injects behavior into your user application_controller.rb
-   6. Adds example configurations for dealing with MARC-like data
-   7. Adds Blacklight routes to your ./config/routes.rb
+    desc <<-EOS
+      This generator makes the following changes to your application:
+       1. Generates blacklight:models
+       2. Generates utilities for working with solr 
+       3. Creates a number of public assets, including images, stylesheets, and javascript
+       4. Injects behavior into your user application_controller.rb
+       5. Adds example configurations for dealing with MARC-like data
+       6. Adds Blacklight routes to your ./config/routes.rb
 
-  Thank you for Installing Blacklight.
-         """
+      Thank you for Installing Blacklight.
+    EOS
 
     def add_solr_wrapper
-      if options[:jettywrapper]
-        generate 'blacklight:solr4'
-      elsif solr_version == 'latest'
-        generate 'blacklight:solr5'
-      else
-        generate "blacklight:solr#{solr_version}"
-      end
-    end
-
-    def add_globalid_gem
-      gem "globalid"
+      generator_options = '--jettywrapper' if options[:jettywrapper]
+      solr_generator = case
+                       when options[:jettywrapper]
+                         'blacklight:solr4'
+                       when solr_version == 'latest'
+                         'blacklight:solr5'
+                       else
+                         "blacklight:solr#{solr_version}"
+                       end
+      generate solr_generator, generator_options
     end
 
     def bundle_install
@@ -51,7 +50,7 @@ module Blacklight
     # Call external generator in AssetsGenerator, so we can
     # leave that callable seperately too. 
     def copy_public_assets 
-      generate "blacklight:assets"
+      generate "blacklight:assets" unless options[:'skip-assets']
     end
     
     def generate_blacklight_document
@@ -87,7 +86,7 @@ module Blacklight
     def add_sass_configuration
 
       insert_into_file "config/application.rb", :after => "config.assets.enabled = true" do <<EOF
-      
+
       # Default SASS Configuration, check out https://github.com/rails/sass-rails for details
       config.assets.compress = !Rails.env.development?
 EOF
@@ -112,9 +111,7 @@ EOF
     end
 
     def add_routes
-      route <<-EOF
-        mount Blacklight::Engine => '/'
-      EOF
+      route "mount Blacklight::Engine => '/'"
     end
   end
 end