blacklight_advanced_search 1.2.3 → 1.2.4

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.2.3
1
+ 1.2.4
@@ -33,8 +33,20 @@ module AdvancedHelper
33
33
  my_params
34
34
  end
35
35
 
36
- def search_fields_for_advanced_search
37
- blacklight_config.search_fields
36
+ def search_fields_for_advanced_search
37
+ # If we could count on 1.9.3 with ordered hashes and
38
+ # Hash#select that worked reasonably, this would be trivial.
39
+ # instead, a way compat with 1.8.7 and 1.9.x both.
40
+ @search_fields_for_advanced_search ||= begin
41
+ # make it an ActiveSupport::OrderedHash if it needs to be
42
+ hash = blacklight_config.search_fields.class.new
43
+
44
+ blacklight_config.search_fields.each_pair do |key, value|
45
+ hash[key] = value unless value.include_in_advanced_search == false
46
+ end
47
+
48
+ hash
49
+ end
38
50
  end
39
51
 
40
52
  end
@@ -1,4 +1,4 @@
1
- <%- blacklight_config.search_fields.each do |key, field_def| -%>
1
+ <%- search_fields_for_advanced_search.each do |key, field_def| -%>
2
2
  <div class="advanced_search_field">
3
3
  <%= label_tag key, "#{field_def.label }:" %>
4
4
  <%= text_field_tag key, label_tag_default_for(key) %>
metadata CHANGED
@@ -1,115 +1,155 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: blacklight_advanced_search
3
- version: !ruby/object:Gem::Version
4
- version: 1.2.3
3
+ version: !ruby/object:Gem::Version
4
+ hash: 23
5
5
  prerelease:
6
+ segments:
7
+ - 1
8
+ - 2
9
+ - 4
10
+ version: 1.2.4
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Jonathan Rochkind
9
14
  - Chris Beer
10
15
  autorequire:
11
16
  bindir: bin
12
17
  cert_chain: []
13
- date: 2012-04-03 00:00:00.000000000 Z
14
- dependencies:
15
- - !ruby/object:Gem::Dependency
18
+
19
+ date: 2012-04-12 00:00:00 Z
20
+ dependencies:
21
+ - !ruby/object:Gem::Dependency
16
22
  name: rails
17
- requirement: &11933380 !ruby/object:Gem::Requirement
23
+ prerelease: false
24
+ requirement: &id001 !ruby/object:Gem::Requirement
18
25
  none: false
19
- requirements:
26
+ requirements:
20
27
  - - ~>
21
- - !ruby/object:Gem::Version
22
- version: '3.0'
28
+ - !ruby/object:Gem::Version
29
+ hash: 7
30
+ segments:
31
+ - 3
32
+ - 0
33
+ version: "3.0"
23
34
  type: :runtime
24
- prerelease: false
25
- version_requirements: *11933380
26
- - !ruby/object:Gem::Dependency
35
+ version_requirements: *id001
36
+ - !ruby/object:Gem::Dependency
27
37
  name: blacklight
28
- requirement: &11932060 !ruby/object:Gem::Requirement
38
+ prerelease: false
39
+ requirement: &id002 !ruby/object:Gem::Requirement
29
40
  none: false
30
- requirements:
31
- - - ! '>='
32
- - !ruby/object:Gem::Version
41
+ requirements:
42
+ - - ">="
43
+ - !ruby/object:Gem::Version
44
+ hash: 13
45
+ segments:
46
+ - 3
47
+ - 2
48
+ - 1
33
49
  version: 3.2.1
34
50
  - - ~>
35
- - !ruby/object:Gem::Version
36
- version: '3.2'
51
+ - !ruby/object:Gem::Version
52
+ hash: 3
53
+ segments:
54
+ - 3
55
+ - 2
56
+ version: "3.2"
37
57
  type: :runtime
38
- prerelease: false
39
- version_requirements: *11932060
40
- - !ruby/object:Gem::Dependency
58
+ version_requirements: *id002
59
+ - !ruby/object:Gem::Dependency
41
60
  name: parslet
42
- requirement: &11930240 !ruby/object:Gem::Requirement
61
+ prerelease: false
62
+ requirement: &id003 !ruby/object:Gem::Requirement
43
63
  none: false
44
- requirements:
45
- - - ! '>='
46
- - !ruby/object:Gem::Version
47
- version: '0'
64
+ requirements:
65
+ - - ">="
66
+ - !ruby/object:Gem::Version
67
+ hash: 3
68
+ segments:
69
+ - 0
70
+ version: "0"
48
71
  type: :runtime
49
- prerelease: false
50
- version_requirements: *11930240
51
- - !ruby/object:Gem::Dependency
72
+ version_requirements: *id003
73
+ - !ruby/object:Gem::Dependency
52
74
  name: rspec
53
- requirement: &11928860 !ruby/object:Gem::Requirement
75
+ prerelease: false
76
+ requirement: &id004 !ruby/object:Gem::Requirement
54
77
  none: false
55
- requirements:
56
- - - ! '>='
57
- - !ruby/object:Gem::Version
58
- version: '0'
78
+ requirements:
79
+ - - ">="
80
+ - !ruby/object:Gem::Version
81
+ hash: 3
82
+ segments:
83
+ - 0
84
+ version: "0"
59
85
  type: :development
60
- prerelease: false
61
- version_requirements: *11928860
62
- - !ruby/object:Gem::Dependency
86
+ version_requirements: *id004
87
+ - !ruby/object:Gem::Dependency
63
88
  name: rspec-rails
64
- requirement: &11928440 !ruby/object:Gem::Requirement
89
+ prerelease: false
90
+ requirement: &id005 !ruby/object:Gem::Requirement
65
91
  none: false
66
- requirements:
67
- - - ! '>='
68
- - !ruby/object:Gem::Version
69
- version: '0'
92
+ requirements:
93
+ - - ">="
94
+ - !ruby/object:Gem::Version
95
+ hash: 3
96
+ segments:
97
+ - 0
98
+ version: "0"
70
99
  type: :development
71
- prerelease: false
72
- version_requirements: *11928440
73
- - !ruby/object:Gem::Dependency
100
+ version_requirements: *id005
101
+ - !ruby/object:Gem::Dependency
74
102
  name: capybara
75
- requirement: &11928020 !ruby/object:Gem::Requirement
103
+ prerelease: false
104
+ requirement: &id006 !ruby/object:Gem::Requirement
76
105
  none: false
77
- requirements:
78
- - - ! '>='
79
- - !ruby/object:Gem::Version
80
- version: '0'
106
+ requirements:
107
+ - - ">="
108
+ - !ruby/object:Gem::Version
109
+ hash: 3
110
+ segments:
111
+ - 0
112
+ version: "0"
81
113
  type: :development
82
- prerelease: false
83
- version_requirements: *11928020
84
- - !ruby/object:Gem::Dependency
114
+ version_requirements: *id006
115
+ - !ruby/object:Gem::Dependency
85
116
  name: sqlite3
86
- requirement: &11927600 !ruby/object:Gem::Requirement
117
+ prerelease: false
118
+ requirement: &id007 !ruby/object:Gem::Requirement
87
119
  none: false
88
- requirements:
89
- - - ! '>='
90
- - !ruby/object:Gem::Version
91
- version: '0'
120
+ requirements:
121
+ - - ">="
122
+ - !ruby/object:Gem::Version
123
+ hash: 3
124
+ segments:
125
+ - 0
126
+ version: "0"
92
127
  type: :development
93
- prerelease: false
94
- version_requirements: *11927600
95
- - !ruby/object:Gem::Dependency
128
+ version_requirements: *id007
129
+ - !ruby/object:Gem::Dependency
96
130
  name: launchy
97
- requirement: &11955640 !ruby/object:Gem::Requirement
131
+ prerelease: false
132
+ requirement: &id008 !ruby/object:Gem::Requirement
98
133
  none: false
99
- requirements:
100
- - - ! '>='
101
- - !ruby/object:Gem::Version
102
- version: '0'
134
+ requirements:
135
+ - - ">="
136
+ - !ruby/object:Gem::Version
137
+ hash: 3
138
+ segments:
139
+ - 0
140
+ version: "0"
103
141
  type: :development
104
- prerelease: false
105
- version_requirements: *11955640
142
+ version_requirements: *id008
106
143
  description:
107
- email:
144
+ email:
108
145
  - blacklight-development@googlegroups.com
109
146
  executables: []
147
+
110
148
  extensions: []
149
+
111
150
  extra_rdoc_files: []
112
- files:
151
+
152
+ files:
113
153
  - .gitignore
114
154
  - Gemfile
115
155
  - LICENSE
@@ -173,29 +213,38 @@ files:
173
213
  - uninstall.rb
174
214
  homepage: http://projectblacklight.org/
175
215
  licenses: []
216
+
176
217
  post_install_message:
177
218
  rdoc_options: []
178
- require_paths:
219
+
220
+ require_paths:
179
221
  - lib
180
- required_ruby_version: !ruby/object:Gem::Requirement
222
+ required_ruby_version: !ruby/object:Gem::Requirement
181
223
  none: false
182
- requirements:
183
- - - ! '>='
184
- - !ruby/object:Gem::Version
185
- version: '0'
186
- required_rubygems_version: !ruby/object:Gem::Requirement
224
+ requirements:
225
+ - - ">="
226
+ - !ruby/object:Gem::Version
227
+ hash: 3
228
+ segments:
229
+ - 0
230
+ version: "0"
231
+ required_rubygems_version: !ruby/object:Gem::Requirement
187
232
  none: false
188
- requirements:
189
- - - ! '>='
190
- - !ruby/object:Gem::Version
191
- version: '0'
233
+ requirements:
234
+ - - ">="
235
+ - !ruby/object:Gem::Version
236
+ hash: 3
237
+ segments:
238
+ - 0
239
+ version: "0"
192
240
  requirements: []
241
+
193
242
  rubyforge_project: blacklight
194
243
  rubygems_version: 1.8.15
195
244
  signing_key:
196
245
  specification_version: 3
197
246
  summary: Blacklight Advanced Search plugin
198
- test_files:
247
+ test_files:
199
248
  - spec/acceptance/blacklight_advanced_search_form_spec.rb
200
249
  - spec/integration/blacklight_stub_spec.rb
201
250
  - spec/internal/app/controllers/application_controller.rb