rushover 0.1.1 → 0.2.0

data/lib/rushover.rb

@@ -34,7 +34,7 @@ module Rushover
 
     def post_json(url, data)
       raw_response = begin
-        RestClient.post url, data.to_json, :content_type => "application/json"
+        RestClient.post url, data
       rescue RestClient::Exception => e
         e.response
       end

data/lib/rushover/version.rb

@@ -1,3 +1,3 @@
 module Rushover
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/rushover_client_test.rb

@@ -20,15 +20,15 @@ class RushoverClientTest < RushoverTest
     end
 
     test "sending a message uses the token" do
-      assert_equal "test_api_token", last_request_json["token"]
+      assert_equal "test_api_token", last_request_param("token")
     end
 
     test "sending a message to the intended user" do
-      assert_equal "test_user", last_request_json["user"]
+      assert_equal "test_user", last_request_param("user")
     end
 
     test "sending a notification includes the message" do
-      assert_equal "test message", last_request_json["message"]
+      assert_equal "test message", last_request_param("message")
     end
 
     test "successful notify" do
@@ -50,10 +50,10 @@ class RushoverClientTest < RushoverTest
     test "basic optional params" do
       client.notify("test_user", "test message", :device => "test device",
                     :title => "test title", :priority => 1, :timestamp => 123123)
-      assert_equal "test device", last_request_json["device"]
-      assert_equal "test title", last_request_json["title"]
-      assert_equal "1", last_request_json["priority"].to_s
-      assert_equal "123123", last_request_json["timestamp"].to_s
+      assert_equal "test device", last_request_param("device")
+      assert_equal "test title", last_request_param("title")
+      assert_equal "1", last_request_param("priority").to_s
+      assert_equal "123123", last_request_param("timestamp").to_s
     end
   end
 
@@ -63,7 +63,7 @@ class RushoverClientTest < RushoverTest
                            :body => { "status" => 1 }.to_json,
                            :content_type => "application/json")
       resp = client.validate("user_exists")
-      assert_equal "user_exists", last_request_json["user"]
+      assert_equal "user_exists", last_request_param("user")
       assert resp.ok?
     end
 
@@ -72,7 +72,7 @@ class RushoverClientTest < RushoverTest
                            :body => { "status" => 1 }.to_json,
                            :content_type => "application/json")
       resp = client.validate("user_exists", "htc4g")
-      assert_equal "htc4g", last_request_json["device"]
+      assert_equal "htc4g", last_request_param("device")
     end
 
     test "determining a user does not exist" do
@@ -80,7 +80,7 @@ class RushoverClientTest < RushoverTest
                            :body => { "status" => 0 }.to_json,
                            :content_type => "application/json")
       resp = client.validate("user_missing")
-      assert_equal "user_missing", last_request_json["user"]
+      assert_equal "user_missing", last_request_param("user")
       refute resp.ok?
     end
 

data/test/rushover_user_test.rb

@@ -16,19 +16,19 @@ class RushoverUserTest < RushoverTest
 
   test "notifying the user via the client" do
     @user.notify("test user message", :priority => 1)
-    assert_equal "test user message", last_request_json["message"]
-    assert_equal "1", last_request_json["priority"].to_s
+    assert_equal "test user message", last_request_param("message")
+    assert_equal "1", last_request_param("priority").to_s
   end
 
   test "validate if user exists" do
     resp = @user.validate
-    assert_equal "user_key", last_request_json["user"]
+    assert_equal "user_key", last_request_param("user")
     assert resp.ok?
   end
 
   test "validate if user device exists" do
     @user.validate("htc4g")
-    assert_equal "htc4g", last_request_json["device"]
+    assert_equal "htc4g", last_request_param("device")
   end
 
   test "validate! calls ok?" do

data/test/test_helper.rb

@@ -20,7 +20,8 @@ class RushoverTest < Test::Unit::TestCase
     FakeWeb.clean_registry
   end
 
-  def last_request_json
-    JSON.parse(FakeWeb.last_request.body)
+  def last_request_param(param)
+    params = CGI.parse(FakeWeb.last_request.body)
+    Array(params[param]).first
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rushover
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152653380 !ruby/object:Gem::Requirement
+  requirement: &2161834960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152653380
+  version_requirements: *2161834960
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2152652960 !ruby/object:Gem::Requirement
+  requirement: &2161834540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152652960
+  version_requirements: *2161834540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152652540 !ruby/object:Gem::Requirement
+  requirement: &2161834120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152652540
+  version_requirements: *2161834120
 - !ruby/object:Gem::Dependency
   name: contest
-  requirement: &2152652120 !ruby/object:Gem::Requirement
+  requirement: &2161833700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152652120
+  version_requirements: *2161833700
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2152651700 !ruby/object:Gem::Requirement
+  requirement: &2161833280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152651700
+  version_requirements: *2161833280
 description: A simple ruby Pushover client
 email:
 - xternal1+github@gmail.com
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3834884263461647781
+      hash: -2604947186383905221
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3834884263461647781
+      hash: -2604947186383905221
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15