blacklight 6.0.0 → 6.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (69) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +6 -6
  3. data/.rubocop_todo.yml +448 -87
  4. data/.travis.yml +2 -0
  5. data/README.md +3 -5
  6. data/VERSION +1 -1
  7. data/app/controllers/concerns/blacklight/bookmarks.rb +8 -8
  8. data/app/controllers/concerns/blacklight/catalog.rb +5 -5
  9. data/app/controllers/concerns/blacklight/controller.rb +5 -5
  10. data/app/controllers/concerns/blacklight/saved_searches.rb +70 -0
  11. data/app/controllers/concerns/blacklight/search_context.rb +3 -0
  12. data/app/controllers/concerns/blacklight/token_based_user.rb +1 -1
  13. data/app/controllers/saved_searches_controller.rb +1 -60
  14. data/app/helpers/blacklight/blacklight_helper_behavior.rb +3 -3
  15. data/app/helpers/blacklight/catalog_helper_behavior.rb +20 -9
  16. data/app/helpers/blacklight/configuration_helper_behavior.rb +1 -1
  17. data/app/helpers/blacklight/deprecated_url_helper_behavior.rb +1 -1
  18. data/app/helpers/blacklight/facets_helper_behavior.rb +2 -2
  19. data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +1 -1
  20. data/app/helpers/blacklight/render_constraints_helper_behavior.rb +18 -8
  21. data/app/helpers/blacklight/render_partials_helper.rb +15 -3
  22. data/app/models/concerns/blacklight/configurable.rb +4 -8
  23. data/app/models/concerns/blacklight/document/dublin_core.rb +1 -1
  24. data/app/models/concerns/blacklight/document/extensions.rb +1 -1
  25. data/app/models/concerns/blacklight/document.rb +3 -3
  26. data/app/models/concerns/blacklight/user.rb +1 -1
  27. data/app/models/record_mailer.rb +6 -1
  28. data/app/models/search.rb +2 -2
  29. data/app/views/catalog/_facets.html.erb +7 -7
  30. data/app/views/catalog/_results_pagination.html.erb +1 -1
  31. data/blacklight.gemspec +7 -4
  32. data/config/locales/blacklight.de.yml +1 -0
  33. data/config/locales/blacklight.en.yml +1 -0
  34. data/config/locales/blacklight.es.yml +1 -0
  35. data/config/locales/blacklight.fr.yml +1 -0
  36. data/config/locales/blacklight.it.yml +1 -0
  37. data/config/locales/blacklight.pt-BR.yml +1 -0
  38. data/lib/blacklight/abstract_repository.rb +2 -2
  39. data/lib/blacklight/configuration/field.rb +1 -1
  40. data/lib/blacklight/configuration/search_field.rb +1 -1
  41. data/lib/blacklight/configuration/sort_field.rb +1 -1
  42. data/lib/blacklight/search_builder.rb +8 -4
  43. data/lib/blacklight/search_state.rb +3 -3
  44. data/lib/blacklight/solr/repository.rb +3 -3
  45. data/lib/blacklight/solr/request.rb +2 -2
  46. data/lib/blacklight/solr/response/spelling.rb +1 -1
  47. data/lib/blacklight/solr/response.rb +1 -1
  48. data/lib/blacklight/solr/search_builder_behavior.rb +7 -7
  49. data/lib/blacklight/utils.rb +5 -5
  50. data/lib/blacklight.rb +2 -2
  51. data/lib/generators/blacklight/assets_generator.rb +1 -1
  52. data/lib/generators/blacklight/controller_generator.rb +13 -15
  53. data/lib/generators/blacklight/document_generator.rb +5 -4
  54. data/lib/generators/blacklight/install_generator.rb +26 -26
  55. data/lib/generators/blacklight/models_generator.rb +18 -16
  56. data/lib/generators/blacklight/search_builder_generator.rb +4 -4
  57. data/lib/generators/blacklight/solr4_generator.rb +14 -9
  58. data/lib/generators/blacklight/solr5_generator.rb +4 -2
  59. data/lib/generators/blacklight/templates/solr_document.rb +6 -8
  60. data/lib/generators/blacklight/test_support_generator.rb +5 -3
  61. data/lib/generators/blacklight/user_generator.rb +18 -12
  62. data/lib/railties/blacklight.rake +2 -2
  63. data/solr/conf/solrconfig.xml +0 -1
  64. data/spec/test_app_templates/Gemfile.extra +0 -2
  65. data/spec/test_app_templates/lib/generators/test_app_generator.rb +1 -1
  66. data/tasks/blacklight.rake +1 -3
  67. metadata +23 -15
  68. data/.rubocop_hound.yml +0 -1063
  69. /data/lib/generators/blacklight/templates/{blacklight.css.scss → blacklight.scss} +0 -0
@@ -9,9 +9,11 @@ require 'rails/generators/base'
9
9
  module Blacklight
10
10
  class TestSupport < Rails::Generators::Base
11
11
  source_root File.expand_path('../templates', __FILE__)
12
- desc """
13
- Generate blacklight testing configurations for blacklight's own tests, or for blacklight plugins to use for testing
14
- """
12
+
13
+ desc <<-EOS
14
+ Generate blacklight testing configurations for blacklight's own tests, or for blacklight plugins to use for testing
15
+ EOS
16
+
15
17
  def alternate_controller
16
18
  copy_file "alternate_controller.rb", "app/controllers/alternate_controller.rb"
17
19
 
@@ -10,11 +10,11 @@ module Blacklight
10
10
  argument :model_name, :type => :string , :default => "user"
11
11
  class_option :devise , :type => :boolean, :default => false, :aliases => "-d", :desc => "Use Devise as authentication logic (this is default)."
12
12
 
13
- desc """
14
- This generator makes the following changes to your application:
15
- 1. Creates a devise-based user model
16
- 2. Injects blacklight-specific behavior into your user model
17
- """
13
+ desc <<-EOS
14
+ This generator makes the following changes to your application:
15
+ 1. Creates a devise-based user model
16
+ 2. Injects blacklight-specific behavior into your user model
17
+ EOS
18
18
  # Install Devise?
19
19
  def generate_devise_assets
20
20
  if options[:devise]
@@ -49,16 +49,22 @@ This generator makes the following changes to your application:
49
49
  # Add Blacklight to the user model
50
50
  def inject_blacklight_user_behavior
51
51
  file_path = "app/models/#{model_name.underscore}.rb"
52
- if File.exists?(file_path)
52
+ if File.exist?(file_path)
53
53
  inject_into_class file_path, model_name.classify do
54
- "\n if Blacklight::Utils.needs_attr_accessible?\n" +
55
- "\n attr_accessible :email, :password, :password_confirmation" +
56
- "\n end\n" +
57
- "# Connects this user object to Blacklights Bookmarks. " +
58
- "\n include Blacklight::User\n"
54
+ "\n if Blacklight::Utils.needs_attr_accessible?" \
55
+ "\n attr_accessible :email, :password, :password_confirmation" \
56
+ "\n end" \
57
+ "\n # Connects this user object to Blacklights Bookmarks." \
58
+ "\n include Blacklight::User\n"
59
59
  end
60
60
  else
61
- say_status("warning", "Blacklight authenticated user functionality not installed, as a user model could not be found at /app/models/user.rb. If you used a different name, please re-run the migration and provide that name as an argument. Such as `rails -g blacklight:user client`", :yellow)
61
+ say_status "warning", <<-EOS.strip_heredocs, :yellow
62
+ Blacklight authenticated user functionality not installed, as a user model
63
+ could not be found at /app/models/user.rb. If you used a different name,
64
+ please re-run the migration and provide that name as an argument. E.g.:
65
+
66
+ `rails -g blacklight:user client`
67
+ EOS
62
68
  end
63
69
  end
64
70
  end
@@ -15,7 +15,7 @@ namespace :blacklight do
15
15
  task :seed => [:environment] do
16
16
  require 'yaml'
17
17
 
18
- docs = YAML::load(File.open(File.join(Blacklight.root, 'solr', 'sample_solr_documents.yml')))
18
+ docs = YAML.load(File.open(File.join(Blacklight.root, 'solr', 'sample_solr_documents.yml')))
19
19
  conn = Blacklight.default_index.connection
20
20
  conn.add docs
21
21
  conn.commit
@@ -78,7 +78,7 @@ namespace :blacklight do
78
78
  begin
79
79
  response, docs = controller.search_results(q: '{!lucene}*:*')
80
80
 
81
- if response.header['status'] == 0 and docs.length > 0
81
+ if response.header['status'] == 0 and docs.any?
82
82
  puts "OK"
83
83
  else
84
84
  errors += 1
@@ -214,7 +214,6 @@
214
214
 
215
215
  <str name="facet">true</str>
216
216
  <str name="facet.mincount">1</str>
217
- <str name="facet.limit">10</str>
218
217
  <str name="facet.field">format</str>
219
218
  <str name="facet.field">lc_1letter_facet</str>
220
219
  <str name="facet.field">lc_alpha_facet</str>
@@ -1,7 +1,6 @@
1
1
 
2
2
  if ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
3
3
  gem 'rails-controller-testing', github: 'rails/rails-controller-testing'
4
- gem 'capybara', github: 'jnicklas/capybara' # we need 2.6.0 to be released
5
4
  gem 'rspec-mocks', github: 'rspec/rspec-mocks' # we need 3.5.0 to be released
6
5
  gem 'rspec-expectations', github: 'rspec/rspec-expectations' # we need 3.5.0 to be released
7
6
  gem 'rspec-support', github: 'rspec/rspec-support' # we need 3.5.0 to be released
@@ -10,5 +9,4 @@ if ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
10
9
  gem 'rspec-rails', github: 'rspec/rspec-rails' # we need 3.5.0 to be released
11
10
  gem 'kaminari', github: 'amatsuda/kaminari' # need > 0.16.3
12
11
  gem 'deprecation', github: 'jcoyne/deprecation', branch: 'no_alias_method_chain'
13
- gem 'turbolinks', github: 'basecamp/turbolinks', branch: 'v5' # need >= 5.0.0
14
12
  end
@@ -23,7 +23,7 @@ class TestAppGenerator < Rails::Generators::Base
23
23
  run "bundle install"
24
24
  end
25
25
 
26
- generate 'blacklight:install', '--devise --jettywrapper'
26
+ generate 'blacklight:install', '--devise --marc --jettywrapper'
27
27
  end
28
28
 
29
29
  def run_test_support_generator
@@ -1,5 +1,3 @@
1
- ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip"
2
-
3
1
  require 'solr_wrapper'
4
2
  require 'engine_cart/rake_task'
5
3
 
@@ -43,7 +41,7 @@ namespace :blacklight do
43
41
 
44
42
  desc 'Run Solr and Blacklight for interactive development'
45
43
  task :server, [:rails_server_args] do |t, args|
46
- if File.exists? EngineCart.destination
44
+ if File.exist? EngineCart.destination
47
45
  within_test_app do
48
46
  system "bundle update"
49
47
  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.0.0
4
+ version: 6.1.0
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-01-21 00:00:00.000000000 Z
20
+ date: 2016-04-07 00:00:00.000000000 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: rails
@@ -25,20 +25,20 @@ dependencies:
25
25
  requirements:
26
26
  - - ">="
27
27
  - !ruby/object:Gem::Version
28
- version: '4.1'
28
+ version: '4.2'
29
29
  - - "<"
30
30
  - !ruby/object:Gem::Version
31
- version: '5'
31
+ version: '6'
32
32
  type: :runtime
33
33
  prerelease: false
34
34
  version_requirements: !ruby/object:Gem::Requirement
35
35
  requirements:
36
36
  - - ">="
37
37
  - !ruby/object:Gem::Version
38
- version: '4.1'
38
+ version: '4.2'
39
39
  - - "<"
40
40
  - !ruby/object:Gem::Version
41
- version: '5'
41
+ version: '6'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: globalid
44
44
  requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,20 @@ dependencies:
87
87
  requirements:
88
88
  - - "~>"
89
89
  - !ruby/object:Gem::Version
90
- version: 1.0.11
90
+ version: '1.0'
91
+ - - ">="
92
+ - !ruby/object:Gem::Version
93
+ version: 1.0.6
91
94
  type: :runtime
92
95
  prerelease: false
93
96
  version_requirements: !ruby/object:Gem::Requirement
94
97
  requirements:
95
98
  - - "~>"
96
99
  - !ruby/object:Gem::Version
97
- version: 1.0.11
100
+ version: '1.0'
101
+ - - ">="
102
+ - !ruby/object:Gem::Version
103
+ version: 1.0.6
98
104
  - !ruby/object:Gem::Dependency
99
105
  name: bootstrap-sass
100
106
  requirement: !ruby/object:Gem::Requirement
@@ -249,9 +255,11 @@ dependencies:
249
255
  - - ">="
250
256
  - !ruby/object:Gem::Version
251
257
  version: '0'
252
- description: Blacklight is an open source Solr user interface discovery platform.
253
- You can use Blacklight to enable searching and browsing of your collections. Blacklight
254
- uses the Apache Solr search engine to search full text and/or metadata.
258
+ description: |-
259
+ Blacklight is an open source Solr user interface discovery platform.
260
+ You can use Blacklight to enable searching and browsing of your
261
+ collections. Blacklight uses the Apache Solr search engine to search
262
+ full text and/or metadata.
255
263
  email:
256
264
  - blacklight-development@googlegroups.com
257
265
  executables: []
@@ -263,7 +271,6 @@ files:
263
271
  - ".jshintrc"
264
272
  - ".rspec"
265
273
  - ".rubocop.yml"
266
- - ".rubocop_hound.yml"
267
274
  - ".rubocop_todo.yml"
268
275
  - ".travis.yml"
269
276
  - ".yardopts"
@@ -310,6 +317,7 @@ files:
310
317
  - app/controllers/concerns/blacklight/default_component_configuration.rb
311
318
  - app/controllers/concerns/blacklight/facet.rb
312
319
  - app/controllers/concerns/blacklight/request_builders.rb
320
+ - app/controllers/concerns/blacklight/saved_searches.rb
313
321
  - app/controllers/concerns/blacklight/search_context.rb
314
322
  - app/controllers/concerns/blacklight/search_fields.rb
315
323
  - app/controllers/concerns/blacklight/search_helper.rb
@@ -508,8 +516,8 @@ files:
508
516
  - lib/generators/blacklight/solr4_generator.rb
509
517
  - lib/generators/blacklight/solr5_generator.rb
510
518
  - lib/generators/blacklight/templates/alternate_controller.rb
511
- - lib/generators/blacklight/templates/blacklight.css.scss
512
519
  - lib/generators/blacklight/templates/blacklight.en.yml
520
+ - lib/generators/blacklight/templates/blacklight.scss
513
521
  - lib/generators/blacklight/templates/catalog_controller.rb
514
522
  - lib/generators/blacklight/templates/config/blacklight.yml
515
523
  - lib/generators/blacklight/templates/config/jetty.yml
@@ -655,7 +663,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
655
663
  requirements:
656
664
  - - "~>"
657
665
  - !ruby/object:Gem::Version
658
- version: '2.0'
666
+ version: '2.1'
659
667
  required_rubygems_version: !ruby/object:Gem::Requirement
660
668
  requirements:
661
669
  - - ">="
@@ -663,7 +671,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
663
671
  version: '0'
664
672
  requirements: []
665
673
  rubyforge_project:
666
- rubygems_version: 2.4.5.1
674
+ rubygems_version: 2.5.1
667
675
  signing_key:
668
676
  specification_version: 4
669
677
  summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)