blacklight 6.7.1 → 6.7.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7017f77770714ea07e09285f82825f8e96bb0df4
4
- data.tar.gz: 11bbf9de777e8474b4e68a7b76cdd32ef1fe1f8f
3
+ metadata.gz: b878d2dfc40817f1b15e7b557a675965336ab103
4
+ data.tar.gz: cf8c88225ae0c10c82a4507c85a1d48fe3eb125b
5
5
  SHA512:
6
- metadata.gz: 804aaba34b735e0c33aac3e5972d0ec9d2c1768ce8e830e08ecf55231955c8c45e2e8de37c12c529e8595b868fb87bd7756aabb9ffa900bc8b1d4114c24612a7
7
- data.tar.gz: 3ce45061d77dd9daf9ca1fe673eee5da7b423aa6b79fd25987251c2ae9c6b0cb3dd857f7f3d7fae0f678fabc48e55cb296007e25d81b83a82d2f7b6b248814f0
6
+ metadata.gz: 9b7a0281070ad01a20122541a6c424407d1290b8b42e46acbb4fa4134a36916f41011f9a8730ed65080a1bc5c08b599f005cffcb4da205db868d6a0542243f0a
7
+ data.tar.gz: 62fd7d4d1963d4b45919638de883929c6ebd14dc1be43f787ddfe26a391574d6fa42d360a8b25c58ee11f15600e9afa13b1f530accbc33d27fb81d920e72eb7a
data/.rubocop.yml CHANGED
@@ -7,6 +7,7 @@ AllCops:
7
7
  Exclude:
8
8
  - "lib/generators/blacklight/templates/**/*"
9
9
  - "spec/**/*"
10
+ - "blacklight.gemspec"
10
11
 
11
12
  Rails:
12
13
  Enabled: true
data/VERSION CHANGED
@@ -1 +1 @@
1
- 6.7.1
1
+ 6.7.2
@@ -179,7 +179,7 @@ module Blacklight::Catalog
179
179
  # By default, any search action from a Blacklight::Catalog controller
180
180
  # should use the current controller when constructing the route.
181
181
  def search_action_url options = {}
182
- url_for(options.merge(action: 'index'))
182
+ url_for(options.reverse_merge(action: 'index'))
183
183
  end
184
184
 
185
185
  # Email Action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
@@ -5,10 +5,9 @@ module Blacklight::User
5
5
  # SEE ALSO: The /lib/blacklight/engine.rb class for how when this
6
6
  # is injected into the hosting application through ActiveRecord::Base extend
7
7
  def self.included(base)
8
- if base.respond_to? :has_many
9
- base.send :has_many, :bookmarks, :dependent => :destroy, :as => :user
10
- base.send :has_many, :searches, :dependent => :destroy, :as => :user
11
- end
8
+ return unless base.respond_to? :has_many
9
+ base.send :has_many, :bookmarks, :dependent => :destroy, :as => :user
10
+ base.send :has_many, :searches, :dependent => :destroy, :as => :user
12
11
  end
13
12
 
14
13
  def bookmarks_for_documents documents = []
data/blacklight.gemspec CHANGED
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
29
29
  s.add_dependency "globalid"
30
30
  s.add_dependency "nokogiri", "~>1.6" # XML Parser
31
31
  s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
32
- s.add_dependency "rsolr", "~> 1.0", ">= 1.0.6" # Library for interacting with rSolr.
32
+ s.add_dependency "rsolr", ">= 1.0.6", "< 3" # Library for interacting with rSolr.
33
33
  s.add_dependency "bootstrap-sass", "~> 3.2"
34
34
  s.add_dependency "deprecation"
35
35
  s.add_dependency "twitter-typeahead-rails", '0.11.1.pre.corejavascript'
@@ -192,6 +192,7 @@ es:
192
192
  more_html: 'más <span class="sr-only">%{field_name}</span> »'
193
193
  selected:
194
194
  remove: '[borrar]'
195
+ missing: '[Falta]'
195
196
  group:
196
197
  more: 'más »'
197
198
  filters:
@@ -200,6 +200,7 @@ fr:
200
200
  more_html: 'plus <span class="sr-only">%{field_name}</span> »'
201
201
  selected:
202
202
  remove: '[ X ]'
203
+ missing: '[manquante]'
203
204
  group:
204
205
  more: 'plus »'
205
206
  filters:
@@ -127,12 +127,14 @@ pt-BR:
127
127
  title: '%{value}'
128
128
  author: ' por %{value}'
129
129
  url: 'Link: %{url}'
130
+ success: 'SMS Enviado'
130
131
  errors:
131
132
  to:
132
133
  invalid: 'Você precisa digitar um número de telefone válido'
133
134
  blank: "Você precisa digitar o número de telefone do destinatário para enviar uma mensagem"
134
135
  carrier:
135
136
  blank: 'Você precisa selecionar a operadora'
137
+ invalid: 'Você precisa usar uma operadora válida'
136
138
 
137
139
  back_to_search: 'Voltar a busca'
138
140
  back_to_bookmarks: 'Voltar aos Favoritos'
@@ -189,6 +191,7 @@ pt-BR:
189
191
  more_html: 'mais <span class="sr-only">%{field_name}</span> »'
190
192
  selected:
191
193
  remove: '[remover]'
194
+ missing: '[Faltando]'
192
195
  filters:
193
196
  title: 'Sua busca por:'
194
197
  label: '%{label}:'
@@ -202,6 +205,20 @@ pt-BR:
202
205
  atom_feed: 'Atom para resultados'
203
206
  fields:
204
207
  default: 'Palavra-chave'
208
+ bookmarks:
209
+ present: 'Nos Favoritos'
210
+ absent: 'Favorite'
211
+ inprogress: 'Salvando...'
212
+ zero_results:
213
+ title: 'Não foram encontratos resultados para a sua busca'
214
+ modify_search: 'Tente modificar sua busca'
215
+ use_fewer_keywords: 'Use menos palavras para começar, depois refine sua busca usando os links à esquerda.'
216
+ search_fields: 'você buscou por %{search_fields}'
217
+ search_everything: 'tente buscar em tudo'
218
+ view_title: 'Ver resultados como: '
219
+ view:
220
+ list: 'Lista'
221
+
205
222
 
206
223
  entry_name:
207
224
  default: 'registro'
@@ -52,7 +52,7 @@ module Blacklight::Solr
52
52
  protected
53
53
 
54
54
  def build_connection
55
- RSolr.connect(connection_config)
55
+ RSolr.connect(connection_config.merge(adapter: connection_config[:http_adapter]))
56
56
  end
57
57
  end
58
58
  end
@@ -22,7 +22,7 @@ module Blacklight::Solr::Response::Spelling
22
22
  # combination of words may not have results.
23
23
  # Thanks to Naomi Dushay!
24
24
  def words
25
- @words ||= (
25
+ @words ||= begin
26
26
  word_suggestions = []
27
27
  spellcheck = self.response[:spellcheck]
28
28
  if spellcheck && spellcheck[:suggestions]
@@ -69,7 +69,7 @@ module Blacklight::Solr::Response::Spelling
69
69
  end
70
70
  end
71
71
  word_suggestions.flatten.compact.uniq
72
- )
72
+ end
73
73
  end
74
74
 
75
75
  def collation
@@ -34,7 +34,7 @@ describe Blacklight::SearchHelper do
34
34
 
35
35
  let(:blacklight_config) { Blacklight::Configuration.new }
36
36
  let(:copy_of_catalog_config) { ::CatalogController.blacklight_config.deep_copy }
37
- let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config) }
37
+ let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config.except(:adapter)) }
38
38
 
39
39
  before(:each) do
40
40
  @all_docs_query = ''
@@ -0,0 +1,6 @@
1
+ describe 'Autocomplete suggestions' do
2
+ it 'search form has suggest path' do
3
+ visit root_path
4
+ expect(page).to have_css 'input[data-autocomplete-path="/suggest"]'
5
+ end
6
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: blacklight
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.7.1
4
+ version: 6.7.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
17
17
  autorequire:
18
18
  bindir: exe
19
19
  cert_chain: []
20
- date: 2016-09-28 00:00:00.000000000 Z
20
+ date: 2016-10-20 00:00:00.000000000 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: rails
@@ -85,22 +85,22 @@ dependencies:
85
85
  name: rsolr
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - "~>"
89
- - !ruby/object:Gem::Version
90
- version: '1.0'
91
88
  - - ">="
92
89
  - !ruby/object:Gem::Version
93
90
  version: 1.0.6
91
+ - - "<"
92
+ - !ruby/object:Gem::Version
93
+ version: '3'
94
94
  type: :runtime
95
95
  prerelease: false
96
96
  version_requirements: !ruby/object:Gem::Requirement
97
97
  requirements:
98
- - - "~>"
99
- - !ruby/object:Gem::Version
100
- version: '1.0'
101
98
  - - ">="
102
99
  - !ruby/object:Gem::Version
103
100
  version: 1.0.6
101
+ - - "<"
102
+ - !ruby/object:Gem::Version
103
+ version: '3'
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: bootstrap-sass
106
106
  requirement: !ruby/object:Gem::Requirement
@@ -628,6 +628,7 @@ files:
628
628
  - spec/controllers/search_history_controller_spec.rb
629
629
  - spec/controllers/suggest_controller_spec.rb
630
630
  - spec/features/alternate_controller_spec.rb
631
+ - spec/features/autocomplete_spec.rb
631
632
  - spec/features/bookmarks_spec.rb
632
633
  - spec/features/did_you_mean_spec.rb
633
634
  - spec/features/facets_spec.rb
@@ -765,6 +766,7 @@ test_files:
765
766
  - spec/controllers/search_history_controller_spec.rb
766
767
  - spec/controllers/suggest_controller_spec.rb
767
768
  - spec/features/alternate_controller_spec.rb
769
+ - spec/features/autocomplete_spec.rb
768
770
  - spec/features/bookmarks_spec.rb
769
771
  - spec/features/did_you_mean_spec.rb
770
772
  - spec/features/facets_spec.rb