supernova 0.7.0 → 0.7.1
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.
- data/Gemfile +1 -0
- data/Gemfile.lock +2 -0
- data/VERSION +1 -1
- data/lib/supernova/criteria.rb +6 -2
- data/lib/supernova/solr_criteria.rb +3 -3
- data/spec/supernova/criteria_spec.rb +9 -5
- data/spec/supernova/solr_criteria_spec.rb +17 -2
- data/supernova.gemspec +5 -2
- metadata +52 -41
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
@@ -22,6 +22,7 @@ GEM
|
|
22
22
|
diff-lcs (1.1.3)
|
23
23
|
geokit (1.6.0)
|
24
24
|
git (1.2.5)
|
25
|
+
growl (1.0.3)
|
25
26
|
growl_notify (0.0.3)
|
26
27
|
rb-appscript
|
27
28
|
guard (0.8.4)
|
@@ -75,6 +76,7 @@ DEPENDENCIES
|
|
75
76
|
autotest-growl
|
76
77
|
bundler (~> 1.0.0)
|
77
78
|
geokit
|
79
|
+
growl
|
78
80
|
growl_notify
|
79
81
|
guard
|
80
82
|
i18n
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.7.
|
1
|
+
0.7.1
|
data/lib/supernova/criteria.rb
CHANGED
@@ -104,8 +104,12 @@ class Supernova::Criteria
|
|
104
104
|
merge_search_options :pagination, pagination_options
|
105
105
|
end
|
106
106
|
|
107
|
-
def rows(
|
108
|
-
merge_search_options :
|
107
|
+
def rows(rows)
|
108
|
+
merge_search_options :rows, rows
|
109
|
+
end
|
110
|
+
|
111
|
+
def start(start)
|
112
|
+
merge_search_options :start, start
|
109
113
|
end
|
110
114
|
|
111
115
|
def near(*coordinates)
|
@@ -33,9 +33,9 @@ class Supernova::SolrCriteria < Supernova::Criteria
|
|
33
33
|
solr_options["facet.field"] = self.search_options[:facets].compact.map { |field| solr_field_from_field(field) }
|
34
34
|
end
|
35
35
|
|
36
|
-
if self.search_options[:pagination]
|
37
|
-
solr_options[:rows] = per_page
|
38
|
-
solr_options[:start] = (current_page - 1) * solr_options[:rows]
|
36
|
+
if self.search_options[:pagination] || search_options[:rows] || search_options[:start]
|
37
|
+
solr_options[:rows] = self.search_options[:rows] || per_page
|
38
|
+
solr_options[:start] = search_options[:start] || ((current_page - 1) * solr_options[:rows])
|
39
39
|
end
|
40
40
|
solr_options
|
41
41
|
end
|
@@ -112,16 +112,12 @@ describe "Supernova::Criteria" do
|
|
112
112
|
scope.paginate(:page => 9, :per_page => 2).search_options[:pagination].should == { :page => 9, :per_page => 2 }
|
113
113
|
end
|
114
114
|
|
115
|
-
it "sets per_page to number of rows when rows specified" do
|
116
|
-
scope.rows(0).search_options[:pagination].should == { :per_page => 0 }
|
117
|
-
end
|
118
|
-
|
119
115
|
describe "#per_page" do
|
120
116
|
it "allows setting of pagination to 0" do
|
121
117
|
scope.paginate(:per_page => 0).per_page.should == 0
|
122
118
|
end
|
123
119
|
|
124
|
-
it "" do
|
120
|
+
it "sets the per_page to the default when setting to nil" do
|
125
121
|
scope.paginate(:per_page => nil).per_page.should == 25
|
126
122
|
end
|
127
123
|
end
|
@@ -433,6 +429,14 @@ describe "Supernova::Criteria" do
|
|
433
429
|
end
|
434
430
|
end
|
435
431
|
|
432
|
+
it "allows setting the rows attributes" do
|
433
|
+
scope.rows(11).search_options[:rows].should == 11
|
434
|
+
end
|
435
|
+
|
436
|
+
it "allows setting the start attributes" do
|
437
|
+
scope.start(99).search_options[:start].should == 99
|
438
|
+
end
|
439
|
+
|
436
440
|
describe "#merge" do
|
437
441
|
let(:criteria) { Supernova::Criteria.new.order("popularity asc").with(:a => 1).conditions(:b => 2).search("New Search") }
|
438
442
|
let(:new_crit) { Supernova::Criteria.new.order("popularity desc").with(:c => 8).conditions(:e => 9).search("Search") }
|
@@ -203,8 +203,23 @@ describe "Supernova::SolrCriteria" do
|
|
203
203
|
end
|
204
204
|
end
|
205
205
|
|
206
|
-
|
207
|
-
|
206
|
+
describe "setting rows and start" do
|
207
|
+
it "allows setting of rows" do
|
208
|
+
criteria.rows(11).to_params[:rows].should == 11
|
209
|
+
end
|
210
|
+
|
211
|
+
it "allows setting of start" do
|
212
|
+
criteria.start(16).to_params[:start].should == 16
|
213
|
+
end
|
214
|
+
|
215
|
+
it "overwrites pagination with rows" do
|
216
|
+
criteria.paginate(:per_page => 9, :page => 1).rows(11).to_params[:rows].should == 11
|
217
|
+
end
|
218
|
+
|
219
|
+
it "overwrites pagination with start" do
|
220
|
+
criteria.paginate(:per_page => 9, :page => 1).start(100).rows(11).to_params[:start].should == 100
|
221
|
+
end
|
222
|
+
|
208
223
|
end
|
209
224
|
|
210
225
|
describe "pagination" do
|
data/supernova.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "supernova"
|
8
|
-
s.version = "0.7.
|
8
|
+
s.version = "0.7.1"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Tobias Schwab"]
|
12
|
-
s.date = "2012-02-
|
12
|
+
s.date = "2012-02-14"
|
13
13
|
s.description = "Unified search scopes"
|
14
14
|
s.email = "tobias.schwab@dynport.de"
|
15
15
|
s.executables = ["start_solr"]
|
@@ -113,6 +113,7 @@ Gem::Specification.new do |s|
|
|
113
113
|
s.add_development_dependency(%q<geokit>, [">= 0"])
|
114
114
|
s.add_development_dependency(%q<guard>, [">= 0"])
|
115
115
|
s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
|
116
|
+
s.add_development_dependency(%q<growl>, [">= 0"])
|
116
117
|
s.add_development_dependency(%q<growl_notify>, [">= 0"])
|
117
118
|
s.add_development_dependency(%q<autotest>, [">= 0"])
|
118
119
|
s.add_development_dependency(%q<autotest-growl>, [">= 0"])
|
@@ -133,6 +134,7 @@ Gem::Specification.new do |s|
|
|
133
134
|
s.add_dependency(%q<geokit>, [">= 0"])
|
134
135
|
s.add_dependency(%q<guard>, [">= 0"])
|
135
136
|
s.add_dependency(%q<rb-fsevent>, [">= 0"])
|
137
|
+
s.add_dependency(%q<growl>, [">= 0"])
|
136
138
|
s.add_dependency(%q<growl_notify>, [">= 0"])
|
137
139
|
s.add_dependency(%q<autotest>, [">= 0"])
|
138
140
|
s.add_dependency(%q<autotest-growl>, [">= 0"])
|
@@ -154,6 +156,7 @@ Gem::Specification.new do |s|
|
|
154
156
|
s.add_dependency(%q<geokit>, [">= 0"])
|
155
157
|
s.add_dependency(%q<guard>, [">= 0"])
|
156
158
|
s.add_dependency(%q<rb-fsevent>, [">= 0"])
|
159
|
+
s.add_dependency(%q<growl>, [">= 0"])
|
157
160
|
s.add_dependency(%q<growl_notify>, [">= 0"])
|
158
161
|
s.add_dependency(%q<autotest>, [">= 0"])
|
159
162
|
s.add_dependency(%q<autotest-growl>, [">= 0"])
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: supernova
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-02-
|
12
|
+
date: 2012-02-14 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: will_paginate
|
16
|
-
requirement: &
|
16
|
+
requirement: &70247180583600 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70247180583600
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: json
|
27
|
-
requirement: &
|
27
|
+
requirement: &70247180583100 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70247180583100
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: activesupport
|
38
|
-
requirement: &
|
38
|
+
requirement: &70247180582600 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70247180582600
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: typhoeus
|
49
|
-
requirement: &
|
49
|
+
requirement: &70247180582120 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - =
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 0.3.3
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *70247180582120
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: i18n
|
60
|
-
requirement: &
|
60
|
+
requirement: &70247180581640 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *70247180581640
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: activerecord
|
71
|
-
requirement: &
|
71
|
+
requirement: &70247180581080 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ~>
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: 3.0.7
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *70247180581080
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: ruby-debug19
|
82
|
-
requirement: &
|
82
|
+
requirement: &70247180580560 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ! '>='
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: '0'
|
88
88
|
type: :development
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *70247180580560
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: mysql2
|
93
|
-
requirement: &
|
93
|
+
requirement: &70247180580080 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ~>
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: 0.2.18
|
99
99
|
type: :development
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *70247180580080
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: ZenTest
|
104
|
-
requirement: &
|
104
|
+
requirement: &70247180579600 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - =
|
@@ -109,10 +109,10 @@ dependencies:
|
|
109
109
|
version: 4.5.0
|
110
110
|
type: :development
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *70247180579600
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: geokit
|
115
|
-
requirement: &
|
115
|
+
requirement: &70247180579080 !ruby/object:Gem::Requirement
|
116
116
|
none: false
|
117
117
|
requirements:
|
118
118
|
- - ! '>='
|
@@ -120,10 +120,10 @@ dependencies:
|
|
120
120
|
version: '0'
|
121
121
|
type: :development
|
122
122
|
prerelease: false
|
123
|
-
version_requirements: *
|
123
|
+
version_requirements: *70247180579080
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: guard
|
126
|
-
requirement: &
|
126
|
+
requirement: &70247180578600 !ruby/object:Gem::Requirement
|
127
127
|
none: false
|
128
128
|
requirements:
|
129
129
|
- - ! '>='
|
@@ -131,10 +131,10 @@ dependencies:
|
|
131
131
|
version: '0'
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
|
-
version_requirements: *
|
134
|
+
version_requirements: *70247180578600
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: rb-fsevent
|
137
|
-
requirement: &
|
137
|
+
requirement: &70247180578120 !ruby/object:Gem::Requirement
|
138
138
|
none: false
|
139
139
|
requirements:
|
140
140
|
- - ! '>='
|
@@ -142,10 +142,21 @@ dependencies:
|
|
142
142
|
version: '0'
|
143
143
|
type: :development
|
144
144
|
prerelease: false
|
145
|
-
version_requirements: *
|
145
|
+
version_requirements: *70247180578120
|
146
|
+
- !ruby/object:Gem::Dependency
|
147
|
+
name: growl
|
148
|
+
requirement: &70247180577640 !ruby/object:Gem::Requirement
|
149
|
+
none: false
|
150
|
+
requirements:
|
151
|
+
- - ! '>='
|
152
|
+
- !ruby/object:Gem::Version
|
153
|
+
version: '0'
|
154
|
+
type: :development
|
155
|
+
prerelease: false
|
156
|
+
version_requirements: *70247180577640
|
146
157
|
- !ruby/object:Gem::Dependency
|
147
158
|
name: growl_notify
|
148
|
-
requirement: &
|
159
|
+
requirement: &70247180577140 !ruby/object:Gem::Requirement
|
149
160
|
none: false
|
150
161
|
requirements:
|
151
162
|
- - ! '>='
|
@@ -153,10 +164,10 @@ dependencies:
|
|
153
164
|
version: '0'
|
154
165
|
type: :development
|
155
166
|
prerelease: false
|
156
|
-
version_requirements: *
|
167
|
+
version_requirements: *70247180577140
|
157
168
|
- !ruby/object:Gem::Dependency
|
158
169
|
name: autotest
|
159
|
-
requirement: &
|
170
|
+
requirement: &70247180576640 !ruby/object:Gem::Requirement
|
160
171
|
none: false
|
161
172
|
requirements:
|
162
173
|
- - ! '>='
|
@@ -164,10 +175,10 @@ dependencies:
|
|
164
175
|
version: '0'
|
165
176
|
type: :development
|
166
177
|
prerelease: false
|
167
|
-
version_requirements: *
|
178
|
+
version_requirements: *70247180576640
|
168
179
|
- !ruby/object:Gem::Dependency
|
169
180
|
name: autotest-growl
|
170
|
-
requirement: &
|
181
|
+
requirement: &70247180533280 !ruby/object:Gem::Requirement
|
171
182
|
none: false
|
172
183
|
requirements:
|
173
184
|
- - ! '>='
|
@@ -175,10 +186,10 @@ dependencies:
|
|
175
186
|
version: '0'
|
176
187
|
type: :development
|
177
188
|
prerelease: false
|
178
|
-
version_requirements: *
|
189
|
+
version_requirements: *70247180533280
|
179
190
|
- !ruby/object:Gem::Dependency
|
180
191
|
name: rspec
|
181
|
-
requirement: &
|
192
|
+
requirement: &70247180532680 !ruby/object:Gem::Requirement
|
182
193
|
none: false
|
183
194
|
requirements:
|
184
195
|
- - ~>
|
@@ -186,10 +197,10 @@ dependencies:
|
|
186
197
|
version: 2.8.0
|
187
198
|
type: :development
|
188
199
|
prerelease: false
|
189
|
-
version_requirements: *
|
200
|
+
version_requirements: *70247180532680
|
190
201
|
- !ruby/object:Gem::Dependency
|
191
202
|
name: bundler
|
192
|
-
requirement: &
|
203
|
+
requirement: &70247180532080 !ruby/object:Gem::Requirement
|
193
204
|
none: false
|
194
205
|
requirements:
|
195
206
|
- - ~>
|
@@ -197,10 +208,10 @@ dependencies:
|
|
197
208
|
version: 1.0.0
|
198
209
|
type: :development
|
199
210
|
prerelease: false
|
200
|
-
version_requirements: *
|
211
|
+
version_requirements: *70247180532080
|
201
212
|
- !ruby/object:Gem::Dependency
|
202
213
|
name: jeweler
|
203
|
-
requirement: &
|
214
|
+
requirement: &70247180531500 !ruby/object:Gem::Requirement
|
204
215
|
none: false
|
205
216
|
requirements:
|
206
217
|
- - ~>
|
@@ -208,10 +219,10 @@ dependencies:
|
|
208
219
|
version: 1.6.0
|
209
220
|
type: :development
|
210
221
|
prerelease: false
|
211
|
-
version_requirements: *
|
222
|
+
version_requirements: *70247180531500
|
212
223
|
- !ruby/object:Gem::Dependency
|
213
224
|
name: rcov
|
214
|
-
requirement: &
|
225
|
+
requirement: &70247180530900 !ruby/object:Gem::Requirement
|
215
226
|
none: false
|
216
227
|
requirements:
|
217
228
|
- - ! '>='
|
@@ -219,7 +230,7 @@ dependencies:
|
|
219
230
|
version: '0'
|
220
231
|
type: :development
|
221
232
|
prerelease: false
|
222
|
-
version_requirements: *
|
233
|
+
version_requirements: *70247180530900
|
223
234
|
description: Unified search scopes
|
224
235
|
email: tobias.schwab@dynport.de
|
225
236
|
executables:
|
@@ -316,7 +327,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
316
327
|
version: '0'
|
317
328
|
segments:
|
318
329
|
- 0
|
319
|
-
hash:
|
330
|
+
hash: 2690249885197212135
|
320
331
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
321
332
|
none: false
|
322
333
|
requirements:
|