prowler 1.2.0 → 1.2.1

data/CHANGELOG

@@ -1,3 +1,10 @@
+*1.2.1 (January 27th, 2011)
+
+* Correct typo in providerkey url parameter
+
+
+*1.2.0 (January 27th, 2011)
+
 * Support usage as a gem plugin
 
 * Add option for custom url

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/prowler/application.rb

@@ -68,7 +68,7 @@ module Prowler
 
     private
       def perform(command, api_key, provider_key, data = {}, method = :post) #:nodoc:
-        params = { :apikey => format_api_key(command, api_key), :provider_key => provider_key }.merge(data).delete_if { |k,v| v.nil? }
+        params = { :apikey => format_api_key(command, api_key), :providerkey => provider_key }.merge(data).delete_if { |k,v| v.nil? }
         case method
         when :post
           perform_post(command, params)

data/prowler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{prowler}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew White"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-01-30}
   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.}
   s.email = %q{andyw@pixeltrix.co.uk}
   s.extra_rdoc_files = [

data/test/prowler_test.rb

@@ -149,6 +149,11 @@ class ProwlerTest < Test::Unit::TestCase
     should "send with a high priority using options" do
       assert_notified Prowler, "Event Name", "Message Text", :priority => Prowler::Priority::HIGH
     end
+
+    should "send the provider key if configured" do
+      Prowler.provider_key = "providerkey"
+      assert_notified Prowler, "Event Name", "Message Text"
+    end
   end
 
   context "Verifying an API key" do
@@ -199,6 +204,11 @@ class ProwlerTest < Test::Unit::TestCase
       Prowler.verify_certificate = false
       Prowler.verify
     end
+
+    should "send the provider key if configured" do
+      Prowler.provider_key = "providerkey"
+      assert_verified Prowler, "apikey", "providerkey"
+    end
   end
 
   private
@@ -206,8 +216,16 @@ class ProwlerTest < Test::Unit::TestCase
       "#{Prowler::SERVICE_URL}/verify"
     end
 
-    def assert_verified(config, api_key = "apikey", &block)
-      request = stub_request(:get, "#{verify_url}?apikey=#{api_key}")
+    def build_url(config, api_key, provider_key)
+      if provider_key
+        "#{verify_url}?providerkey=#{provider_key}&apikey=#{api_key}"
+      else
+        "#{verify_url}?apikey=#{api_key}"
+      end
+    end
+
+    def assert_verified(config, api_key = "apikey", provider_key = nil, &block)
+      request = stub_request(:get, build_url(config, api_key, provider_key))
       request.with(:headers => { "Accept" => "*/*" })
       request.with(:headers => { "User-Agent" => Prowler::USER_AGENT })
 
@@ -218,12 +236,12 @@ class ProwlerTest < Test::Unit::TestCase
       end
 
       config.verify
-      assert_requested :get, "#{verify_url}?apikey=#{api_key}"
+      assert_requested :get, build_url(config, api_key, provider_key)
     end
 
-    def assert_not_verified(config, api_key = "apikey")
+    def assert_not_verified(config, api_key = "apikey", provider_key = nil)
       config.verify
-      assert_not_requested :get, "#{verify_url}?apikey=#{api_key}"
+      assert_not_requested :get, build_url(config, api_key, provider_key)
     end
 
     def notify_url

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prowler
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Andrew White
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +00:00
+date: 2011-01-30 00:00:00 +00:00
 default_executable: 
 dependencies: []