blacklight 3.2.0 → 3.2.1
Sign up to get free protection for your applications and to get access to all the features.
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.2.
|
1
|
+
3.2.1
|
@@ -53,9 +53,10 @@ module Blacklight::FacetsHelperBehavior
|
|
53
53
|
end
|
54
54
|
options = options.dup
|
55
55
|
options[:partial] ||= facet_partial_name(display_facet)
|
56
|
-
options[:layout] ||= "facet_layout"
|
56
|
+
options[:layout] ||= "facet_layout" unless options.has_key?(:layout)
|
57
57
|
options[:locals] ||= {}
|
58
58
|
options[:locals][:solr_field] ||= display_facet.name
|
59
|
+
options[:locals][:solr_fname] ||= display_facet.name # DEPRECATED
|
59
60
|
options[:locals][:facet_field] ||= facet_configuration_for_field(display_facet.name)
|
60
61
|
options[:locals][:display_facet] ||= display_facet
|
61
62
|
|
@@ -44,6 +44,7 @@ describe FacetsHelper do
|
|
44
44
|
helper.should_receive(:render).with(hash_including(:partial => 'facet_limit',
|
45
45
|
:locals => {
|
46
46
|
:solr_field => 'basic_field',
|
47
|
+
:solr_fname => 'basic_field',
|
47
48
|
:facet_field => helper.blacklight_config.facet_fields['basic_field'],
|
48
49
|
:display_facet => @mock_facet }
|
49
50
|
))
|
@@ -67,6 +68,18 @@ describe FacetsHelper do
|
|
67
68
|
helper.should_receive(:render).with(hash_including(:partial => 'custom_facet_partial'))
|
68
69
|
helper.render_facet_limit(@mock_facet)
|
69
70
|
end
|
71
|
+
|
72
|
+
it "should use a partial layout for rendering the facet frame" do
|
73
|
+
@mock_facet = mock(:name => 'my_facet_field_with_custom_partial')
|
74
|
+
helper.should_receive(:render).with(hash_including(:layout => 'facet_layout'))
|
75
|
+
helper.render_facet_limit(@mock_facet)
|
76
|
+
end
|
77
|
+
|
78
|
+
it "should allow the caller to opt-out of facet layouts" do
|
79
|
+
@mock_facet = mock(:name => 'my_facet_field_with_custom_partial')
|
80
|
+
helper.should_receive(:render).with(hash_including(:layout => nil))
|
81
|
+
helper.render_facet_limit(@mock_facet, :layout => nil)
|
82
|
+
end
|
70
83
|
end
|
71
84
|
|
72
85
|
describe "add_facet_params" 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: 3.2.
|
4
|
+
version: 3.2.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -16,11 +16,11 @@ authors:
|
|
16
16
|
autorequire:
|
17
17
|
bindir: bin
|
18
18
|
cert_chain: []
|
19
|
-
date: 2011-12-
|
19
|
+
date: 2011-12-16 00:00:00.000000000 Z
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
22
22
|
name: rails
|
23
|
-
requirement: &
|
23
|
+
requirement: &2164460960 !ruby/object:Gem::Requirement
|
24
24
|
none: false
|
25
25
|
requirements:
|
26
26
|
- - ~>
|
@@ -28,10 +28,10 @@ dependencies:
|
|
28
28
|
version: 3.1.1
|
29
29
|
type: :runtime
|
30
30
|
prerelease: false
|
31
|
-
version_requirements: *
|
31
|
+
version_requirements: *2164460960
|
32
32
|
- !ruby/object:Gem::Dependency
|
33
33
|
name: nokogiri
|
34
|
-
requirement: &
|
34
|
+
requirement: &2164459800 !ruby/object:Gem::Requirement
|
35
35
|
none: false
|
36
36
|
requirements:
|
37
37
|
- - ~>
|
@@ -39,10 +39,10 @@ dependencies:
|
|
39
39
|
version: '1.5'
|
40
40
|
type: :runtime
|
41
41
|
prerelease: false
|
42
|
-
version_requirements: *
|
42
|
+
version_requirements: *2164459800
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: unicode
|
45
|
-
requirement: &
|
45
|
+
requirement: &2164459020 !ruby/object:Gem::Requirement
|
46
46
|
none: false
|
47
47
|
requirements:
|
48
48
|
- - ! '>='
|
@@ -50,10 +50,10 @@ dependencies:
|
|
50
50
|
version: '0'
|
51
51
|
type: :runtime
|
52
52
|
prerelease: false
|
53
|
-
version_requirements: *
|
53
|
+
version_requirements: *2164459020
|
54
54
|
- !ruby/object:Gem::Dependency
|
55
55
|
name: marc
|
56
|
-
requirement: &
|
56
|
+
requirement: &2164457760 !ruby/object:Gem::Requirement
|
57
57
|
none: false
|
58
58
|
requirements:
|
59
59
|
- - ~>
|
@@ -61,10 +61,10 @@ dependencies:
|
|
61
61
|
version: 0.4.3
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
|
-
version_requirements: *
|
64
|
+
version_requirements: *2164457760
|
65
65
|
- !ruby/object:Gem::Dependency
|
66
66
|
name: rsolr
|
67
|
-
requirement: &
|
67
|
+
requirement: &2164456000 !ruby/object:Gem::Requirement
|
68
68
|
none: false
|
69
69
|
requirements:
|
70
70
|
- - ~>
|
@@ -72,10 +72,10 @@ dependencies:
|
|
72
72
|
version: 1.0.6
|
73
73
|
type: :runtime
|
74
74
|
prerelease: false
|
75
|
-
version_requirements: *
|
75
|
+
version_requirements: *2164456000
|
76
76
|
- !ruby/object:Gem::Dependency
|
77
77
|
name: rsolr-ext
|
78
|
-
requirement: &
|
78
|
+
requirement: &2164455440 !ruby/object:Gem::Requirement
|
79
79
|
none: false
|
80
80
|
requirements:
|
81
81
|
- - ~>
|
@@ -83,10 +83,10 @@ dependencies:
|
|
83
83
|
version: 1.0.3
|
84
84
|
type: :runtime
|
85
85
|
prerelease: false
|
86
|
-
version_requirements: *
|
86
|
+
version_requirements: *2164455440
|
87
87
|
- !ruby/object:Gem::Dependency
|
88
88
|
name: kaminari
|
89
|
-
requirement: &
|
89
|
+
requirement: &2164454860 !ruby/object:Gem::Requirement
|
90
90
|
none: false
|
91
91
|
requirements:
|
92
92
|
- - ! '>='
|
@@ -94,10 +94,10 @@ dependencies:
|
|
94
94
|
version: '0'
|
95
95
|
type: :runtime
|
96
96
|
prerelease: false
|
97
|
-
version_requirements: *
|
97
|
+
version_requirements: *2164454860
|
98
98
|
- !ruby/object:Gem::Dependency
|
99
99
|
name: sass-rails
|
100
|
-
requirement: &
|
100
|
+
requirement: &2164454200 !ruby/object:Gem::Requirement
|
101
101
|
none: false
|
102
102
|
requirements:
|
103
103
|
- - ~>
|
@@ -105,10 +105,10 @@ dependencies:
|
|
105
105
|
version: 3.1.1
|
106
106
|
type: :runtime
|
107
107
|
prerelease: false
|
108
|
-
version_requirements: *
|
108
|
+
version_requirements: *2164454200
|
109
109
|
- !ruby/object:Gem::Dependency
|
110
110
|
name: jettywrapper
|
111
|
-
requirement: &
|
111
|
+
requirement: &2164478240 !ruby/object:Gem::Requirement
|
112
112
|
none: false
|
113
113
|
requirements:
|
114
114
|
- - ! '>='
|
@@ -116,10 +116,10 @@ dependencies:
|
|
116
116
|
version: 1.2.0
|
117
117
|
type: :development
|
118
118
|
prerelease: false
|
119
|
-
version_requirements: *
|
119
|
+
version_requirements: *2164478240
|
120
120
|
- !ruby/object:Gem::Dependency
|
121
121
|
name: compass
|
122
|
-
requirement: &
|
122
|
+
requirement: &2164477480 !ruby/object:Gem::Requirement
|
123
123
|
none: false
|
124
124
|
requirements:
|
125
125
|
- - ! '>='
|
@@ -127,7 +127,7 @@ dependencies:
|
|
127
127
|
version: 0.12.alpha.2
|
128
128
|
type: :runtime
|
129
129
|
prerelease: false
|
130
|
-
version_requirements: *
|
130
|
+
version_requirements: *2164477480
|
131
131
|
description: Blacklight is a free and open source ruby-on-rails based discovery interface
|
132
132
|
(a.k.a. “next-generation catalog”) especially optimized for heterogeneous collections.
|
133
133
|
You can use it as a library catalog, as a front end for a digital repository, or
|
@@ -435,7 +435,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
435
435
|
version: '0'
|
436
436
|
segments:
|
437
437
|
- 0
|
438
|
-
hash:
|
438
|
+
hash: 3140418882790698087
|
439
439
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
440
440
|
none: false
|
441
441
|
requirements:
|
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
444
444
|
version: '0'
|
445
445
|
segments:
|
446
446
|
- 0
|
447
|
-
hash:
|
447
|
+
hash: 3140418882790698087
|
448
448
|
requirements: []
|
449
449
|
rubyforge_project: blacklight
|
450
450
|
rubygems_version: 1.8.10
|