appstats 0.9.1 → 0.9.2
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 +18 -0
- data/lib/appstats/version.rb +1 -1
- data/spec/entry_spec.rb +4 -4
- data/spec/logger_spec.rb +18 -18
- data/spec/result_spec.rb +60 -0
- metadata +3 -3
data/Gemfile.lock
CHANGED
data/lib/appstats/result.rb
CHANGED
@@ -4,6 +4,24 @@ module Appstats
|
|
4
4
|
|
5
5
|
attr_accessible :name, :result_type, :query, :query_as_sql, :count, :action, :host, :from_date, :to_date
|
6
6
|
|
7
|
+
def date_to_s
|
8
|
+
return "" if from_date.nil? && to_date.nil?
|
9
|
+
return "#{from_date_to_s} to present" if !from_date.nil? && to_date.nil? && created_at.nil?
|
10
|
+
return "#{from_date_to_s} to #{created_at.strftime('%Y-%m-%d')}" if !from_date.nil? && to_date.nil? && !created_at.nil?
|
11
|
+
return "up to #{to_date_to_s}" if from_date.nil? && !to_date.nil?
|
12
|
+
"#{from_date_to_s} to #{to_date_to_s}"
|
13
|
+
end
|
14
|
+
|
15
|
+
def from_date_to_s
|
16
|
+
return "" if from_date.nil?
|
17
|
+
from_date.strftime('%Y-%m-%d')
|
18
|
+
end
|
19
|
+
|
20
|
+
def to_date_to_s
|
21
|
+
return "" if to_date.nil?
|
22
|
+
to_date.strftime('%Y-%m-%d')
|
23
|
+
end
|
24
|
+
|
7
25
|
def ==(o)
|
8
26
|
o.class == self.class && o.send(:state) == state
|
9
27
|
end
|
data/lib/appstats/version.rb
CHANGED
data/spec/entry_spec.rb
CHANGED
@@ -188,18 +188,18 @@ module Appstats
|
|
188
188
|
end
|
189
189
|
|
190
190
|
it "should understand an entry without contexts" do
|
191
|
-
entry = Entry.create_from_logger_string("0.9.
|
191
|
+
entry = Entry.create_from_logger_string("0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
|
192
192
|
Entry.count.should == @before_count + 1
|
193
193
|
entry.action.should == "address_search"
|
194
|
-
entry.raw_entry.should == "0.9.
|
194
|
+
entry.raw_entry.should == "0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
|
195
195
|
entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
|
196
196
|
end
|
197
197
|
|
198
198
|
it "should understand contexts" do
|
199
|
-
entry = Entry.create_from_logger_string("0.9.
|
199
|
+
entry = Entry.create_from_logger_string("0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
|
200
200
|
Entry.count.should == @before_count + 1
|
201
201
|
entry.action.should == "address_filter"
|
202
|
-
entry.raw_entry.should == "0.9.
|
202
|
+
entry.raw_entry.should == "0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
|
203
203
|
entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
|
204
204
|
entry.contexts.size.should == 2
|
205
205
|
entry.contexts[0].context_key = "app_name"
|
data/spec/logger_spec.rb
CHANGED
@@ -115,7 +115,7 @@ module Appstats
|
|
115
115
|
|
116
116
|
it "should accept numbers" do
|
117
117
|
Appstats::Logger.entry(5, :blah => 6)
|
118
|
-
Appstats::Logger.raw_read.should == ["0.9.
|
118
|
+
Appstats::Logger.raw_read.should == ["0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
|
119
119
|
end
|
120
120
|
|
121
121
|
end
|
@@ -124,7 +124,7 @@ module Appstats
|
|
124
124
|
|
125
125
|
it "should look similar to regular entry" do
|
126
126
|
Appstats::Logger.exception_entry(RuntimeError.new("blah"),:on => "login")
|
127
|
-
Appstats::Logger.raw_read.should == ["0.9.
|
127
|
+
Appstats::Logger.raw_read.should == ["0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
|
128
128
|
end
|
129
129
|
|
130
130
|
end
|
@@ -141,29 +141,29 @@ module Appstats
|
|
141
141
|
|
142
142
|
it "should handle a statistics entry" do
|
143
143
|
expected = { :action => "address_search", :timestamp => "2010-09-21 23:15:20" }
|
144
|
-
actual = Appstats::Logger.entry_to_hash("0.9.
|
144
|
+
actual = Appstats::Logger.entry_to_hash("0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
|
145
145
|
actual.should == expected
|
146
146
|
end
|
147
147
|
|
148
148
|
it "should handle contexts" do
|
149
149
|
expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
|
150
|
-
actual = Appstats::Logger.entry_to_hash("0.9.
|
150
|
+
actual = Appstats::Logger.entry_to_hash("0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
|
151
151
|
actual.should == expected
|
152
152
|
end
|
153
153
|
|
154
154
|
it "should handle actions with the delimiter (and change the delimiter)" do
|
155
155
|
expected = { :action => "address:=search-n", :timestamp => "2010-09-21 23:15:20" }
|
156
|
-
actual = Appstats::Logger.entry_to_hash("0.9.
|
156
|
+
actual = Appstats::Logger.entry_to_hash("0.9.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
|
157
157
|
actual.should == expected
|
158
158
|
|
159
159
|
expected = { :action => "address::search==--n", :timestamp => "2010-09-21 23:15:20" }
|
160
|
-
actual = Appstats::Logger.entry_to_hash("0.9.
|
160
|
+
actual = Appstats::Logger.entry_to_hash("0.9.2 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
|
161
161
|
actual.should == expected
|
162
162
|
end
|
163
163
|
|
164
164
|
it "should handle contexts with the delimiter (and change the delimiter)" do
|
165
165
|
expected = { :action => "address", :timestamp => "2010-09-21 23:15:20", :server => "market:eval=-n" }
|
166
|
-
actual = Appstats::Logger.entry_to_hash("0.9.
|
166
|
+
actual = Appstats::Logger.entry_to_hash("0.9.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
|
167
167
|
actual.should == expected
|
168
168
|
end
|
169
169
|
|
@@ -172,66 +172,66 @@ module Appstats
|
|
172
172
|
describe "#entry_to_s" do
|
173
173
|
|
174
174
|
it "should handle a statistics entry" do
|
175
|
-
expected = "0.9.
|
175
|
+
expected = "0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
|
176
176
|
actual = Appstats::Logger.entry_to_s("address_search")
|
177
177
|
actual.should == expected
|
178
178
|
end
|
179
179
|
|
180
180
|
it "should handle numbers" do
|
181
|
-
expected = "0.9.
|
181
|
+
expected = "0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
|
182
182
|
actual = Appstats::Logger.entry_to_s(1,:note => 2.2)
|
183
183
|
actual.should == expected
|
184
184
|
end
|
185
185
|
|
186
186
|
it "should handle default contexts" do
|
187
187
|
Appstats::Logger.default_contexts[:app_name] = "market"
|
188
|
-
expected = "0.9.
|
188
|
+
expected = "0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
|
189
189
|
actual = Appstats::Logger.entry_to_s("address_search")
|
190
190
|
actual.should == expected
|
191
191
|
end
|
192
192
|
|
193
193
|
it "should handle contexts (and sort them by symbol)" do
|
194
|
-
expected = "0.9.
|
194
|
+
expected = "0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
|
195
195
|
actual = Appstats::Logger.entry_to_s("address_filter", { :server => "Live", :app_name => 'Market' })
|
196
196
|
actual.should == expected
|
197
197
|
end
|
198
198
|
|
199
199
|
it "should handle actions with the delimiter (and change the delimiter)" do
|
200
|
-
expected = "0.9.
|
200
|
+
expected = "0.9.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
|
201
201
|
actual = Appstats::Logger.entry_to_s("address:=search-n")
|
202
202
|
actual.should == expected
|
203
203
|
|
204
|
-
expected = "0.9.
|
204
|
+
expected = "0.9.2 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
|
205
205
|
actual = Appstats::Logger.entry_to_s("address::search==--n")
|
206
206
|
actual.should == expected
|
207
207
|
end
|
208
208
|
|
209
209
|
it "should handle contexts with the delimiter (and change the delimiter)" do
|
210
|
-
expected = "0.9.
|
210
|
+
expected = "0.9.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
|
211
211
|
actual = Appstats::Logger.entry_to_s("address", :server => 'market:eval=-n')
|
212
212
|
actual.should == expected
|
213
213
|
end
|
214
214
|
|
215
215
|
it "should ignore spaces" do
|
216
|
-
expected = "0.9.
|
216
|
+
expected = "0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
|
217
217
|
actual = Appstats::Logger.entry_to_s("address search")
|
218
218
|
actual.should == expected
|
219
219
|
end
|
220
220
|
|
221
221
|
it "should convert newlines in action" do
|
222
|
-
expected = "0.9.
|
222
|
+
expected = "0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
|
223
223
|
actual = Appstats::Logger.entry_to_s("address_\nsearch")
|
224
224
|
actual.should == expected
|
225
225
|
end
|
226
226
|
|
227
227
|
it "should convert newlines in context" do
|
228
|
-
expected = "0.9.
|
228
|
+
expected = "0.9.2 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
|
229
229
|
actual = Appstats::Logger.entry_to_s("address_search",:blah => "some\nlong\nstatement")
|
230
230
|
actual.should == expected
|
231
231
|
end
|
232
232
|
|
233
233
|
it "should convert newlines based on the delimiter" do
|
234
|
-
expected = "0.9.
|
234
|
+
expected = "0.9.2 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
|
235
235
|
actual = Appstats::Logger.entry_to_s("address:=\nsearch-n")
|
236
236
|
actual.should == expected
|
237
237
|
end
|
data/spec/result_spec.rb
CHANGED
@@ -5,6 +5,7 @@ module Appstats
|
|
5
5
|
|
6
6
|
before(:each) do
|
7
7
|
@result = Appstats::Result.new
|
8
|
+
Time.stub!(:now).and_return(Time.parse('2010-09-21 23:15:20'))
|
8
9
|
end
|
9
10
|
|
10
11
|
describe "#initialize" do
|
@@ -54,5 +55,64 @@ module Appstats
|
|
54
55
|
end
|
55
56
|
|
56
57
|
end
|
58
|
+
|
59
|
+
describe "#date_to_s" do
|
60
|
+
|
61
|
+
it "should handle nil" do
|
62
|
+
@result.date_to_s.should == ""
|
63
|
+
end
|
64
|
+
|
65
|
+
it "should handle a from date only without a created_at date" do
|
66
|
+
@result.from_date = Time.parse("2010-01-02 03:04:05")
|
67
|
+
@result.date_to_s.should == "2010-01-02 to present"
|
68
|
+
end
|
69
|
+
|
70
|
+
|
71
|
+
it "should handle a from date only" do
|
72
|
+
@result.from_date = Time.parse("2010-01-02 03:04:05")
|
73
|
+
@result.save
|
74
|
+
@result.date_to_s.should == "2010-01-02 to 2010-09-21"
|
75
|
+
end
|
76
|
+
|
77
|
+
it "should handle a to date only" do
|
78
|
+
@result.to_date = Time.parse("2010-01-02 03:04:05")
|
79
|
+
@result.date_to_s.should == "up to 2010-01-02"
|
80
|
+
end
|
81
|
+
|
82
|
+
it "should handle both a from and to date only" do
|
83
|
+
@result.from_date = Time.parse("2009-01-02 03:04:05")
|
84
|
+
@result.to_date = Time.parse("2010-01-02 03:04:05")
|
85
|
+
@result.date_to_s.should == "2009-01-02 to 2010-01-02"
|
86
|
+
end
|
87
|
+
|
88
|
+
|
89
|
+
end
|
90
|
+
|
91
|
+
describe "#from_date_to_s" do
|
92
|
+
|
93
|
+
it "should handle nil" do
|
94
|
+
@result.from_date_to_s.should == ""
|
95
|
+
end
|
96
|
+
|
97
|
+
it "should handle a date" do
|
98
|
+
@result.from_date = Time.parse("2010-01-02 03:04:05")
|
99
|
+
@result.from_date_to_s.should == "2010-01-02"
|
100
|
+
end
|
101
|
+
|
102
|
+
end
|
103
|
+
|
104
|
+
describe "#to_date_to_s" do
|
105
|
+
|
106
|
+
it "should handle nil" do
|
107
|
+
@result.to_date_to_s.should == ""
|
108
|
+
end
|
109
|
+
|
110
|
+
it "should handle a date" do
|
111
|
+
@result.to_date = Time.parse("2010-01-02 03:04:06")
|
112
|
+
@result.to_date_to_s.should == "2010-01-02"
|
113
|
+
end
|
114
|
+
|
115
|
+
end
|
116
|
+
|
57
117
|
end
|
58
118
|
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: 63
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 9
|
9
|
-
-
|
10
|
-
version: 0.9.
|
9
|
+
- 2
|
10
|
+
version: 0.9.2
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Andrew Forward
|