blacklight 6.0.1 → 6.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +2 -0
  3. data/README.md +3 -5
  4. data/VERSION +1 -1
  5. data/app/views/catalog/_results_pagination.html.erb +1 -1
  6. data/blacklight.gemspec +2 -2
  7. data/lib/generators/blacklight/install_generator.rb +3 -1
  8. data/lib/generators/blacklight/solr4_generator.rb +2 -2
  9. data/lib/generators/blacklight/solr5_generator.rb +3 -1
  10. data/solr/conf/solrconfig.xml +0 -1
  11. data/spec/test_app_templates/Gemfile.extra +0 -2
  12. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ec40efd384aeece9251a5a0c48ade57523ea6ce5
4
- data.tar.gz: a44796b19ca9c6194f9443049e763faaf20c6620
3
+ metadata.gz: 5963608c415b8842869d7eed4bf5e5c085eacfb1
4
+ data.tar.gz: 3e87f351736a2c550d5b044495f4887016c5d086
5
5
  SHA512:
6
- metadata.gz: 886748c96a35a2946a512c12394c280b96a98f49e245f297c32edd743714d2e9ae8584a7337e1dc4c2d1236d2050c69b8526bcaf040432b8fac863dd003d8146
7
- data.tar.gz: a6f1abdc691dacd50af6b2387ee588a4c39ad357c3034a2c92ec0ad9dd12c7954a10a31036c6fe4d717ea9724339fef72167084d0627406b5e79b9ec62289455
6
+ metadata.gz: d29ad4a070c192929e7f3b5bec0743796ec56ce01dc8380eafbe13c79a33aba3c1e79a09893e7acb748786cd455445696fc658e5308c4fe77f98a1b57f4177f5
7
+ data.tar.gz: d17df306da1fcc106a4254d7b0509653b5944f3b469f980ab795e22f7d8a741200511808f31d1983a27c5533fb3090ce49e8045ca1ec4d06417195214d37e6d1
data/.travis.yml CHANGED
@@ -16,6 +16,8 @@ matrix:
16
16
  env: "RAILS_VERSION=4.2.5"
17
17
  - rvm: 2.2.4
18
18
  env: "RAILS_VERSION=4.2.5"
19
+ - rvm: 2.3.0
20
+ env: "RAILS_VERSION=5.0.0.beta2"
19
21
  - rvm: jruby-9.0.4.0
20
22
  env: "RAILS_VERSION=4.2.5 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
21
23
  allow_failures:
data/README.md CHANGED
@@ -34,11 +34,9 @@ rails generate blacklight:install
34
34
 
35
35
  ## Dependencies
36
36
 
37
- * ruby v2.0 or higher
38
- * git
39
- * access to a command prompt on the machine to install
40
-
41
- In addition, you must have the Bundler and Rails 4.1 (or greater) gems installed. Other gem dependencies are defined in the blacklight.gemspec file and will be automatically loaded by Bundler.
37
+ * Ruby 2.1+
38
+ * Bundler
39
+ * Rails 4.2+
42
40
 
43
41
  ## Configuring Apache Solr
44
42
  You'll also want some information about how Blacklight expects [Apache Solr](http://lucene.apache.org/solr ) to run, which you can find in [README_SOLR](https://github.com/projectblacklight/blacklight/wiki/README_SOLR)
data/VERSION CHANGED
@@ -1 +1 @@
1
- 6.0.1
1
+ 6.0.2
data/app/views/catalog/_results_pagination.html.erb CHANGED
@@ -1,6 +1,6 @@
1
1
  <% if show_pagination? and @response.total_pages > 1 %>
2
2
  <div class="row record-padding">
3
- <div class="col-md-9">
3
+ <div class="col-md-12">
4
4
  <div class="pagination">
5
5
  <%= paginate @response, :outer_window => 2, :theme => 'blacklight' %>
6
6
  </div>
data/blacklight.gemspec CHANGED
@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
20
20
  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
21
21
  s.require_paths = ["lib"]
22
22
 
23
- s.required_ruby_version = '~> 2.0'
23
+ s.required_ruby_version = '~> 2.1'
24
24
 
25
- s.add_dependency "rails", ">= 4.1", "< 5"
25
+ s.add_dependency "rails", ">= 4.2", "< 6"
26
26
  s.add_dependency "globalid"
27
27
  s.add_dependency "nokogiri", "~>1.6" # XML Parser
28
28
  s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
data/lib/generators/blacklight/install_generator.rb CHANGED
@@ -28,7 +28,9 @@ module Blacklight
28
28
  """
29
29
 
30
30
  def add_solr_wrapper
31
- if solr_version == 'latest'
31
+ if options[:jettywrapper]
32
+ generate 'blacklight:solr4'
33
+ elsif solr_version == 'latest'
32
34
  generate 'blacklight:solr5'
33
35
  else
34
36
  generate "blacklight:solr#{solr_version}"
data/lib/generators/blacklight/solr4_generator.rb CHANGED
@@ -11,7 +11,7 @@ This generator makes the following changes to your application:
11
11
 
12
12
  def install_jettywrapper
13
13
  return unless options[:jettywrapper]
14
- gem "jettywrapper", ">= 2.0"
14
+ gem "jettywrapper".dup, ">= 2.0"
15
15
 
16
16
  copy_file "config/jetty.yml"
17
17
 
@@ -21,7 +21,7 @@ This generator makes the following changes to your application:
21
21
  end
22
22
 
23
23
  def add_rsolr_gem
24
- gem "rsolr", "~> 1.0.6"
24
+ gem "rsolr".dup, "~> 1.0.6"
25
25
  end
26
26
 
27
27
  end
data/lib/generators/blacklight/solr5_generator.rb CHANGED
@@ -9,7 +9,9 @@ module Blacklight
9
9
  EOF
10
10
 
11
11
  def install_solrwrapper
12
- gem 'solr_wrapper', '>= 0.3'
12
+ gem_group :development, :test do
13
+ gem 'solr_wrapper', '>= 0.3'
14
+ end
13
15
 
14
16
  append_to_file "Rakefile", "\nrequire 'solr_wrapper/rake_task'\n"
15
17
  end
data/solr/conf/solrconfig.xml CHANGED
@@ -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>
data/spec/test_app_templates/Gemfile.extra CHANGED
@@ -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
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.1
4
+ version: 6.0.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-01-26 00:00:00.000000000 Z
20
+ date: 2016-02-22 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
@@ -656,7 +656,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
656
656
  requirements:
657
657
  - - "~>"
658
658
  - !ruby/object:Gem::Version
659
- version: '2.0'
659
+ version: '2.1'
660
660
  required_rubygems_version: !ruby/object:Gem::Requirement
661
661
  requirements:
662
662
  - - ">="