blacklight 6.7.1 → 6.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7017f77770714ea07e09285f82825f8e96bb0df4
-  data.tar.gz: 11bbf9de777e8474b4e68a7b76cdd32ef1fe1f8f
+  metadata.gz: b878d2dfc40817f1b15e7b557a675965336ab103
+  data.tar.gz: cf8c88225ae0c10c82a4507c85a1d48fe3eb125b
 SHA512:
-  metadata.gz: 804aaba34b735e0c33aac3e5972d0ec9d2c1768ce8e830e08ecf55231955c8c45e2e8de37c12c529e8595b868fb87bd7756aabb9ffa900bc8b1d4114c24612a7
-  data.tar.gz: 3ce45061d77dd9daf9ca1fe673eee5da7b423aa6b79fd25987251c2ae9c6b0cb3dd857f7f3d7fae0f678fabc48e55cb296007e25d81b83a82d2f7b6b248814f0
+  metadata.gz: 9b7a0281070ad01a20122541a6c424407d1290b8b42e46acbb4fa4134a36916f41011f9a8730ed65080a1bc5c08b599f005cffcb4da205db868d6a0542243f0a
+  data.tar.gz: 62fd7d4d1963d4b45919638de883929c6ebd14dc1be43f787ddfe26a391574d6fa42d360a8b25c58ee11f15600e9afa13b1f530accbc33d27fb81d920e72eb7a

data/.rubocop.yml

@@ -7,6 +7,7 @@ AllCops:
   Exclude:
   - "lib/generators/blacklight/templates/**/*"
   - "spec/**/*"
+  - "blacklight.gemspec"
 
 Rails:
   Enabled: true

data/VERSION

@@ -1 +1 @@
-6.7.1
+6.7.2

data/app/controllers/concerns/blacklight/catalog.rb

@@ -179,7 +179,7 @@ module Blacklight::Catalog
     # By default, any search action from a Blacklight::Catalog controller
     # should use the current controller when constructing the route.
     def search_action_url options = {}
-      url_for(options.merge(action: 'index'))
+      url_for(options.reverse_merge(action: 'index'))
     end
 
      # Email Action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)

data/app/models/concerns/blacklight/user.rb

@@ -5,10 +5,9 @@ module Blacklight::User
   # SEE ALSO:  The /lib/blacklight/engine.rb class for how when this 
   # is injected into the hosting application through ActiveRecord::Base extend
   def self.included(base)
-    if base.respond_to? :has_many
-      base.send :has_many, :bookmarks, :dependent => :destroy, :as => :user
-      base.send :has_many, :searches,  :dependent => :destroy, :as => :user
-    end
+    return unless base.respond_to? :has_many
+    base.send :has_many, :bookmarks, :dependent => :destroy, :as => :user
+    base.send :has_many, :searches,  :dependent => :destroy, :as => :user
   end
 
   def bookmarks_for_documents documents = []

data/blacklight.gemspec

@@ -29,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", ">= 1.0.6"  # Library for interacting with rSolr.
+  s.add_dependency "rsolr", ">= 1.0.6", "< 3"  # Library for interacting with rSolr.
   s.add_dependency "bootstrap-sass", "~> 3.2"
   s.add_dependency "deprecation"
   s.add_dependency "twitter-typeahead-rails", '0.11.1.pre.corejavascript'

data/config/locales/blacklight.es.yml

@@ -192,6 +192,7 @@ es:
         more_html: 'más <span class="sr-only">%{field_name}</span> »'
         selected:
           remove: '[borrar]'
+        missing: '[Falta]'
       group:
         more: 'más »'
       filters:

data/config/locales/blacklight.fr.yml

@@ -200,6 +200,7 @@ fr:
         more_html: 'plus <span class="sr-only">%{field_name}</span> »'
         selected:
           remove: '[ X ]'
+        missing: '[manquante]'
       group:
         more: 'plus »'
       filters:

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

@@ -127,12 +127,14 @@ pt-BR:
         title: '%{value}'
         author: ' por %{value}'
         url: 'Link: %{url}'
+      success: 'SMS Enviado'
       errors:
         to:
           invalid: 'Você precisa digitar um número de telefone válido'
           blank: "Você precisa digitar o número de telefone do destinatário para enviar uma mensagem"
         carrier:
           blank: 'Você precisa selecionar a operadora'
+          invalid: 'Você precisa usar uma operadora válida'
 
     back_to_search: 'Voltar a busca'
     back_to_bookmarks: 'Voltar aos Favoritos'
@@ -189,6 +191,7 @@ pt-BR:
         more_html: 'mais <span class="sr-only">%{field_name}</span> »'
         selected:
           remove: '[remover]'
+        missing: '[Faltando]'
       filters:
         title: 'Sua busca por:'
         label: '%{label}:'
@@ -202,6 +205,20 @@ pt-BR:
       atom_feed: 'Atom para resultados'
       fields:
         default: 'Palavra-chave'
+      bookmarks:
+        present: 'Nos Favoritos'
+        absent: 'Favorite'
+        inprogress: 'Salvando...'
+      zero_results:
+        title: 'Não foram encontratos resultados para a sua busca'
+        modify_search: 'Tente modificar sua busca'
+        use_fewer_keywords: 'Use menos palavras para começar, depois refine sua busca usando os links à esquerda.'
+        search_fields: 'você buscou por %{search_fields}'
+        search_everything: 'tente buscar em tudo'
+      view_title: 'Ver resultados como: '
+      view:
+        list: 'Lista'
+
 
     entry_name:
       default: 'registro'

data/lib/blacklight/solr/repository.rb

@@ -52,7 +52,7 @@ module Blacklight::Solr
     protected
 
       def build_connection
-        RSolr.connect(connection_config)
+        RSolr.connect(connection_config.merge(adapter: connection_config[:http_adapter]))
       end
   end
 end

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

@@ -22,7 +22,7 @@ module Blacklight::Solr::Response::Spelling
     # combination of words may not have results.
     # Thanks to Naomi Dushay!
     def words
-      @words ||= (
+      @words ||= begin
         word_suggestions = []
         spellcheck = self.response[:spellcheck]
         if spellcheck && spellcheck[:suggestions]
@@ -69,7 +69,7 @@ module Blacklight::Solr::Response::Spelling
           end
         end
         word_suggestions.flatten.compact.uniq
-      )
+      end
     end
 
     def collation

data/spec/controllers/blacklight/search_helper_spec.rb

@@ -34,7 +34,7 @@ describe Blacklight::SearchHelper do
 
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:copy_of_catalog_config) { ::CatalogController.blacklight_config.deep_copy }
-  let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config) }
+  let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config.except(:adapter)) }
 
   before(:each) do
     @all_docs_query = ''

data/spec/features/autocomplete_spec.rb

@@ -0,0 +1,6 @@
+describe 'Autocomplete suggestions' do
+  it 'search form has suggest path' do
+    visit root_path
+    expect(page).to have_css 'input[data-autocomplete-path="/suggest"]'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.7.1
+  version: 6.7.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,22 +85,22 @@ dependencies:
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -628,6 +628,7 @@ files:
 - spec/controllers/search_history_controller_spec.rb
 - spec/controllers/suggest_controller_spec.rb
 - spec/features/alternate_controller_spec.rb
+- spec/features/autocomplete_spec.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/did_you_mean_spec.rb
 - spec/features/facets_spec.rb
@@ -765,6 +766,7 @@ test_files:
 - spec/controllers/search_history_controller_spec.rb
 - spec/controllers/suggest_controller_spec.rb
 - spec/features/alternate_controller_spec.rb
+- spec/features/autocomplete_spec.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/did_you_mean_spec.rb
 - spec/features/facets_spec.rb