blacklight 6.7.2 → 6.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b878d2dfc40817f1b15e7b557a675965336ab103
-  data.tar.gz: cf8c88225ae0c10c82a4507c85a1d48fe3eb125b
+  metadata.gz: b010c38e55760896be7d71da9b207fd9683fd635
+  data.tar.gz: fcafe80dfca427f26122f7a05e2e18c9825ba24b
 SHA512:
-  metadata.gz: 9b7a0281070ad01a20122541a6c424407d1290b8b42e46acbb4fa4134a36916f41011f9a8730ed65080a1bc5c08b599f005cffcb4da205db868d6a0542243f0a
-  data.tar.gz: 62fd7d4d1963d4b45919638de883929c6ebd14dc1be43f787ddfe26a391574d6fa42d360a8b25c58ee11f15600e9afa13b1f530accbc33d27fb81d920e72eb7a
+  metadata.gz: ccd2af1a8f740736a05dccc542e1277de04e363dc1e50a02f9d0936592837ad62ebbad88108479d92a8807c12a81c202189d1009e801cc1000247d101bab90f9
+  data.tar.gz: e29b7a34a42498627f67ee4575c0981e7d8b6e697f6b9a925d829bf84c1b8f57f7aa7b24d93895e0d196c6a7885b1b8dd12fc81b15abc04114644029a8556288

data/.rubocop.yml

@@ -4,6 +4,7 @@ inherit_from:
   - .rubocop_todo.yml
 
 AllCops:
+  DisplayCopNames: true
   Exclude:
   - "lib/generators/blacklight/templates/**/*"
   - "spec/**/*"
@@ -27,3 +28,13 @@ Rails/OutputSafety:
 Style/MethodMissing:
   Exclude:
   - 'lib/blacklight/utils.rb'
+
+# engine_cart block includes conditional, not duplication
+Bundler/DuplicatedGem:
+  Exclude:
+  - 'Gemfile'
+
+# engine_cart block is following default Rails order
+Bundler/OrderedGems:
+  Exclude:
+  - 'Gemfile'

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-08-25 07:56:15 -0700 using RuboCop version 0.42.0.
+# on 2016-10-31 11:13:16 -0700 using RuboCop version 0.45.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -74,7 +74,7 @@ Lint/UselessAssignment:
     - 'lib/blacklight/solr/response/spelling.rb'
     - 'lib/railties/blacklight.rake'
 
-# Offense count: 61
+# Offense count: 60
 Metrics/AbcSize:
   Max: 53
 
@@ -85,13 +85,13 @@ Metrics/BlockNesting:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 200
+  Max: 193
 
 # Offense count: 20
 Metrics/CyclomaticComplexity:
   Max: 12
 
-# Offense count: 59
+# Offense count: 50
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 52
@@ -172,7 +172,7 @@ Style/CaseIndentation:
     - 'lib/blacklight/configuration/fields.rb'
     - 'lib/blacklight/search_builder.rb'
 
-# Offense count: 51
+# Offense count: 50
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
@@ -186,7 +186,7 @@ Style/ConditionalAssignment:
   Exclude:
     - 'lib/blacklight/solr/response/spelling.rb'
 
-# Offense count: 104
+# Offense count: 91
 Style/Documentation:
   Enabled: false
 
@@ -216,7 +216,7 @@ Style/ElseAlignment:
     - 'lib/blacklight/solr/response/facets.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 26
+# Offense count: 20
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
 Style/ExtraSpacing:
@@ -226,7 +226,6 @@ Style/ExtraSpacing:
     - 'app/models/concerns/blacklight/document/dublin_core.rb'
     - 'app/models/concerns/blacklight/document/export.rb'
     - 'app/models/record_mailer.rb'
-    - 'blacklight.gemspec'
     - 'config/routes.rb'
     - 'lib/blacklight/configuration.rb'
     - 'lib/generators/blacklight/controller_generator.rb'
@@ -247,10 +246,10 @@ Style/GuardClause:
     - 'app/helpers/blacklight/catalog_helper_behavior.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 111
+# Offense count: 103
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
 Style/HashSyntax:
   Enabled: false
 
@@ -279,7 +278,7 @@ Style/IndentHash:
   Exclude:
     - 'lib/blacklight/configuration.rb'
 
-# Offense count: 23
+# Offense count: 20
 # Cop supports --auto-correct.
 # Configuration parameters: Width.
 Style/IndentationWidth:
@@ -298,7 +297,7 @@ Style/IndentationWidth:
     - 'lib/blacklight/solr/search_builder_behavior.rb'
     - 'lib/generators/blacklight/assets_generator.rb'
 
-# Offense count: 9
+# Offense count: 5
 # Cop supports --auto-correct.
 Style/LeadingCommentSpace:
   Exclude:
@@ -308,7 +307,7 @@ Style/LeadingCommentSpace:
     - 'lib/blacklight/configuration.rb'
     - 'lib/blacklight/solr/response/spelling.rb'
 
-# Offense count: 139
+# Offense count: 116
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
@@ -322,6 +321,13 @@ Style/MultilineBlockLayout:
     - 'lib/generators/blacklight/install_generator.rb'
     - 'lib/generators/blacklight/test_support_generator.rb'
 
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/MultilineIfModifier:
+  Exclude:
+    - 'lib/blacklight/solr/response/facets.rb'
+    - 'lib/blacklight/solr/search_builder_behavior.rb'
+
 # Offense count: 13
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
@@ -372,7 +378,7 @@ Style/PredicateName:
 Style/RedundantSelf:
   Enabled: false
 
-# Offense count: 24
+# Offense count: 16
 # Cop supports --auto-correct.
 Style/SpaceAfterComma:
   Exclude:
@@ -416,7 +422,7 @@ Style/SpaceAroundEqualsInParameterDefault:
     - 'app/presenters/blacklight/show_presenter.rb'
     - 'lib/blacklight/search_state.rb'
 
-# Offense count: 13
+# Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
 Style/SpaceAroundOperators:
@@ -482,7 +488,7 @@ Style/SpaceInsideBrackets:
   Exclude:
     - 'lib/blacklight/configuration/fields.rb'
 
-# Offense count: 18
+# Offense count: 19
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
 # SupportedStyles: space, no_space, compact
@@ -513,7 +519,7 @@ Style/SpaceInsideParens:
     - 'lib/blacklight/search_state.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 217
+# Offense count: 190
 # Cop supports --auto-correct.
 Style/TrailingWhitespace:
   Enabled: false

data/VERSION

@@ -1 +1 @@
-6.7.2
+6.7.3

data/app/presenters/blacklight/link_alternate_presenter.rb

@@ -4,13 +4,13 @@ module Blacklight
     include ActionView::Helpers::OutputSafetyHelper
     include ActionView::Helpers::TagHelper
 
-    def initialize(controller, document, options)
-      @controller = controller
+    def initialize(view_context, document, options)
+      @view_context = view_context
       @document = document
       @options = { unique: false, exclude: [] }.merge(options)
     end
 
-    attr_reader :controller, :document, :options
+    attr_reader :view_context, :document, :options
 
     # Renders links to alternate representations 
     # provided by export formats. Returns empty string if no links available.
@@ -22,8 +22,12 @@ module Blacklight
 
         seen.add(spec[:content_type])
 
-        tag(:link, rel: "alternate", title: format, type: spec[:content_type], href: controller.polymorphic_url(document, format: format))
+        tag(:link, rel: "alternate", title: format, type: spec[:content_type], href: href(format))
       end.compact, "\n")
     end
+
+    def href(format)
+      view_context.polymorphic_url(view_context.search_state.url_for_document(document), format: format)
+    end
   end
 end

data/blacklight.gemspec

@@ -45,5 +45,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coveralls"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rubocop"
-  s.add_development_dependency "rubocop-rspec"
+  s.add_development_dependency "rubocop-rspec", '~> 1.8.0'
 end

data/spec/helpers/facets_helper_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'equivalent-xml'
-
 describe FacetsHelper do
   let(:blacklight_config) { Blacklight::Configuration.new }
 

data/spec/presenters/blacklight/link_alternate_presenter_spec.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Blacklight::LinkAlternatePresenter do
+  let(:view_context) { double }
+  let(:document) { SolrDocument.new(id: 9999) }
+  let(:options) { {} }
+  let(:config) { Blacklight::Configuration.new }
+  let(:parameter_class) { ActionController::Parameters }
+  let(:params) { parameter_class.new }
+  let(:search_state) { Blacklight::SearchState.new(params, config) }
+
+  let(:presenter) { described_class.new(view_context, document, options) }
+  before do
+    allow(view_context).to receive(:search_state).and_return(search_state)
+    allow(view_context).to receive(:polymorphic_url) do |doc, opts|
+      "http://test.host/catalog/#{doc.to_param}.#{opts[:format]}"
+    end
+  end
+
+  describe "#render" do
+    subject { presenter.render }
+    let(:expected_html) do
+      '<link rel="alternate" title="xml" type="application/xml" href="http://test.host/catalog/9999.xml" />' \
+      '<link rel="alternate" title="dc_xml" type="text/xml" href="http://test.host/catalog/9999.dc_xml" />' \
+      '<link rel="alternate" title="oai_dc_xml" type="text/xml" href="http://test.host/catalog/9999.oai_dc_xml" />'
+    end
+    it { is_expected.to be_equivalent_to expected_html }
+  end
+end

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ require 'rspec/its'
 require 'rspec/collection_matchers'
 require 'capybara/rspec'
 require 'capybara/poltergeist'
+require 'equivalent-xml'
 
 Capybara.javascript_driver = :poltergeist
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.7.2
+  version: 6.7.3
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -301,16 +301,16 @@ dependencies:
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 description: |-
   Blacklight is an open source Solr user interface discovery platform.
       You can use Blacklight to enable searching and browsing of your
@@ -688,6 +688,7 @@ files:
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/presenters/blacklight/link_alternate_presenter_spec.rb
 - spec/presenters/document_presenter_spec.rb
 - spec/presenters/index_presenter_spec.rb
 - spec/presenters/pipeline_spec.rb
@@ -747,7 +748,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -826,6 +827,7 @@ test_files:
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/presenters/blacklight/link_alternate_presenter_spec.rb
 - spec/presenters/document_presenter_spec.rb
 - spec/presenters/index_presenter_spec.rb
 - spec/presenters/pipeline_spec.rb