blacklight 5.0.2 → 5.0.3

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: 39a6ce9d4e75308e52d555bfc2a9142e4a3e323c
4
- data.tar.gz: 98fed869e782531d52fd52ba807411ad8c200f59
3
+ metadata.gz: 7dabf17ff15de58d015662a3f76b993373abddd2
4
+ data.tar.gz: 8a05023c77d84fae2f3221740157c887789c74b7
5
5
  SHA512:
6
- metadata.gz: 8008cc989c982ebb220ae69d01e39070c7b07078ed18bccceb3b64af6c8963eafd7a7e5023cb8925c6cf9da4d8bd1f438fe5f12813835c2c2a56760bcdb16851
7
- data.tar.gz: 05e632077c43895265057e9da360862554d69386f42f90d17faee1130877f63e939ee7db9e4fe4cf461dd2d9a5883b9e4b42c2727f5ad8ccaa8e528ec4b991b2
6
+ metadata.gz: 9f3c1b6f201964e4481be952d25d53c85960351dd304c83c884ca2a5000e517e160738f4f7763b6c118cf98f7bb8888cc9006ec14673261ba798afce20cf945a
7
+ data.tar.gz: e997713b7968192f908ee5c6d251f9e5a3f86f4789745bb9605cd9a747520920f1e3cacac84a87758b00bcaf0b3e23819c7039e16c2a14b51a46993857fb149b
data/.gitignore CHANGED
@@ -11,5 +11,5 @@ log/*
11
11
  solr_marc/solrmarc.log
12
12
  lib/solrmarc.log.*
13
13
  tmp/*
14
- spec/internal/
15
- pkg/*
14
+ pkg/*
15
+ spec/internal
data/Gemfile CHANGED
@@ -1,21 +1,21 @@
1
1
  source 'https://rubygems.org'
2
2
 
3
3
  # Please see blacklight.gemspec for dependency information.
4
- gemspec
4
+ gemspec path: File.expand_path('..', __FILE__)
5
5
 
6
6
 
7
7
  gem 'simplecov', require: false
8
8
  gem 'coveralls', require: false
9
9
 
10
+ gem 'engine_cart', '~> 0.3.0'
11
+
10
12
  group :test do
11
- gem 'devise'
12
- gem 'devise-guests'
13
- gem "bootstrap-sass"
14
- gem 'turbolinks'
15
- gem 'sass-rails'
16
- gem 'blacklight-marc', :github => 'projectblacklight/blacklight_marc'
13
+ gem "blacklight-marc", "~> 5.0", github: "projectblacklight/blacklight_marc"
14
+ gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
17
15
  end
18
16
 
19
- if File.exists?('spec/test_app_templates/Gemfile.extra')
20
- eval File.read('spec/test_app_templates/Gemfile.extra'), nil, 'spec/test_app_templates/Gemfile.extra'
17
+ file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
18
+ if File.exists?(file)
19
+ puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
20
+ instance_eval File.read(file)
21
21
  end
data/Rakefile CHANGED
@@ -1,5 +1,6 @@
1
1
  # encoding: UTF-8
2
2
  require 'rubygems'
3
+ require 'rails'
3
4
  begin
4
5
  require 'bundler/setup'
5
6
  rescue LoadError
data/VERSION CHANGED
@@ -1 +1 @@
1
- 5.0.2
1
+ 5.0.3
@@ -205,4 +205,9 @@ module Blacklight::UrlHelperBehavior
205
205
  p
206
206
  end
207
207
 
208
- end
208
+ if ::Rails.version < "4.0"
209
+ def asset_url *args
210
+ "#{request.protocol}#{request.host_with_port}#{asset_path(*args)}"
211
+ end
212
+ end
213
+ end
@@ -17,18 +17,18 @@ Gem::Specification.new do |s|
17
17
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
18
18
  s.require_paths = ["lib"]
19
19
 
20
- # PRODUCTION GEM REQUIREMENTS
21
- # ---------------------------------------
22
20
  s.add_dependency "rails", ">= 3.2.6", "< 5"
23
21
  s.add_dependency "nokogiri", "~>1.6" # XML Parser
24
22
  s.add_dependency "kaminari", "~> 0.13" # the pagination (page 1,2,3, etc..) of our search results
25
23
  s.add_dependency "rsolr", "~> 1.0.6" # Library for interacting with rSolr.
26
- s.add_dependency "sass-rails"
27
24
  s.add_dependency "bootstrap-sass", "~> 3.0"
28
25
  s.add_dependency "deprecation"
26
+
29
27
  s.add_development_dependency "jettywrapper", ">= 1.5.2"
30
28
  s.add_development_dependency "blacklight-marc", "~> 5.0"
31
29
  s.add_development_dependency "rspec-rails"
30
+ s.add_development_dependency "capybara"
31
+ s.add_development_dependency "poltergeist"
32
32
  s.add_development_dependency 'engine_cart', ">= 0.1.0"
33
33
  s.add_development_dependency "equivalent-xml"
34
34
  end
@@ -1,23 +1,9 @@
1
1
  source 'http://rubygems.org'
2
2
 
3
- # Please see blacklight.gemspec for dependency information.
4
- gemspec :path=>"../"
5
-
6
- gem 'rails', "~> 3.2"
7
-
8
- gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
9
-
10
- group :test do
11
- gem 'simplecov', require: false
12
- gem 'coveralls', require: false
13
- gem 'devise'
14
- gem 'devise-guests'
15
- gem "bootstrap-sass"
16
- gem 'turbolinks'
17
- gem 'uglifier'
3
+ file = File.expand_path("../../Gemfile", __FILE__)
4
+ if File.exists?(file)
5
+ puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
6
+ instance_eval File.read(file)
18
7
  end
19
8
 
20
- f = File.expand_path(File.dirname(__FILE__) + '/../spec/test_app_templates/Gemfile.extra')
21
- if File.exists?(f)
22
- eval File.read(f), nil, f
23
- end
9
+ gem 'rails', "3.2.17"
@@ -1,22 +1,10 @@
1
1
  source 'http://rubygems.org'
2
2
 
3
- # Please see blacklight.gemspec for dependency information.
4
- gemspec :path=>"../"
3
+ file = File.expand_path("../../Gemfile", __FILE__)
5
4
 
6
- gem 'rails', '~> 4.0.0'
7
-
8
- gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
9
-
10
- group :test do
11
- gem 'simplecov', require: false
12
- gem 'coveralls', require: false
13
- gem 'devise'
14
- gem 'devise-guests'
15
- gem "bootstrap-sass"
16
- gem 'turbolinks'
5
+ if File.exists?(file)
6
+ puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
7
+ instance_eval File.read(file)
17
8
  end
18
9
 
19
- f = File.expand_path(File.dirname(__FILE__) + '/../spec/test_app_templates/Gemfile.extra')
20
- if File.exists?(f)
21
- eval File.read(f), nil, f
22
- end
10
+ gem 'rails', '4.0.3'
@@ -11,13 +11,8 @@ class TestAppGenerator < Rails::Generators::Base
11
11
  end
12
12
  end
13
13
 
14
- def copy_blacklight_test_app_rake_task
15
- copy_file "lib/tasks/blacklight_test_app.rake"
16
- end
17
-
18
14
  def remove_index
19
15
  remove_file "public/index.html"
20
- remove_file 'app/assets/images/rails.png'
21
16
  end
22
17
 
23
18
  def run_blacklight_generator
@@ -0,0 +1,10 @@
1
+ require 'spec_helper'
2
+
3
+ describe 'catalog/opensearch.xml.builder' do
4
+ it "should render an OpenSearch description document" do
5
+ render
6
+ doc = Nokogiri::XML.parse(rendered)
7
+ doc.remove_namespaces!
8
+ expect(doc.xpath('/OpenSearchDescription').length).to eq 1
9
+ end
10
+ 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: 5.0.2
4
+ version: 5.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
17
17
  autorequire:
18
18
  bindir: bin
19
19
  cert_chain: []
20
- date: 2014-02-13 00:00:00.000000000 Z
20
+ date: 2014-03-13 00:00:00.000000000 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: rails
@@ -81,20 +81,6 @@ dependencies:
81
81
  - - "~>"
82
82
  - !ruby/object:Gem::Version
83
83
  version: 1.0.6
84
- - !ruby/object:Gem::Dependency
85
- name: sass-rails
86
- requirement: !ruby/object:Gem::Requirement
87
- requirements:
88
- - - ">="
89
- - !ruby/object:Gem::Version
90
- version: '0'
91
- type: :runtime
92
- prerelease: false
93
- version_requirements: !ruby/object:Gem::Requirement
94
- requirements:
95
- - - ">="
96
- - !ruby/object:Gem::Version
97
- version: '0'
98
84
  - !ruby/object:Gem::Dependency
99
85
  name: bootstrap-sass
100
86
  requirement: !ruby/object:Gem::Requirement
@@ -165,6 +151,34 @@ dependencies:
165
151
  - - ">="
166
152
  - !ruby/object:Gem::Version
167
153
  version: '0'
154
+ - !ruby/object:Gem::Dependency
155
+ name: capybara
156
+ requirement: !ruby/object:Gem::Requirement
157
+ requirements:
158
+ - - ">="
159
+ - !ruby/object:Gem::Version
160
+ version: '0'
161
+ type: :development
162
+ prerelease: false
163
+ version_requirements: !ruby/object:Gem::Requirement
164
+ requirements:
165
+ - - ">="
166
+ - !ruby/object:Gem::Version
167
+ version: '0'
168
+ - !ruby/object:Gem::Dependency
169
+ name: poltergeist
170
+ requirement: !ruby/object:Gem::Requirement
171
+ requirements:
172
+ - - ">="
173
+ - !ruby/object:Gem::Version
174
+ version: '0'
175
+ type: :development
176
+ prerelease: false
177
+ version_requirements: !ruby/object:Gem::Requirement
178
+ requirements:
179
+ - - ">="
180
+ - !ruby/object:Gem::Version
181
+ version: '0'
168
182
  - !ruby/object:Gem::Dependency
169
183
  name: engine_cart
170
184
  requirement: !ruby/object:Gem::Requirement
@@ -455,9 +469,7 @@ files:
455
469
  - spec/support/features.rb
456
470
  - spec/support/features/session_helpers.rb
457
471
  - spec/support/include_text.rb
458
- - spec/test_app_templates/Gemfile.extra
459
472
  - spec/test_app_templates/lib/generators/test_app_generator.rb
460
- - spec/test_app_templates/lib/tasks/blacklight_test_app.rake
461
473
  - spec/views/catalog/_constraints.html.erb_spec.rb
462
474
  - spec/views/catalog/_constraints_element.html.erb_spec.rb
463
475
  - spec/views/catalog/_document.html.erb_spec.rb
@@ -475,6 +487,7 @@ files:
475
487
  - spec/views/catalog/_view_type_group.html.erb_spec.rb
476
488
  - spec/views/catalog/index.atom.builder_spec.rb
477
489
  - spec/views/catalog/index.html.erb_spec.rb
490
+ - spec/views/catalog/opensearch.xml.builder_spec.rb
478
491
  - spec/views/catalog/show.html.erb_spec.rb
479
492
  - tasks/blacklight.rake
480
493
  homepage: http://projectblacklight.org/
@@ -497,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
497
510
  version: '0'
498
511
  requirements: []
499
512
  rubyforge_project:
500
- rubygems_version: 2.2.0
513
+ rubygems_version: 2.2.2
501
514
  signing_key:
502
515
  specification_version: 4
503
516
  summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -559,9 +572,7 @@ test_files:
559
572
  - spec/support/features.rb
560
573
  - spec/support/features/session_helpers.rb
561
574
  - spec/support/include_text.rb
562
- - spec/test_app_templates/Gemfile.extra
563
575
  - spec/test_app_templates/lib/generators/test_app_generator.rb
564
- - spec/test_app_templates/lib/tasks/blacklight_test_app.rake
565
576
  - spec/views/catalog/_constraints.html.erb_spec.rb
566
577
  - spec/views/catalog/_constraints_element.html.erb_spec.rb
567
578
  - spec/views/catalog/_document.html.erb_spec.rb
@@ -579,4 +590,5 @@ test_files:
579
590
  - spec/views/catalog/_view_type_group.html.erb_spec.rb
580
591
  - spec/views/catalog/index.atom.builder_spec.rb
581
592
  - spec/views/catalog/index.html.erb_spec.rb
593
+ - spec/views/catalog/opensearch.xml.builder_spec.rb
582
594
  - spec/views/catalog/show.html.erb_spec.rb
@@ -1,21 +0,0 @@
1
- platforms :jruby do
2
- gem 'jdbc-sqlite3'
3
- gem 'mediashelf-loggable', '>= 0.4.8'
4
- gem 'therubyrhino'
5
- end
6
-
7
- platforms :ruby do
8
- gem 'sqlite3'
9
- end
10
-
11
- gem 'jquery-rails'
12
-
13
- group :test do
14
- gem 'rspec-rails', '~> 2.13'
15
- gem 'generator_spec'
16
- gem 'poltergeist'
17
- gem 'simplecov'
18
- end
19
-
20
- gem 'jettywrapper', '>= 1.2.0'
21
-
@@ -1,14 +0,0 @@
1
- require 'rspec/core/rake_task'
2
-
3
- desc "run the blacklight gem spec"
4
- gem_home = File.expand_path('../../../../..', __FILE__)
5
-
6
- namespace :blacklight_test_app do
7
-
8
- RSpec::Core::RakeTask.new(:spec) do |t|
9
- t.pattern = gem_home + '/spec/**/*_spec.rb'
10
- t.rspec_opts = "--colour"
11
- t.ruby_opts = "-I#{gem_home}/spec"
12
- end
13
-
14
- end