appstats 0.19.0 → 0.19.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile.lock +1 -1
- data/lib/appstats/result.rb +16 -12
- data/lib/appstats/sub_result.rb +9 -0
- data/lib/appstats/version.rb +1 -1
- data/spec/entry_spec.rb +8 -8
- data/spec/logger_spec.rb +22 -22
- data/spec/result_spec.rb +0 -3
- data/spec/sub_result_spec.rb +93 -0
- metadata +3 -3
data/Gemfile.lock
CHANGED
data/lib/appstats/result.rb
CHANGED
@@ -59,17 +59,7 @@ module Appstats
|
|
59
59
|
end
|
60
60
|
|
61
61
|
def count_to_s(data = {})
|
62
|
-
|
63
|
-
if data[:format] == :short_hand
|
64
|
-
lookups = { 1000.0 => 'thousand', 1000000.0 => 'million', 1000000000.0 => 'billion', 1000000000000.0 => 'trillion' }
|
65
|
-
lookups.keys.sort.reverse.each do |v|
|
66
|
-
next if v > count
|
67
|
-
short_hand = (count / v * 10).round / 10.0
|
68
|
-
short_hand = short_hand.round if short_hand.round == short_hand
|
69
|
-
return "#{add_commas(short_hand)} #{lookups[v]}"
|
70
|
-
end
|
71
|
-
end
|
72
|
-
add_commas(count)
|
62
|
+
Appstats::Result.calculate_count_to_s(count,data)
|
73
63
|
end
|
74
64
|
|
75
65
|
def ==(o)
|
@@ -84,6 +74,20 @@ module Appstats
|
|
84
74
|
ids = all.each.collect { |e| e["id_and_date"].split[0] }.compact
|
85
75
|
ActiveRecord::Base.connection.update("update appstats_results set is_latest = '1' where id in (#{ids.join(',')})")
|
86
76
|
end
|
77
|
+
|
78
|
+
def self.calculate_count_to_s(raw_count,data = {})
|
79
|
+
return "--" if raw_count.nil?
|
80
|
+
if data[:format] == :short_hand
|
81
|
+
lookups = { 1000.0 => 'thousand', 1000000.0 => 'million', 1000000000.0 => 'billion', 1000000000000.0 => 'trillion' }
|
82
|
+
lookups.keys.sort.reverse.each do |v|
|
83
|
+
next if v > raw_count
|
84
|
+
short_hand = (raw_count / v * 10).round / 10.0
|
85
|
+
short_hand = short_hand.round if short_hand.round == short_hand
|
86
|
+
return "#{add_commas(short_hand)} #{lookups[v]}"
|
87
|
+
end
|
88
|
+
end
|
89
|
+
add_commas(raw_count)
|
90
|
+
end
|
87
91
|
|
88
92
|
private
|
89
93
|
|
@@ -99,7 +103,7 @@ module Appstats
|
|
99
103
|
ActiveRecord::Base.connection.update(ActiveRecord::Base.send(:sanitize_sql_array, sql))
|
100
104
|
end
|
101
105
|
|
102
|
-
def add_commas(num)
|
106
|
+
def self.add_commas(num)
|
103
107
|
num.to_s.gsub(/(\d)(?=\d{3}+(\.\d*)?$)/, '\1,')
|
104
108
|
end
|
105
109
|
|
data/lib/appstats/sub_result.rb
CHANGED
@@ -10,6 +10,15 @@ module Appstats
|
|
10
10
|
result.count
|
11
11
|
end
|
12
12
|
|
13
|
+
def count_to_s(data = {})
|
14
|
+
Appstats::Result.calculate_count_to_s(count,data)
|
15
|
+
end
|
16
|
+
|
17
|
+
def total_count_to_s(data = {})
|
18
|
+
Appstats::Result.calculate_count_to_s(total_count,data)
|
19
|
+
end
|
20
|
+
|
21
|
+
|
13
22
|
def ==(o)
|
14
23
|
o.class == self.class && o.send(:state) == state
|
15
24
|
end
|
data/lib/appstats/version.rb
CHANGED
data/spec/entry_spec.rb
CHANGED
@@ -193,18 +193,18 @@ module Appstats
|
|
193
193
|
end
|
194
194
|
|
195
195
|
it "should understand an entry without contexts" do
|
196
|
-
entry = Entry.create_from_logger_string("0.19.
|
196
|
+
entry = Entry.create_from_logger_string("0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
|
197
197
|
Entry.count.should == @before_count + 1
|
198
198
|
entry.action.should == "address_search"
|
199
|
-
entry.raw_entry.should == "0.19.
|
199
|
+
entry.raw_entry.should == "0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
|
200
200
|
entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
|
201
201
|
end
|
202
202
|
|
203
203
|
it "should understand contexts" do
|
204
|
-
entry = Entry.create_from_logger_string("0.19.
|
204
|
+
entry = Entry.create_from_logger_string("0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
|
205
205
|
Entry.count.should == @before_count + 1
|
206
206
|
entry.action.should == "address_filter"
|
207
|
-
entry.raw_entry.should == "0.19.
|
207
|
+
entry.raw_entry.should == "0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
|
208
208
|
entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
|
209
209
|
entry.contexts.size.should == 2
|
210
210
|
entry.contexts[0].context_key = "app_name"
|
@@ -214,10 +214,10 @@ module Appstats
|
|
214
214
|
end
|
215
215
|
|
216
216
|
it "should handle 'action' as a context" do
|
217
|
-
entry = Entry.create_from_logger_string('0.19.
|
217
|
+
entry = Entry.create_from_logger_string('0.19.1 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb')
|
218
218
|
Entry.count.should == @before_count + 1
|
219
219
|
entry.action.should == "page-view"
|
220
|
-
entry.raw_entry.should == "0.19.
|
220
|
+
entry.raw_entry.should == "0.19.1 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : action=save_ovcen : app_name=cdb"
|
221
221
|
entry.occurred_at.should == Time.parse("2011-02-24 12:59:57")
|
222
222
|
entry.contexts.size.should == 2
|
223
223
|
entry.contexts[0].context_key = "action"
|
@@ -228,10 +228,10 @@ module Appstats
|
|
228
228
|
end
|
229
229
|
|
230
230
|
it "should handle multiple of the same 'context'" do
|
231
|
-
entry = Entry.create_from_logger_string('0.19.
|
231
|
+
entry = Entry.create_from_logger_string('0.19.1 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb')
|
232
232
|
Entry.count.should == @before_count + 1
|
233
233
|
entry.action.should == "page-view"
|
234
|
-
entry.raw_entry.should == "0.19.
|
234
|
+
entry.raw_entry.should == "0.19.1 setup[:,=,-n] 2011-02-24 12:59:57 action=page-view : app_name=market : app_name=cdb"
|
235
235
|
entry.occurred_at.should == Time.parse("2011-02-24 12:59:57")
|
236
236
|
entry.contexts.size.should == 2
|
237
237
|
entry.contexts[0].context_key = "app_name"
|
data/spec/logger_spec.rb
CHANGED
@@ -122,12 +122,12 @@ module Appstats
|
|
122
122
|
|
123
123
|
it "should accept numbers" do
|
124
124
|
Appstats::Logger.entry(5, :blah => 6)
|
125
|
-
Appstats::Logger.raw_read.should == ["0.19.
|
125
|
+
Appstats::Logger.raw_read.should == ["0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
|
126
126
|
end
|
127
127
|
|
128
128
|
it "should accept arrays" do
|
129
129
|
Appstats::Logger.entry('search', :provider => [ 'one', 'two' ])
|
130
|
-
Appstats::Logger.raw_read.should == ["0.19.
|
130
|
+
Appstats::Logger.raw_read.should == ["0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=search : provider=one : provider=two"]
|
131
131
|
end
|
132
132
|
|
133
133
|
|
@@ -137,7 +137,7 @@ module Appstats
|
|
137
137
|
|
138
138
|
it "should look similar to regular entry" do
|
139
139
|
Appstats::Logger.exception_entry(RuntimeError.new("blah"),:on => "login")
|
140
|
-
Appstats::Logger.raw_read.should == ["0.19.
|
140
|
+
Appstats::Logger.raw_read.should == ["0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
|
141
141
|
end
|
142
142
|
|
143
143
|
end
|
@@ -154,47 +154,47 @@ module Appstats
|
|
154
154
|
|
155
155
|
it "should handle a statistics entry" do
|
156
156
|
expected = { :action => "address_search", :timestamp => "2010-09-21 23:15:20" }
|
157
|
-
actual = Appstats::Logger.entry_to_hash("0.19.
|
157
|
+
actual = Appstats::Logger.entry_to_hash("0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
|
158
158
|
actual.should == expected
|
159
159
|
end
|
160
160
|
|
161
161
|
it "should handle contexts" do
|
162
162
|
expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
|
163
|
-
actual = Appstats::Logger.entry_to_hash("0.19.
|
163
|
+
actual = Appstats::Logger.entry_to_hash("0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
|
164
164
|
actual.should == expected
|
165
165
|
end
|
166
166
|
|
167
167
|
it "should handle multiple actions" do
|
168
168
|
expected = { :action => ["address_filter", "blah"], :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
|
169
|
-
actual = Appstats::Logger.entry_to_hash("0.19.
|
169
|
+
actual = Appstats::Logger.entry_to_hash("0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : action=blah : app_name=Market : server=Live")
|
170
170
|
actual.should == expected
|
171
171
|
end
|
172
172
|
|
173
173
|
it "should handle multiple of same context" do
|
174
174
|
expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => ['Sin','Market'] }
|
175
|
-
actual = Appstats::Logger.entry_to_hash("0.19.
|
175
|
+
actual = Appstats::Logger.entry_to_hash("0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Sin : app_name=Market : server=Live")
|
176
176
|
actual.should == expected
|
177
177
|
end
|
178
178
|
|
179
179
|
it "should handle no actions" do
|
180
180
|
expected = { :action => "UNKNOWN_ACTION", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
|
181
|
-
actual = Appstats::Logger.entry_to_hash("0.19.
|
181
|
+
actual = Appstats::Logger.entry_to_hash("0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 app_name=Market : server=Live")
|
182
182
|
actual.should == expected
|
183
183
|
end
|
184
184
|
|
185
185
|
it "should handle actions with the delimiter (and change the delimiter)" do
|
186
186
|
expected = { :action => "address:=search-n", :timestamp => "2010-09-21 23:15:20" }
|
187
|
-
actual = Appstats::Logger.entry_to_hash("0.19.
|
187
|
+
actual = Appstats::Logger.entry_to_hash("0.19.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
|
188
188
|
actual.should == expected
|
189
189
|
|
190
190
|
expected = { :action => "address::search==--n", :timestamp => "2010-09-21 23:15:20" }
|
191
|
-
actual = Appstats::Logger.entry_to_hash("0.19.
|
191
|
+
actual = Appstats::Logger.entry_to_hash("0.19.1 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
|
192
192
|
actual.should == expected
|
193
193
|
end
|
194
194
|
|
195
195
|
it "should handle contexts with the delimiter (and change the delimiter)" do
|
196
196
|
expected = { :action => "address", :timestamp => "2010-09-21 23:15:20", :server => "market:eval=-n" }
|
197
|
-
actual = Appstats::Logger.entry_to_hash("0.19.
|
197
|
+
actual = Appstats::Logger.entry_to_hash("0.19.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
|
198
198
|
actual.should == expected
|
199
199
|
end
|
200
200
|
|
@@ -203,66 +203,66 @@ module Appstats
|
|
203
203
|
describe "#entry_to_s" do
|
204
204
|
|
205
205
|
it "should handle a statistics entry" do
|
206
|
-
expected = "0.19.
|
206
|
+
expected = "0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
|
207
207
|
actual = Appstats::Logger.entry_to_s("address_search")
|
208
208
|
actual.should == expected
|
209
209
|
end
|
210
210
|
|
211
211
|
it "should handle numbers" do
|
212
|
-
expected = "0.19.
|
212
|
+
expected = "0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
|
213
213
|
actual = Appstats::Logger.entry_to_s(1,:note => 2.2)
|
214
214
|
actual.should == expected
|
215
215
|
end
|
216
216
|
|
217
217
|
it "should handle default contexts" do
|
218
218
|
Appstats::Logger.default_contexts[:app_name] = "market"
|
219
|
-
expected = "0.19.
|
219
|
+
expected = "0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
|
220
220
|
actual = Appstats::Logger.entry_to_s("address_search")
|
221
221
|
actual.should == expected
|
222
222
|
end
|
223
223
|
|
224
224
|
it "should handle contexts (and sort them by symbol)" do
|
225
|
-
expected = "0.19.
|
225
|
+
expected = "0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
|
226
226
|
actual = Appstats::Logger.entry_to_s("address_filter", { :server => "Live", :app_name => 'Market' })
|
227
227
|
actual.should == expected
|
228
228
|
end
|
229
229
|
|
230
230
|
it "should handle actions with the delimiter (and change the delimiter)" do
|
231
|
-
expected = "0.19.
|
231
|
+
expected = "0.19.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
|
232
232
|
actual = Appstats::Logger.entry_to_s("address:=search-n")
|
233
233
|
actual.should == expected
|
234
234
|
|
235
|
-
expected = "0.19.
|
235
|
+
expected = "0.19.1 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
|
236
236
|
actual = Appstats::Logger.entry_to_s("address::search==--n")
|
237
237
|
actual.should == expected
|
238
238
|
end
|
239
239
|
|
240
240
|
it "should handle contexts with the delimiter (and change the delimiter)" do
|
241
|
-
expected = "0.19.
|
241
|
+
expected = "0.19.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
|
242
242
|
actual = Appstats::Logger.entry_to_s("address", :server => 'market:eval=-n')
|
243
243
|
actual.should == expected
|
244
244
|
end
|
245
245
|
|
246
246
|
it "should ignore spaces" do
|
247
|
-
expected = "0.19.
|
247
|
+
expected = "0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
|
248
248
|
actual = Appstats::Logger.entry_to_s("address search")
|
249
249
|
actual.should == expected
|
250
250
|
end
|
251
251
|
|
252
252
|
it "should convert newlines in action" do
|
253
|
-
expected = "0.19.
|
253
|
+
expected = "0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
|
254
254
|
actual = Appstats::Logger.entry_to_s("address_\nsearch")
|
255
255
|
actual.should == expected
|
256
256
|
end
|
257
257
|
|
258
258
|
it "should convert newlines in context" do
|
259
|
-
expected = "0.19.
|
259
|
+
expected = "0.19.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
|
260
260
|
actual = Appstats::Logger.entry_to_s("address_search",:blah => "some\nlong\nstatement")
|
261
261
|
actual.should == expected
|
262
262
|
end
|
263
263
|
|
264
264
|
it "should convert newlines based on the delimiter" do
|
265
|
-
expected = "0.19.
|
265
|
+
expected = "0.19.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
|
266
266
|
actual = Appstats::Logger.entry_to_s("address:=\nsearch-n")
|
267
267
|
actual.should == expected
|
268
268
|
end
|
data/spec/result_spec.rb
CHANGED
data/spec/sub_result_spec.rb
CHANGED
@@ -81,5 +81,98 @@ module Appstats
|
|
81
81
|
|
82
82
|
end
|
83
83
|
|
84
|
+
describe "#count_to_s" do
|
85
|
+
|
86
|
+
it "should handle nil" do
|
87
|
+
@sub_result.count = nil
|
88
|
+
@sub_result.count_to_s.should == '--'
|
89
|
+
end
|
90
|
+
|
91
|
+
it "should handle 0" do
|
92
|
+
@sub_result.count = 0
|
93
|
+
@sub_result.count_to_s.should == '0'
|
94
|
+
end
|
95
|
+
|
96
|
+
it "should handle < 1000 numbers" do
|
97
|
+
@sub_result.count = 123
|
98
|
+
@sub_result.count_to_s.should == "123"
|
99
|
+
end
|
100
|
+
|
101
|
+
it "should handle > 1000 numbers" do
|
102
|
+
@sub_result.count = 1000
|
103
|
+
@sub_result.count_to_s.should == "1,000"
|
104
|
+
|
105
|
+
@sub_result.count = 12345
|
106
|
+
@sub_result.count_to_s.should == "12,345"
|
107
|
+
|
108
|
+
end
|
109
|
+
|
110
|
+
it "should handle > 1000000 numbers" do
|
111
|
+
@sub_result.count = 1000000
|
112
|
+
@sub_result.count_to_s.should == "1,000,000"
|
113
|
+
|
114
|
+
@sub_result.count = 1234567
|
115
|
+
@sub_result.count_to_s.should == "1,234,567"
|
116
|
+
end
|
117
|
+
|
118
|
+
describe "short_hand format" do
|
119
|
+
|
120
|
+
|
121
|
+
it "should handle trillion" do
|
122
|
+
@sub_result.count = 1400000000000
|
123
|
+
@sub_result.count_to_s(:format => :short_hand).should == "1.4 trillion"
|
124
|
+
end
|
125
|
+
|
126
|
+
it "should handle billion" do
|
127
|
+
@sub_result.count = 1490000000
|
128
|
+
@sub_result.count_to_s(:format => :short_hand).should == "1.5 billion"
|
129
|
+
|
130
|
+
@sub_result.count = 91490000000
|
131
|
+
@sub_result.count_to_s(:format => :short_hand).should == "91.5 billion"
|
132
|
+
|
133
|
+
end
|
134
|
+
|
135
|
+
it "should handle million" do
|
136
|
+
@sub_result.count = 1200000
|
137
|
+
@sub_result.count_to_s(:format => :short_hand).should == "1.2 million"
|
138
|
+
|
139
|
+
@sub_result.count = 881200000
|
140
|
+
@sub_result.count_to_s(:format => :short_hand).should == "881.2 million"
|
141
|
+
end
|
142
|
+
|
143
|
+
it "should handle thousand" do
|
144
|
+
@sub_result.count = 1200
|
145
|
+
@sub_result.count_to_s(:format => :short_hand).should == "1.2 thousand"
|
146
|
+
|
147
|
+
@sub_result.count = 912600
|
148
|
+
@sub_result.count_to_s(:format => :short_hand).should == "912.6 thousand"
|
149
|
+
|
150
|
+
end
|
151
|
+
|
152
|
+
it "should not display decimal if 0" do
|
153
|
+
@sub_result.count = 1000
|
154
|
+
@sub_result.count_to_s(:format => :short_hand).should == "1 thousand"
|
155
|
+
|
156
|
+
@sub_result.count = 912000
|
157
|
+
@sub_result.count_to_s(:format => :short_hand).should == "912 thousand"
|
158
|
+
|
159
|
+
end
|
160
|
+
end
|
161
|
+
end
|
162
|
+
|
163
|
+
describe "#total_count_to_s" do
|
164
|
+
|
165
|
+
it "should be zero if no result" do
|
166
|
+
@sub_result.total_count_to_s.should == "0"
|
167
|
+
end
|
168
|
+
|
169
|
+
it "should be based on result.count" do
|
170
|
+
@sub_result.result = Result.create(:count => 1000)
|
171
|
+
@sub_result.total_count_to_s.should == "1,000"
|
172
|
+
end
|
173
|
+
|
174
|
+
end
|
175
|
+
|
176
|
+
|
84
177
|
end
|
85
178
|
end
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: appstats
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 81
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 19
|
9
|
-
-
|
10
|
-
version: 0.19.
|
9
|
+
- 1
|
10
|
+
version: 0.19.1
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Andrew Forward
|