blacklight 5.13.0 → 5.13.1

data/lib/blacklight/exceptions.rb

@@ -2,7 +2,7 @@
 module Blacklight
   module Exceptions
 
-    class AccessDenied < Exception
+    class AccessDenied < StandardError
     end
 
     # When a request for a single solr document by id
@@ -17,7 +17,7 @@ module Blacklight
     class InvalidRequest < StandardError
     end
 
-    class ExpiredSessionToken < Exception
+    class ExpiredSessionToken < StandardError
     end
 
     class ECONNREFUSED < ::Errno::ECONNREFUSED; end

data/lib/blacklight/solr/document.rb

@@ -36,8 +36,7 @@ module Blacklight::Solr::Document
   end
 
   def highlight_field k
-    return nil unless has_highlight_field? k
-    response['highlighting'][self.id][k.to_s].map { |x| x.html_safe }
+    response['highlighting'][self.id][k.to_s].map(&:html_safe) if has_highlight_field? k
   end
 
 end

data/lib/blacklight/solr/document/more_like_this.rb

@@ -2,4 +2,4 @@ module Blacklight::Solr::Document::MoreLikeThis
   def more_like_this
     response.more_like(self).map { |doc| self.class.new(doc, response) }
   end
-end
+end

data/lib/blacklight/solr/document/schema_org.rb

@@ -4,4 +4,4 @@ module Blacklight::Solr::Document::SchemaOrg
   def self.extended(document)
     Deprecation.warn Blacklight::Solr::Document::SchemaOrg, "Blacklight::Solr::Document::SchemaOrg is deprecated; use Blacklight::Document::SchemaOrg instead."
   end
-end
+end

data/lib/blacklight/solr/facet_paginator.rb

@@ -20,11 +20,14 @@ module Blacklight::Solr
     # make sure they do NOT conflict with catalog/index request params,
     # and need to make them accessible in a list so we can easily
     # strip em out before redirecting to catalog/index.
-    # class variable (via class-level ivar)
-    @request_keys = {:sort => :'facet.sort', :page => :'facet.page'}
-    class << self; attr_accessor :request_keys end # create a class method
-    def request_keys ; self.class.request_keys ; end # shortcut
-    
+    mattr_accessor :request_keys do
+      { sort: :'facet.sort', page: :'facet.page' }
+    end
+
+    if Rails.version < "4.1"
+      self.request_keys = { sort: :'facet.sort', page: :'facet.page' }
+    end
+
     attr_reader :offset, :limit, :sort
     
     # all_facet_values is a list of facet value objects returned by solr,

data/lib/blacklight/solr/request.rb

@@ -2,9 +2,8 @@ class Blacklight::Solr::InvalidParameter < ArgumentError; end
 
 class Blacklight::Solr::Request < 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/search_builder_behavior.rb

@@ -112,9 +112,7 @@ module Blacklight::Solr
         solr_parameters[:"facet.field"].concat( [blacklight_params["facet.field"], blacklight_params["facets"]].flatten.compact ).uniq!
       end
 
-      blacklight_config.facet_fields.select { |field_name,facet|
-        facet.include_in_request || (facet.include_in_request.nil? && blacklight_config.add_facet_fields_to_solr_request)
-      }.each do |field_name, facet|
+      facet_fields_to_include_in_request.each do |field_name, facet|
         solr_parameters[:facet] ||= true
 
         case
@@ -243,17 +241,20 @@ module Blacklight::Solr
       local_params = []
       local_params << "tag=#{facet_config.tag}" if facet_config and facet_config.tag
 
-      prefix = ""
       prefix = "{!#{local_params.join(" ")}}" unless local_params.empty?
 
-      fq = case
+      case
         when (facet_config and facet_config.query)
           facet_config.query[value][:fq]
         when (facet_config and facet_config.date)
           # in solr 3.2+, this could be replaced by a !term query
           "#{prefix}#{solr_field}:#{RSolr.solr_escape(value)}"
-        when (value.is_a?(DateTime) or value.is_a?(Date) or value.is_a?(Time))
-          "#{prefix}#{solr_field}:#{RSolr.solr_escape(value.to_time.utc.strftime("%Y-%m-%dT%H:%M:%SZ"))}"
+        when (value.is_a?(DateTime) or value.is_a?(Time))
+          "#{prefix}#{solr_field}:#{RSolr.solr_escape(value.utc.strftime("%Y-%m-%dT%H:%M:%SZ"))}"
+        when value.is_a?(Date)
+          # rubocop:disable Rails/Date
+          "#{prefix}#{solr_field}:#{RSolr.solr_escape(value.to_time(:local).strftime("%Y-%m-%dT%H:%M:%SZ"))}"
+          # rubocop:enable Rails/Date
         when (value.is_a?(TrueClass) or value.is_a?(FalseClass) or value == 'true' or value == 'false'),
              (value.is_a?(Integer) or (value.to_i.to_s == value if value.respond_to? :to_i)),
              (value.is_a?(Float) or (value.to_f.to_s == value if value.respond_to? :to_f))
@@ -270,5 +271,11 @@ module Blacklight::Solr
     def grouped_key_for_results
       blacklight_config.index.group
     end
+
+    def facet_fields_to_include_in_request
+      blacklight_config.facet_fields.select do |field_name,facet|
+        facet.include_in_request || (facet.include_in_request.nil? && blacklight_config.add_facet_fields_to_solr_request)
+      end
+    end
   end
 end

data/lib/blacklight/solr_repository.rb

@@ -41,16 +41,16 @@ module Blacklight
     def send_and_receive(path, solr_params = {})
       benchmark("Solr fetch", level: :debug) do
         key = blacklight_config.http_method == :post ? :data : :params
-        res = connection.send_and_receive(path, {key=>solr_params.to_hash, method:blacklight_config.http_method})
+        res = connection.send_and_receive(path, {key=>solr_params.to_hash, method: blacklight_config.http_method})
 
         solr_response = blacklight_config.response_model.new(res, solr_params, document_model: blacklight_config.document_model, blacklight_config: blacklight_config)
 
-        Blacklight.logger.debug("Solr query: #{solr_params.inspect}")
+        Blacklight.logger.debug("Solr query: #{blacklight_config.http_method} #{path} #{solr_params.to_hash.inspect}")
         Blacklight.logger.debug("Solr response: #{solr_response.inspect}") if defined?(::BLACKLIGHT_VERBOSE_LOGGING) and ::BLACKLIGHT_VERBOSE_LOGGING
         solr_response
       end
     rescue Errno::ECONNREFUSED => e
-      raise Blacklight::Exceptions::ECONNREFUSED.new("Unable to connect to Solr instance using #{connection.inspect}")
+      raise Blacklight::Exceptions::ECONNREFUSED.new("Unable to connect to Solr instance using #{connection.inspect}: #{e.inspect}")
     rescue RSolr::Error::Http => e
       raise Blacklight::Exceptions::InvalidRequest.new(e.message)
     end

data/lib/blacklight/solr_response.rb

@@ -69,7 +69,7 @@ class Blacklight::SolrResponse < HashWithIndifferentAccess
   end
 
   def group key
-    grouped.select { |x| x.key == key }.first
+    grouped.find { |x| x.key == key }
   end
 
   def grouped?

data/lib/blacklight/solr_response/group.rb

@@ -30,4 +30,4 @@ class Blacklight::SolrResponse::Group
   def field
     response.group_field
   end
-end
+end

data/lib/blacklight/solr_response/group_response.rb

@@ -46,4 +46,4 @@ class Blacklight::SolrResponse::GroupResponse
     response.respond_to?(meth) || super
   end
 
-end
+end

data/lib/blacklight/solr_response/more_like_this.rb

@@ -11,4 +11,4 @@ module Blacklight::SolrResponse::MoreLikeThis
         
     self[:moreLikeThis]
   end
-end
+end

data/lib/blacklight/solr_response/pagination_methods.rb

@@ -14,4 +14,4 @@ module Blacklight::SolrResponse::PaginationMethods
   def total_count #:nodoc:
     total
   end
-end
+end

data/lib/blacklight/solr_response/spelling.rb

@@ -57,10 +57,9 @@ module Blacklight::SolrResponse::Spelling
                 #   origFreq =>
                 #   suggestion =>  [{ frequency =>, word => }] # for extended results
                 #   suggestion => ['word'] # for non-extended results
-                origFreq = term_info['origFreq']
                 if suggestions.index("correctlySpelled")
                   word_suggestions << term_info['suggestion'].map do |suggestion|
-                    suggestion['word'] if suggestion['freq'] > origFreq
+                    suggestion['word'] if suggestion['freq'] > term_info['origFreq']
                   end
                 else
                   # only extended suggestions have frequency so we just return all suggestions
@@ -89,4 +88,3 @@ module Blacklight::SolrResponse::Spelling
   end
 
 end
-

data/lib/blacklight/token_based_user.rb

@@ -20,8 +20,6 @@ module Blacklight::TokenBasedUser
     @token_user ||= if params[:encrypted_user_id]
       user_id = decrypt_user_id params[:encrypted_user_id]
       User.find(user_id)
-    else
-      nil
     end
   end
 
@@ -39,7 +37,7 @@ module Blacklight::TokenBasedUser
   # Used for #export action with encrypted user_id, available
   # as a helper method for views.
   def encrypt_user_id(user_id)
-    message_encryptor.encrypt_and_sign([user_id, Time.now])
+    message_encryptor.encrypt_and_sign([user_id, Time.zone.now])
   end
 
   ##

data/lib/blacklight/user.rb

@@ -17,7 +17,7 @@ module Blacklight::User
 
   def bookmarks_for_documents documents = []
     if documents.length > 0
-      bookmarks.where(document_type: documents.first.class.base_class, document_id: documents.map { |x| x.id})
+      bookmarks.where(document_type: documents.first.class.base_class, document_id: documents.map(&:id))
     else
       []
     end

data/lib/generators/blacklight/assets_generator.rb

@@ -6,17 +6,32 @@ module Blacklight
     def assets
       copy_file "blacklight.css.scss", "app/assets/stylesheets/blacklight.css.scss"
 
-      unless IO.read("app/assets/javascripts/application.js").include?('blacklight/blacklight')
-        marker = IO.read("app/assets/javascripts/application.js").include?('turbolinks') ?
-          '//= require turbolinks' : "//= require jquery_ujs"
-        insert_into_file "app/assets/javascripts/application.js", :after => marker do
-  %q{
+      return if has_blacklight_assets?
+
+      marker = if turbolinks?
+                 '//= require turbolinks'
+               else
+                 '//= require jquery_ujs'
+               end
+
+      insert_into_file "app/assets/javascripts/application.js", :after => marker do
+<<-EOF
 //
 // Required by Blacklight
-//= require blacklight/blacklight}          
-        end
+//= require blacklight/blacklight
+EOF
       end
 
     end
+
+    private
+
+    def turbolinks?
+      @turbolinks ||= IO.read("app/assets/javascripts/application.js").include?('turbolinks')
+    end
+
+    def has_blacklight_assets?
+      IO.read("app/assets/javascripts/application.js").include?('blacklight/blacklight')
+    end
   end
 end

data/lib/railties/blacklight.rake

@@ -41,7 +41,7 @@ namespace :blacklight do
         response = conn.send_and_receive 'admin/ping', {}
         puts response['status']
         errors += 1 unless response['status'] == "OK"
-      rescue Exception => e
+      rescue => e
         errors += 1
         puts e.to_s
       end
@@ -55,7 +55,7 @@ namespace :blacklight do
       controller = args[:controller_name].constantize.new if args[:controller_name]
       controller ||= CatalogController.new
 
-      puts "[#{controller.class.to_s}]"
+      puts "[#{controller.class}]"
 
       print " - find: "
 
@@ -73,7 +73,7 @@ namespace :blacklight do
           puts "\tdoc count: #{response.docs.length}"
           puts "\tfacet fields: #{response.facets.length}"
         end
-      rescue Exception => e
+      rescue => e
         errors += 1
         puts e.to_s
       end
@@ -95,7 +95,7 @@ namespace :blacklight do
           puts "\tdoc count: #{docs.length}"
           puts "\tfacet fields: #{response.facets.length}"
         end
-      rescue Exception => e
+      rescue => e
         errors += 1
         puts e.to_s
       end
@@ -115,7 +115,7 @@ namespace :blacklight do
         if verbose
           puts "\tstatus: #{response.header['status']}"
         end
-      rescue Exception => e
+      rescue => e
         errors += 1
         puts e.to_s
       end

data/spec/controllers/bookmarks_controller_spec.rb

@@ -36,7 +36,7 @@ describe BookmarksController do
    it "has a 500 status code when delete is not success" do
       bm = double(Bookmark)
       allow(@controller).to receive_message_chain(:current_or_guest_user, :existing_bookmark_for).and_return(bm)
-      allow(@controller).to receive_message_chain(:current_or_guest_user, :bookmarks, :where, :first).and_return(double('bookmark', delete: nil, destroyed?: false)) 
+      allow(@controller).to receive_message_chain(:current_or_guest_user, :bookmarks, :find_by).and_return(double('bookmark', delete: nil, destroyed?: false))
      
       xhr :delete, :destroy, :id => 'pleasekillme', :format => :js
 

data/spec/helpers/catalog_helper_spec.rb

@@ -305,7 +305,7 @@ describe CatalogHelper do
     end
   end
 
-  describe "#is_bookmarked?" do
+  describe "#bookmarked?" do
 
     let(:bookmark) { Bookmark.new document: bookmarked_document }
     let(:bookmarked_document) { SolrDocument.new(id: 'a') }
@@ -315,11 +315,11 @@ describe CatalogHelper do
     end
 
     it "should be bookmarked if the document is in the bookmarks" do
-      expect(helper.is_bookmarked?(bookmarked_document)).to eq true
+      expect(helper.bookmarked?(bookmarked_document)).to eq true
     end
 
     it "should not be bookmarked if the document is not listed in the bookmarks" do
-      expect(helper.is_bookmarked?(SolrDocument.new(id: 'b'))).to eq false
+      expect(helper.bookmarked?(SolrDocument.new(id: 'b'))).to eq false
     end
   end
 

data/spec/lib/blacklight/solr_response/facets_spec.rb

@@ -124,7 +124,7 @@ describe Blacklight::SolrResponse::Facets do
     subject { Blacklight::SolrResponse.new(response, {}) }
 
     it "should mark the facet.missing field with a human-readable label and fq" do
-      missing = subject.aggregations["some_field"].items.select { |i| i.value.nil? }.first
+      missing = subject.aggregations["some_field"].items.find { |i| i.value.nil? }
 
       expect(missing.label).to eq "[Missing]"
       expect(missing.fq).to eq "-some_field:[* TO *]"
@@ -169,7 +169,7 @@ describe Blacklight::SolrResponse::Facets do
       expect(field.items.size).to eq 2
       expect(field.items.map { |x| x.value }).to_not include 'field:not_appearing_in_the_config'
 
-      facet_item = field.items.select { |x| x.value == 'a_simple_query' }.first
+      facet_item = field.items.find { |x| x.value == 'a_simple_query' }
 
       expect(facet_item.value).to eq 'a_simple_query'
       expect(facet_item.hits).to eq 10

data/spec/lib/blacklight/solr_response/group_response_spec.rb

@@ -7,7 +7,7 @@ describe Blacklight::SolrResponse::GroupResponse do
   end
 
   let(:group) do
-    response.grouped.select { |x| x.key == "result_group_ssi" }.first
+    response.grouped.find { |x| x.key == "result_group_ssi" }
   end
 
   describe "groups" do

data/spec/lib/blacklight/solr_response/group_spec.rb

@@ -7,7 +7,7 @@ describe Blacklight::SolrResponse::Group do
   end
 
   let(:group) do
-    response.grouped.select { |x| x.key == "result_group_ssi" }.first
+    response.grouped.find { |x| x.key == "result_group_ssi" }
   end
 
   subject do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.13.0
+  version: 5.13.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -246,6 +246,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_hound.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile