Merge pull request #1483 from projectblacklight/bribe_the_cop

3 tweaked files to make CI's rubocop happy
projectblacklight · Sep 6, 2016 · f5f7d2b · f5f7d2b
2 parents c38073a + d6a3150
commit f5f7d2b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/app/controllers/concerns/blacklight/facet.rb b/app/controllers/concerns/blacklight/facet.rb
@@ -4,7 +4,6 @@ module Blacklight
   # They are only dependent on `blacklight_config` and `@response`
   #
   module Facet
-
     delegate :facet_configuration_for_field, to: :blacklight_config
 
     def facet_paginator(field_config, display_facet)

diff --git a/lib/blacklight/configuration.rb b/lib/blacklight/configuration.rb
@@ -157,8 +157,7 @@ def default_values
     # solr fields to display when showing single documents
     define_field_access :show_field
 
-    # solr "fields" to use for scoping user search queries
-    # to particular fields
+    # solr "fields" to use for scoping user search queries to particular fields
     define_field_access :search_field
 
     # solr fields to use for sorting results
@@ -171,7 +170,6 @@ def initialize(*args)
       self
     end
 
-    ##
     # Initialize default values from the class attribute
     def initialize_default_values!
       Marshal.load(Marshal.dump(self.class.default_values)).each do |k, v|
@@ -184,7 +182,7 @@ def document_model
     end
 
     # only here to support alias_method
-    def document_model= *args
+    def document_model=(*args)
       super
     end
 
@@ -242,17 +240,15 @@ def configure
     def default_search_field
       field = super
       field ||= search_fields.values.find { |f| f.default == true }
-      field ||= search_fields.values.first
-      field
+      field || search_fields.values.first
     end
 
     # Returns default sort field, used for simpler display in history, etc.
     # if not set, defaults to first defined sort field
     def default_sort_field
       field = super
       field ||= sort_fields.values.find { |f| f.default == true }
-      field ||= sort_fields.values.first
-      field
+      field || sort_fields.values.first
     end
 
     def default_title_field
@@ -279,9 +275,7 @@ def add_facet_fields_to_solr_request!(*fields)
       if fields.empty?
         self.add_facet_fields_to_solr_request = true
       else
-        facet_fields.slice(*fields).each do |k,v|
-          v.include_in_request = true
-        end
+        facet_fields.slice(*fields).each { |_k, v| v.include_in_request = true }
       end
     end
 
@@ -295,15 +289,9 @@ def add_field_configuration_to_solr_request!(*fields)
       if fields.empty?
         self.add_field_configuration_to_solr_request = true
       else
-        index_fields.slice(*fields).each do |k,v|
-          v.include_in_request = true
-        end
-        show_fields.slice(*fields).each do |k,v|
-          v.include_in_request = true
-        end
-        facet_fields.slice(*fields).each do |k,v|
-          v.include_in_request = true
-        end
+        index_fields.slice(*fields).each { |_k, v| v.include_in_request = true }
+        show_fields.slice(*fields).each { |_k, v| v.include_in_request = true }
+        facet_fields.slice(*fields).each { |_k, v| v.include_in_request = true }
       end
     end
 

diff --git a/lib/blacklight/search_state.rb b/lib/blacklight/search_state.rb
@@ -3,7 +3,6 @@ module Blacklight
   # This class encapsulates the search state as represented by the query
   # parameters namely: :f, :q, :page, :per_page and, :sort
   class SearchState
-
     attr_reader :blacklight_config # Must be called blacklight_config, because Blacklight::Facet calls blacklight_config.
     attr_reader :params