blacklight 5.0.0.pre3 → 5.0.0.pre4
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.
- checksums.yaml +4 -4
- data/.gitignore +9 -16
- data/Gemfile +4 -0
- data/README.md +15 -1
- data/VERSION +1 -1
- data/app/assets/stylesheets/blacklight/_bookmark.css.scss +1 -1
- data/app/assets/stylesheets/blacklight/_catalog.css.scss +2 -12
- data/app/assets/stylesheets/blacklight/_facets.css.scss +1 -1
- data/app/assets/stylesheets/blacklight/_header.css.scss +1 -0
- data/app/assets/stylesheets/blacklight/_modal.css.scss +4 -2
- data/app/assets/stylesheets/blacklight/blacklight_defaults.css.scss +0 -5
- data/app/controllers/bookmarks_controller.rb +4 -0
- data/app/helpers/blacklight/blacklight_helper_behavior.rb +26 -187
- data/app/helpers/blacklight/catalog_helper_behavior.rb +20 -8
- data/app/helpers/blacklight/facets_helper_behavior.rb +0 -83
- data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +1 -1
- data/app/helpers/blacklight/url_helper_behavior.rb +201 -0
- data/app/helpers/blacklight_url_helper.rb +3 -0
- data/app/views/bookmarks/_tools.html.erb +4 -7
- data/app/views/catalog/_citation.html.erb +1 -1
- data/app/views/catalog/_did_you_mean.html.erb +1 -1
- data/app/views/catalog/_document.html.erb +1 -1
- data/app/views/catalog/_search_form.html.erb +1 -1
- data/app/views/catalog/_show_more_like_this.html.erb +1 -1
- data/app/views/catalog/_view_type_group.html.erb +4 -4
- data/app/views/catalog/email.html.erb +2 -2
- data/app/views/catalog/facet.html.erb +1 -1
- data/app/views/catalog/show.html.erb +1 -1
- data/app/views/catalog/sms.html.erb +1 -1
- data/blacklight.gemspec +2 -2
- data/config/jetty.yml +4 -1
- data/config/locales/blacklight.en.yml +3 -0
- data/config/locales/blacklight.fr.yml +3 -0
- data/{lib/generators/blacklight/templates/migrations/create_searches.rb → db/migrate/20140202020201_create_searches.rb} +2 -0
- data/{lib/generators/blacklight/templates/migrations/create_bookmarks.rb → db/migrate/20140202020202_create_bookmarks.rb} +1 -2
- data/gemfiles/rails3.gemfile +2 -0
- data/gemfiles/rails4.gemfile +2 -0
- data/lib/blacklight.rb +1 -40
- data/lib/blacklight/base.rb +3 -9
- data/lib/blacklight/catalog.rb +3 -16
- data/lib/blacklight/catalog/search_context.rb +8 -1
- data/lib/blacklight/configurable.rb +1 -2
- data/lib/blacklight/configuration.rb +13 -3
- data/lib/blacklight/configuration/view_config.rb +71 -0
- data/lib/blacklight/engine.rb +1 -0
- data/lib/blacklight/routes.rb +0 -1
- data/lib/blacklight/solr/document.rb +0 -4
- data/lib/blacklight/solr_helper.rb +8 -2
- data/lib/blacklight/user.rb +1 -16
- data/lib/blacklight/utils.rb +72 -1
- data/lib/generators/blacklight/install_generator.rb +92 -0
- data/lib/generators/blacklight/models_generator.rb +1 -25
- data/lib/generators/blacklight/templates/catalog_controller.rb +28 -32
- data/spec/helpers/blacklight_helper_spec.rb +24 -417
- data/spec/helpers/catalog_helper_spec.rb +13 -13
- data/spec/helpers/facets_helper_spec.rb +0 -127
- data/spec/helpers/hash_as_hidden_fields_spec.rb +1 -1
- data/spec/helpers/url_helper_spec.rb +360 -0
- data/spec/lib/blacklight/configuration_spec.rb +2 -3
- data/spec/lib/blacklight/solr_helper_spec.rb +11 -17
- data/spec/lib/blacklight/user_spec.rb +0 -41
- data/spec/lib/blacklight_spec.rb +0 -22
- data/spec/lib/utils_spec.rb +35 -4
- data/spec/spec_helper.rb +4 -3
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +2 -2
- data/spec/views/catalog/_constraints.html.erb_spec.rb +4 -2
- data/spec/views/catalog/_index_default.erb_spec.rb +1 -1
- data/spec/views/catalog/_paginate_compact.html.erb_spec.rb +1 -5
- data/spec/views/catalog/_show_default.erb_spec.rb +1 -1
- data/spec/views/catalog/_view_type_group.html.erb_spec.rb +11 -3
- data/tasks/blacklight.rake +1 -5
- metadata +14 -16
- data/.gitmodules +0 -0
- data/app/views/catalog/endnote.endnote.erb +0 -1
- data/app/views/catalog/show.endnote.erb +0 -1
- data/lib/generators/blacklight/blacklight_generator.rb +0 -97
- data/lib/generators/blacklight/templates/migrations/add_user_types_to_bookmarks_searches.rb +0 -16
- data/lib/generators/blacklight/templates/migrations/remove_editable_fields_from_bookmarks.rb +0 -12
- data/lib/railties/all_tests.rake +0 -39
- data/lib/railties/blacklight_rspec.rake +0 -128
@@ -40,9 +40,8 @@ describe "Blacklight::Configuration" do
|
|
40
40
|
end
|
41
41
|
|
42
42
|
it "should introspect SolrDocument for sensible defaults for show + index" do
|
43
|
-
expect(@config.show.
|
44
|
-
expect(@config.
|
45
|
-
expect(@config.index.show_link).to eq'id'
|
43
|
+
expect(@config.view_config(:show).title_field).to eq 'id'
|
44
|
+
expect(@config.index.title_field).to eq 'id'
|
46
45
|
end
|
47
46
|
|
48
47
|
it "should have ordered hashes for field configuration" do
|
@@ -26,10 +26,6 @@ describe 'Blacklight::SolrHelper' do
|
|
26
26
|
@config = config
|
27
27
|
end
|
28
28
|
|
29
|
-
def blacklight_solr
|
30
|
-
Blacklight.solr
|
31
|
-
end
|
32
|
-
|
33
29
|
include Blacklight::SolrHelper
|
34
30
|
|
35
31
|
before(:each) do
|
@@ -562,7 +558,7 @@ describe 'Blacklight::SolrHelper' do
|
|
562
558
|
|
563
559
|
it "should use the configured request handler " do
|
564
560
|
blacklight_config.stub(:default_solr_params).and_return({:qt => 'custom_request_handler'})
|
565
|
-
|
561
|
+
blacklight_solr.should_receive(:send_and_receive) do |path, params|
|
566
562
|
expect(path).to eq 'select'
|
567
563
|
expect(params[:params][:'facet.field']).to eq ["format", "{!ex=pub_date_single}pub_date", "subject_topic_facet", "language_facet", "lc_1letter_facet", "subject_geo_facet", "subject_era_facet"]
|
568
564
|
expect(params[:params][:"facet.query"]).to eq ["pub_date:[#{5.years.ago.year} TO *]", "pub_date:[#{10.years.ago.year} TO *]", "pub_date:[#{25.years.ago.year} TO *]"]
|
@@ -636,8 +632,8 @@ describe 'Blacklight::SolrHelper' do
|
|
636
632
|
(solr_response, document_list) = get_search_results(:q => @all_docs_query)
|
637
633
|
result_docs = document_list
|
638
634
|
document = result_docs.first
|
639
|
-
expect(document.get(blacklight_config.index.
|
640
|
-
expect(document.get(blacklight_config.index.
|
635
|
+
expect(document.get(blacklight_config.index.title_field)).not_to be_nil
|
636
|
+
expect(document.get(blacklight_config.index.display_type_field)).not_to be_nil
|
641
637
|
end
|
642
638
|
end
|
643
639
|
|
@@ -856,7 +852,7 @@ describe 'Blacklight::SolrHelper' do
|
|
856
852
|
|
857
853
|
it "should use a provided document request handler " do
|
858
854
|
blacklight_config.stub(:document_solr_request_handler => 'document')
|
859
|
-
|
855
|
+
blacklight_solr.should_receive(:get).with('select', kind_of(Hash)).and_return({'response'=>{'docs'=>[]}})
|
860
856
|
expect { get_solr_response_for_doc_id(@doc_id)}.to raise_error Blacklight::Exceptions::InvalidSolrID
|
861
857
|
end
|
862
858
|
|
@@ -870,9 +866,8 @@ describe 'Blacklight::SolrHelper' do
|
|
870
866
|
expect(@document.id).to eq @doc_id
|
871
867
|
end
|
872
868
|
it 'should have non-nil values for required fields set in initializer' do
|
873
|
-
expect(@document.get(blacklight_config
|
874
|
-
expect(@document.get(blacklight_config
|
875
|
-
expect(@document.get(blacklight_config[:show][:display_type])).not_to be_nil
|
869
|
+
expect(@document.get(blacklight_config.view_config(:show).title_field)).not_to be_nil
|
870
|
+
expect(@document.get(blacklight_config.view_config(:show).display_type_field)).not_to be_nil
|
876
871
|
end
|
877
872
|
end
|
878
873
|
|
@@ -944,9 +939,8 @@ describe 'Blacklight::SolrHelper' do
|
|
944
939
|
end
|
945
940
|
|
946
941
|
it 'should have non-nil values for required fields set in initializer' do
|
947
|
-
expect(@doc[blacklight_config.show.
|
948
|
-
expect(@doc[blacklight_config.show.
|
949
|
-
expect(@doc[blacklight_config.show.display_type]).not_to be_nil
|
942
|
+
expect(@doc[blacklight_config.view_config(:show).title_field]).not_to be_nil
|
943
|
+
expect(@doc[blacklight_config.view_config(:show).display_type_field]).not_to be_nil
|
950
944
|
end
|
951
945
|
|
952
946
|
it "should limit search result by facets when supplied" do
|
@@ -1086,7 +1080,7 @@ describe 'Blacklight::SolrHelper' do
|
|
1086
1080
|
# more like this
|
1087
1081
|
# nearby on shelf
|
1088
1082
|
it "should raise a Blacklight exception if RSolr can't connect to the Solr instance" do
|
1089
|
-
|
1083
|
+
blacklight_solr.stub(:get).and_raise(Errno::ECONNREFUSED)
|
1090
1084
|
expect { find(:a => 123) }.to raise_exception(/Unable to connect to Solr instance/)
|
1091
1085
|
end
|
1092
1086
|
|
@@ -1152,7 +1146,7 @@ describe 'Blacklight::SolrHelper' do
|
|
1152
1146
|
|
1153
1147
|
it "defaults to get" do
|
1154
1148
|
expect(blacklight_config.http_method).to eq :get
|
1155
|
-
|
1149
|
+
blacklight_solr.should_receive(:send_and_receive) do |path, params|
|
1156
1150
|
expect(path).to eq 'select'
|
1157
1151
|
expect(params[:method]).to eq :get
|
1158
1152
|
expect(params[:params]).to include(:q)
|
@@ -1166,7 +1160,7 @@ describe 'Blacklight::SolrHelper' do
|
|
1166
1160
|
|
1167
1161
|
it "keep value set to post" do
|
1168
1162
|
expect(blacklight_config.http_method).to eq :post
|
1169
|
-
|
1163
|
+
blacklight_solr.should_receive(:send_and_receive) do |path, params|
|
1170
1164
|
expect(path).to eq 'select'
|
1171
1165
|
expect(params[:method]).to eq :post
|
1172
1166
|
expect(params[:data]).to include(:q)
|
@@ -8,50 +8,9 @@ describe "Blacklight::User" do
|
|
8
8
|
Bookmark.new :document_id => document_id
|
9
9
|
end
|
10
10
|
|
11
|
-
it "should know if it doesn't have bookmarks" do
|
12
|
-
expect(subject).to_not have_bookmarks
|
13
|
-
end
|
14
|
-
|
15
|
-
it "should know if it has bookmarkss" do
|
16
|
-
subject.bookmarks << mock_bookmark(1)
|
17
|
-
subject.bookmarks << mock_bookmark(2)
|
18
|
-
|
19
|
-
expect(subject).to have_bookmarks
|
20
|
-
end
|
21
|
-
|
22
11
|
it "should know if it has a bookmarked document" do
|
23
12
|
subject.bookmarks << mock_bookmark(1)
|
24
13
|
expect(subject.document_is_bookmarked?(1)).to be_true
|
25
14
|
end
|
26
15
|
|
27
|
-
it "should be able to create bookmarks in batches" do
|
28
|
-
@md1 = { :document_id => 1 }
|
29
|
-
@md2 = { :document_id => 2 }
|
30
|
-
@md3 = { :document_id => 3 }
|
31
|
-
|
32
|
-
subject.documents_to_bookmark= [@md1,@md2,@md3]
|
33
|
-
expect(subject.bookmarks).to have(3).bookmarks
|
34
|
-
expect(subject.bookmarked_document_ids).to include("1","2","3")
|
35
|
-
|
36
|
-
end
|
37
|
-
|
38
|
-
it "should not recreate bookmarks for documents already bookmarked" do
|
39
|
-
subject.bookmarks << mock_bookmark(1)
|
40
|
-
|
41
|
-
@md1 = { :document_id => 1 }
|
42
|
-
subject.bookmarks.should_not_receive(:create).with(@md1)
|
43
|
-
|
44
|
-
subject.bookmarks.push(mock_bookmark(1))
|
45
|
-
subject.documents_to_bookmark=[@md1]
|
46
|
-
end
|
47
|
-
|
48
|
-
it "should know if it doesn't have a search" do
|
49
|
-
expect(subject.has_searches?).to be_false
|
50
|
-
end
|
51
|
-
|
52
|
-
it "should know if it has a search" do
|
53
|
-
subject.searches << Search.new
|
54
|
-
expect(subject.has_searches?).to be_true
|
55
|
-
end
|
56
|
-
|
57
16
|
end
|
data/spec/lib/blacklight_spec.rb
CHANGED
@@ -2,20 +2,6 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
describe Blacklight do
|
4
4
|
|
5
|
-
context "locate_path" do
|
6
|
-
|
7
|
-
it "should find app/controllers/application_controller.rb" do
|
8
|
-
result = Blacklight.locate_path 'app', 'controllers', 'application_controller.rb'
|
9
|
-
expect(result).not_to be_nil
|
10
|
-
end
|
11
|
-
|
12
|
-
it "should not find blah.rb" do
|
13
|
-
result = Blacklight.locate_path 'blah.rb'
|
14
|
-
expect(result).to be_nil
|
15
|
-
end
|
16
|
-
|
17
|
-
end
|
18
|
-
|
19
5
|
context 'root' do
|
20
6
|
|
21
7
|
let(:blroot) { File.expand_path(File.join(__FILE__, '..', '..', '..' )) }
|
@@ -23,14 +9,6 @@ describe Blacklight do
|
|
23
9
|
it 'should return the full path to the BL plugin' do
|
24
10
|
expect(Blacklight.root).to eq blroot
|
25
11
|
end
|
26
|
-
|
27
|
-
it 'should return the full path to the model directory' do
|
28
|
-
expect(Blacklight.models_dir).to eq blroot + "/app/models"
|
29
|
-
end
|
30
|
-
|
31
|
-
it 'should return the full path to the controllers directory' do
|
32
|
-
expect(Blacklight.controllers_dir).to eq blroot + "/app/controllers"
|
33
|
-
end
|
34
12
|
|
35
13
|
end
|
36
14
|
|
data/spec/lib/utils_spec.rb
CHANGED
@@ -33,12 +33,10 @@ describe 'Blacklight::Utils' do
|
|
33
33
|
describe "internal hash table" do
|
34
34
|
before do
|
35
35
|
@h = Blacklight::OpenStructWithHashAccess.new
|
36
|
-
|
37
36
|
@h[:a] = 1
|
38
37
|
@h[:b] = 2
|
39
|
-
|
40
|
-
|
41
38
|
end
|
39
|
+
|
42
40
|
it "should expose the internal hash table" do
|
43
41
|
expect(@h.to_h).to be_a_kind_of(Hash)
|
44
42
|
expect(@h.to_h[:a]).to eq 1
|
@@ -48,10 +46,43 @@ describe 'Blacklight::Utils' do
|
|
48
46
|
expect(@h.keys).to include(:a, :b)
|
49
47
|
end
|
50
48
|
|
51
|
-
|
49
|
+
end
|
50
|
+
|
51
|
+
describe "#merge" do
|
52
|
+
|
53
|
+
before do
|
54
|
+
@h = Blacklight::OpenStructWithHashAccess.new
|
55
|
+
@h[:a] = 1
|
56
|
+
@h[:b] = 2
|
57
|
+
end
|
58
|
+
|
59
|
+
it "should merge the object with a hash" do
|
52
60
|
expect(@h.merge(:a => 'a')[:a]).to eq 'a'
|
53
61
|
end
|
54
62
|
|
63
|
+
it "should merge the object with another struct" do
|
64
|
+
expect(@h.merge(Blacklight::OpenStructWithHashAccess.new(:a => 'a'))[:a]).to eq 'a'
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
68
|
+
|
69
|
+
describe "#merge!" do
|
70
|
+
|
71
|
+
before do
|
72
|
+
@h = Blacklight::OpenStructWithHashAccess.new
|
73
|
+
@h[:a] = 1
|
74
|
+
@h[:b] = 2
|
75
|
+
end
|
76
|
+
|
77
|
+
it "should merge the object with a hash" do
|
78
|
+
@h.merge!(:a => 'a')
|
79
|
+
expect(@h[:a]).to eq 'a'
|
80
|
+
end
|
81
|
+
|
82
|
+
it "should merge the object with another struct" do
|
83
|
+
@h.merge!(Blacklight::OpenStructWithHashAccess.new(:a => 'a'))
|
84
|
+
expect(@h[:a]).to eq 'a'
|
85
|
+
end
|
55
86
|
end
|
56
87
|
end
|
57
88
|
end
|
data/spec/spec_helper.rb
CHANGED
@@ -5,12 +5,13 @@
|
|
5
5
|
|
6
6
|
ENV["RAILS_ENV"] ||= 'test'
|
7
7
|
|
8
|
-
|
9
|
-
if ENV['COVERAGE'] and ruby_engine != "jruby"
|
8
|
+
if ENV["COVERAGE"] or ENV["CI"]
|
10
9
|
require 'simplecov'
|
10
|
+
require 'coveralls'
|
11
11
|
|
12
|
+
SimpleCov.formatter = Coveralls::SimpleCov::Formatter
|
12
13
|
SimpleCov.start do
|
13
|
-
|
14
|
+
add_filter "/spec/"
|
14
15
|
end
|
15
16
|
end
|
16
17
|
|
@@ -22,13 +22,13 @@ class TestAppGenerator < Rails::Generators::Base
|
|
22
22
|
|
23
23
|
def run_blacklight_generator
|
24
24
|
say_status("warning", "GENERATING BL", :yellow)
|
25
|
-
gem 'blacklight_marc', :github => 'projectblacklight/blacklight_marc'
|
25
|
+
gem 'blacklight_marc', ">= 0.0.9", :github => 'projectblacklight/blacklight_marc'
|
26
26
|
|
27
27
|
Bundler.with_clean_env do
|
28
28
|
run "bundle install"
|
29
29
|
end
|
30
30
|
|
31
|
-
generate 'blacklight', '--devise --marc'
|
31
|
+
generate 'blacklight:install', '--devise --marc'
|
32
32
|
end
|
33
33
|
|
34
34
|
def run_test_support_generator
|
@@ -2,7 +2,9 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
describe "catalog/constraints" do
|
4
4
|
let :blacklight_config do
|
5
|
-
Blacklight::Configuration.new
|
5
|
+
Blacklight::Configuration.new do |config|
|
6
|
+
config.view.xyz
|
7
|
+
end
|
6
8
|
end
|
7
9
|
|
8
10
|
it "should render nothing if no constraints are set" do
|
@@ -21,7 +23,7 @@ describe "catalog/constraints" do
|
|
21
23
|
end
|
22
24
|
|
23
25
|
it "should render a start over link with the current view type" do
|
24
|
-
view.should_receive(:search_action_url).with(view:
|
26
|
+
view.should_receive(:search_action_url).with(view: :xyz).and_return('http://xyz?view=xyz')
|
25
27
|
view.stub(query_has_constraints?: true)
|
26
28
|
params[:view] = 'xyz'
|
27
29
|
view.stub(:blacklight_config).and_return(blacklight_config)
|
@@ -9,7 +9,7 @@ describe "/catalog/_index_default.erb" do
|
|
9
9
|
|
10
10
|
before(:each) do
|
11
11
|
@config = Blacklight::Configuration.new do |config|
|
12
|
-
config.show.
|
12
|
+
config.show.display_type_field = 'asdf'
|
13
13
|
config.add_index_field 'one_field', :label => 'One:'
|
14
14
|
config.add_index_field 'empty_field', :label => 'Three:'
|
15
15
|
config.add_index_field 'four_field', :label => 'Four:'
|
@@ -11,10 +11,6 @@ describe "catalog/_paginate_compact.html.erb" do
|
|
11
11
|
@config = config
|
12
12
|
end
|
13
13
|
|
14
|
-
def blacklight_solr
|
15
|
-
Blacklight.solr
|
16
|
-
end
|
17
|
-
|
18
14
|
def facet_limit_for *args
|
19
15
|
0
|
20
16
|
end
|
@@ -42,4 +38,4 @@ describe "catalog/_paginate_compact.html.erb" do
|
|
42
38
|
expect(rendered).to have_selector ".page_entries"
|
43
39
|
expect(rendered).to have_selector "a[@rel=next]"
|
44
40
|
end
|
45
|
-
end
|
41
|
+
end
|
@@ -11,7 +11,7 @@ describe "/catalog/_show_default.html.erb" do
|
|
11
11
|
|
12
12
|
before(:each) do
|
13
13
|
@config = Blacklight::Configuration.new do |config|
|
14
|
-
config.show.
|
14
|
+
config.show.display_type_field = 'asdf'
|
15
15
|
config.add_show_field 'one_field', :label => 'One:'
|
16
16
|
config.add_show_field 'empty_field', :label => 'Three:'
|
17
17
|
config.add_show_field 'four_field', :label => 'Four:'
|
@@ -11,13 +11,17 @@ describe "catalog/_view_type_group" do
|
|
11
11
|
end
|
12
12
|
|
13
13
|
it "should not display the group when there's only one option" do
|
14
|
-
blacklight_config.stub document_index_view_types: ['a']
|
15
14
|
render partial: 'catalog/view_type_group'
|
16
15
|
expect(rendered).to be_empty
|
17
16
|
end
|
18
17
|
|
19
18
|
it "should display the group" do
|
20
|
-
blacklight_config.
|
19
|
+
blacklight_config.configure do |config|
|
20
|
+
config.view.delete(:list)
|
21
|
+
config.view.a
|
22
|
+
config.view.b
|
23
|
+
config.view.c
|
24
|
+
end
|
21
25
|
render partial: 'catalog/view_type_group'
|
22
26
|
expect(rendered).to have_selector('.btn-group.view-type-group')
|
23
27
|
expect(rendered).to have_selector('.view-type-a', :text => 'A')
|
@@ -27,7 +31,11 @@ describe "catalog/_view_type_group" do
|
|
27
31
|
|
28
32
|
|
29
33
|
it "should set the current view to 'active'" do
|
30
|
-
blacklight_config.
|
34
|
+
blacklight_config.configure do |config|
|
35
|
+
config.view.delete(:list)
|
36
|
+
config.view.a
|
37
|
+
config.view.b
|
38
|
+
end
|
31
39
|
render partial: 'catalog/view_type_group'
|
32
40
|
expect(rendered).to have_selector('.active', :text => 'A')
|
33
41
|
expect(rendered).to_not have_selector('.active', :text => 'B')
|
data/tasks/blacklight.rake
CHANGED
@@ -10,16 +10,12 @@ end
|
|
10
10
|
|
11
11
|
desc "Run test suite"
|
12
12
|
task :ci => 'blacklight:clean' do
|
13
|
-
|
14
|
-
jetty_params = Jettywrapper.load_config
|
15
|
-
jetty_params[:startup_wait]= 60
|
13
|
+
jetty_params = Jettywrapper.load_config('test')
|
16
14
|
error = Jettywrapper.wrap(jetty_params) do
|
17
15
|
Rake::Task["blacklight:fixtures"].invoke
|
18
16
|
Rake::Task['blacklight:coverage'].invoke
|
19
17
|
end
|
20
18
|
raise "test failures: #{error}" if error
|
21
|
-
# Only create documentation if the tests have passed
|
22
|
-
#Rake::Task["active_fedora:doc"].invoke
|
23
19
|
end
|
24
20
|
|
25
21
|
namespace :blacklight do
|
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.0.
|
4
|
+
version: 5.0.0.pre4
|
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-
|
20
|
+
date: 2014-02-02 00:00:00.000000000 Z
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|
23
23
|
name: rails
|
@@ -129,28 +129,28 @@ dependencies:
|
|
129
129
|
requirements:
|
130
130
|
- - ">="
|
131
131
|
- !ruby/object:Gem::Version
|
132
|
-
version: 1.
|
132
|
+
version: 1.5.2
|
133
133
|
type: :development
|
134
134
|
prerelease: false
|
135
135
|
version_requirements: !ruby/object:Gem::Requirement
|
136
136
|
requirements:
|
137
137
|
- - ">="
|
138
138
|
- !ruby/object:Gem::Version
|
139
|
-
version: 1.
|
139
|
+
version: 1.5.2
|
140
140
|
- !ruby/object:Gem::Dependency
|
141
141
|
name: blacklight_marc
|
142
142
|
requirement: !ruby/object:Gem::Requirement
|
143
143
|
requirements:
|
144
144
|
- - '='
|
145
145
|
- !ruby/object:Gem::Version
|
146
|
-
version: 0.0.
|
146
|
+
version: 0.0.9
|
147
147
|
type: :development
|
148
148
|
prerelease: false
|
149
149
|
version_requirements: !ruby/object:Gem::Requirement
|
150
150
|
requirements:
|
151
151
|
- - '='
|
152
152
|
- !ruby/object:Gem::Version
|
153
|
-
version: 0.0.
|
153
|
+
version: 0.0.9
|
154
154
|
- !ruby/object:Gem::Dependency
|
155
155
|
name: rspec-rails
|
156
156
|
requirement: !ruby/object:Gem::Requirement
|
@@ -203,7 +203,6 @@ extensions: []
|
|
203
203
|
extra_rdoc_files: []
|
204
204
|
files:
|
205
205
|
- ".gitignore"
|
206
|
-
- ".gitmodules"
|
207
206
|
- ".rspec"
|
208
207
|
- ".travis.yml"
|
209
208
|
- ".yardopts"
|
@@ -250,7 +249,9 @@ files:
|
|
250
249
|
- app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb
|
251
250
|
- app/helpers/blacklight/render_constraints_helper_behavior.rb
|
252
251
|
- app/helpers/blacklight/search_history_constraints_helper_behavior.rb
|
252
|
+
- app/helpers/blacklight/url_helper_behavior.rb
|
253
253
|
- app/helpers/blacklight_helper.rb
|
254
|
+
- app/helpers/blacklight_url_helper.rb
|
254
255
|
- app/helpers/catalog_helper.rb
|
255
256
|
- app/helpers/facets_helper.rb
|
256
257
|
- app/helpers/hash_as_hidden_fields_helper.rb
|
@@ -305,7 +306,6 @@ files:
|
|
305
306
|
- app/views/catalog/citation.js.erb
|
306
307
|
- app/views/catalog/email.html.erb
|
307
308
|
- app/views/catalog/email_sent.html.erb
|
308
|
-
- app/views/catalog/endnote.endnote.erb
|
309
309
|
- app/views/catalog/facet.html.erb
|
310
310
|
- app/views/catalog/index.atom.builder
|
311
311
|
- app/views/catalog/index.html.erb
|
@@ -313,7 +313,6 @@ files:
|
|
313
313
|
- app/views/catalog/opensearch.json.erb
|
314
314
|
- app/views/catalog/opensearch.xml.builder
|
315
315
|
- app/views/catalog/send_email_record.erb
|
316
|
-
- app/views/catalog/show.endnote.erb
|
317
316
|
- app/views/catalog/show.html.erb
|
318
317
|
- app/views/catalog/show.refworks.erb
|
319
318
|
- app/views/catalog/sms.html.erb
|
@@ -339,6 +338,8 @@ files:
|
|
339
338
|
- config/jetty.yml
|
340
339
|
- config/locales/blacklight.en.yml
|
341
340
|
- config/locales/blacklight.fr.yml
|
341
|
+
- db/migrate/20140202020201_create_searches.rb
|
342
|
+
- db/migrate/20140202020202_create_bookmarks.rb
|
342
343
|
- gemfiles/rails3.gemfile
|
343
344
|
- gemfiles/rails4.gemfile
|
344
345
|
- lib/blacklight.rb
|
@@ -352,6 +353,7 @@ files:
|
|
352
353
|
- lib/blacklight/configuration/search_field.rb
|
353
354
|
- lib/blacklight/configuration/solr_field.rb
|
354
355
|
- lib/blacklight/configuration/sort_field.rb
|
356
|
+
- lib/blacklight/configuration/view_config.rb
|
355
357
|
- lib/blacklight/controller.rb
|
356
358
|
- lib/blacklight/engine.rb
|
357
359
|
- lib/blacklight/exceptions.rb
|
@@ -382,7 +384,7 @@ files:
|
|
382
384
|
- lib/blacklight/utils.rb
|
383
385
|
- lib/blacklight/version.rb
|
384
386
|
- lib/generators/blacklight/assets_generator.rb
|
385
|
-
- lib/generators/blacklight/
|
387
|
+
- lib/generators/blacklight/install_generator.rb
|
386
388
|
- lib/generators/blacklight/jetty_generator.rb
|
387
389
|
- lib/generators/blacklight/models_generator.rb
|
388
390
|
- lib/generators/blacklight/templates/alternate_controller.rb
|
@@ -390,15 +392,9 @@ files:
|
|
390
392
|
- lib/generators/blacklight/templates/catalog_controller.rb
|
391
393
|
- lib/generators/blacklight/templates/config/jetty.yml
|
392
394
|
- lib/generators/blacklight/templates/config/solr.yml
|
393
|
-
- lib/generators/blacklight/templates/migrations/add_user_types_to_bookmarks_searches.rb
|
394
|
-
- lib/generators/blacklight/templates/migrations/create_bookmarks.rb
|
395
|
-
- lib/generators/blacklight/templates/migrations/create_searches.rb
|
396
|
-
- lib/generators/blacklight/templates/migrations/remove_editable_fields_from_bookmarks.rb
|
397
395
|
- lib/generators/blacklight/templates/solr_document.rb
|
398
396
|
- lib/generators/blacklight/test_support_generator.rb
|
399
|
-
- lib/railties/all_tests.rake
|
400
397
|
- lib/railties/blacklight.rake
|
401
|
-
- lib/railties/blacklight_rspec.rake
|
402
398
|
- solr/sample_solr_documents.yml
|
403
399
|
- spec/controllers/application_controller_spec.rb
|
404
400
|
- spec/controllers/bookmarks_controller_spec.rb
|
@@ -424,6 +420,7 @@ files:
|
|
424
420
|
- spec/helpers/hash_as_hidden_fields_spec.rb
|
425
421
|
- spec/helpers/render_constraints_helper_spec.rb
|
426
422
|
- spec/helpers/search_history_constraints_helper_spec.rb
|
423
|
+
- spec/helpers/url_helper_spec.rb
|
427
424
|
- spec/lib/blacklight/configurable_spec.rb
|
428
425
|
- spec/lib/blacklight/configuration_spec.rb
|
429
426
|
- spec/lib/blacklight/facet_paginator_spec.rb
|
@@ -526,6 +523,7 @@ test_files:
|
|
526
523
|
- spec/helpers/hash_as_hidden_fields_spec.rb
|
527
524
|
- spec/helpers/render_constraints_helper_spec.rb
|
528
525
|
- spec/helpers/search_history_constraints_helper_spec.rb
|
526
|
+
- spec/helpers/url_helper_spec.rb
|
529
527
|
- spec/lib/blacklight/configurable_spec.rb
|
530
528
|
- spec/lib/blacklight/configuration_spec.rb
|
531
529
|
- spec/lib/blacklight/facet_paginator_spec.rb
|