prowler 1.2.0 → 1.2.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +7 -0
- data/VERSION +1 -1
- data/lib/prowler/application.rb +1 -1
- data/prowler.gemspec +2 -2
- data/test/prowler_test.rb +23 -5
- metadata +4 -4
data/CHANGELOG
CHANGED
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.2.
|
1
|
+
1.2.1
|
data/lib/prowler/application.rb
CHANGED
@@ -68,7 +68,7 @@ module Prowler
|
|
68
68
|
|
69
69
|
private
|
70
70
|
def perform(command, api_key, provider_key, data = {}, method = :post) #:nodoc:
|
71
|
-
params = { :apikey => format_api_key(command, api_key), :
|
71
|
+
params = { :apikey => format_api_key(command, api_key), :providerkey => provider_key }.merge(data).delete_if { |k,v| v.nil? }
|
72
72
|
case method
|
73
73
|
when :post
|
74
74
|
perform_post(command, params)
|
data/prowler.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{prowler}
|
8
|
-
s.version = "1.2.
|
8
|
+
s.version = "1.2.1"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Andrew White"]
|
12
|
-
s.date = %q{2011-01-
|
12
|
+
s.date = %q{2011-01-30}
|
13
13
|
s.description = %q{A plugin/gem that provides access to the Prowl API (http://prowlapp.com). Works with Rails 2 or 3 as well as any other Ruby web frameworks or in your own scripts.}
|
14
14
|
s.email = %q{andyw@pixeltrix.co.uk}
|
15
15
|
s.extra_rdoc_files = [
|
data/test/prowler_test.rb
CHANGED
@@ -149,6 +149,11 @@ class ProwlerTest < Test::Unit::TestCase
|
|
149
149
|
should "send with a high priority using options" do
|
150
150
|
assert_notified Prowler, "Event Name", "Message Text", :priority => Prowler::Priority::HIGH
|
151
151
|
end
|
152
|
+
|
153
|
+
should "send the provider key if configured" do
|
154
|
+
Prowler.provider_key = "providerkey"
|
155
|
+
assert_notified Prowler, "Event Name", "Message Text"
|
156
|
+
end
|
152
157
|
end
|
153
158
|
|
154
159
|
context "Verifying an API key" do
|
@@ -199,6 +204,11 @@ class ProwlerTest < Test::Unit::TestCase
|
|
199
204
|
Prowler.verify_certificate = false
|
200
205
|
Prowler.verify
|
201
206
|
end
|
207
|
+
|
208
|
+
should "send the provider key if configured" do
|
209
|
+
Prowler.provider_key = "providerkey"
|
210
|
+
assert_verified Prowler, "apikey", "providerkey"
|
211
|
+
end
|
202
212
|
end
|
203
213
|
|
204
214
|
private
|
@@ -206,8 +216,16 @@ class ProwlerTest < Test::Unit::TestCase
|
|
206
216
|
"#{Prowler::SERVICE_URL}/verify"
|
207
217
|
end
|
208
218
|
|
209
|
-
def
|
210
|
-
|
219
|
+
def build_url(config, api_key, provider_key)
|
220
|
+
if provider_key
|
221
|
+
"#{verify_url}?providerkey=#{provider_key}&apikey=#{api_key}"
|
222
|
+
else
|
223
|
+
"#{verify_url}?apikey=#{api_key}"
|
224
|
+
end
|
225
|
+
end
|
226
|
+
|
227
|
+
def assert_verified(config, api_key = "apikey", provider_key = nil, &block)
|
228
|
+
request = stub_request(:get, build_url(config, api_key, provider_key))
|
211
229
|
request.with(:headers => { "Accept" => "*/*" })
|
212
230
|
request.with(:headers => { "User-Agent" => Prowler::USER_AGENT })
|
213
231
|
|
@@ -218,12 +236,12 @@ class ProwlerTest < Test::Unit::TestCase
|
|
218
236
|
end
|
219
237
|
|
220
238
|
config.verify
|
221
|
-
assert_requested :get,
|
239
|
+
assert_requested :get, build_url(config, api_key, provider_key)
|
222
240
|
end
|
223
241
|
|
224
|
-
def assert_not_verified(config, api_key = "apikey")
|
242
|
+
def assert_not_verified(config, api_key = "apikey", provider_key = nil)
|
225
243
|
config.verify
|
226
|
-
assert_not_requested :get,
|
244
|
+
assert_not_requested :get, build_url(config, api_key, provider_key)
|
227
245
|
end
|
228
246
|
|
229
247
|
def notify_url
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: prowler
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 29
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 2
|
9
|
-
-
|
10
|
-
version: 1.2.
|
9
|
+
- 1
|
10
|
+
version: 1.2.1
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Andrew White
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2011-01-
|
18
|
+
date: 2011-01-30 00:00:00 +00:00
|
19
19
|
default_executable:
|
20
20
|
dependencies: []
|
21
21
|
|