appush_client 0.2 → 0.3

data/appush_client.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'appush_client'
-  s.version = '0.2'
+  s.version = '0.3'
 
   s.authors = ['Igor Guerrero']
   s.date = '2010-01-09'
@@ -13,5 +13,5 @@ Gem::Specification.new do |s|
     'spec/appush_client_spec.rb']
   s.summary = "Ruby client library for Appush PUSH service."
 
-  s.add_dependency 'rest-client', '>= 1.0'
+  s.add_dependency 'rest-client', '>= 1.3.1'
 end

data/lib/appush_client.rb

@@ -139,10 +139,6 @@ class Profile < AppushClient
   def register_device(device_token, tags=[])
     url = "#{@service_url}/device/#{device_token}"
 
-    if tags.empty?
-      return RestClient.put url, :content_type=>:json, :accept=>:json
-    end
-
     data = {:tags=>tags}.to_json
 
     RestClient.put url, data, :content_type=>:json, :accept=>:json

data/spec/appush_client_spec.rb

@@ -3,91 +3,201 @@
 require 'appush_client'
 require 'webmock/rspec'
 
+require 'json'
+
 include WebMock
 
 describe "Using Appush client API" do
   before(:each) do
-    @app_key = "I6ieYiJtbH3YPriyR3AK3VZtgSP"
-    @app_secret = "48907eb5efbffe9ee23e62e2b9273929"
-    @push_secret = "72781d3c6d508699e8f3918de6dceb25"
-    @service_url = "http://appush.com/api"
-
-    @client = AppushClient.new @app_key,
-                               @app_secret,
-                               :push_secret=>@push_secret,
-                               :service_url=>@service_url
+    # I used test keys and tokens, but tested them to work
+    @root_key = "09a539a84e32ddbce7c6bcdcedba78f4"
+    @root_secret = "e77694945eff115f4b0cc6d0bcf800ec"
+    @app_key = "38KaiutatmjKWPsbksVco1YeQeE"
+    @app_secret = "5ZulDkmNY230rRyx3v6CaJfkAhP"
+    @profile_key = "GkYwZ5xTV8PXJJZksQDV3POKMCp"
+    @profile_secret = "TqRrqWfnW0Zp4jsxOEQQR6iCcLH"
+    @service_url = "https://appush.com/api"
+
+    # we initialize every object on every test
+    @root_user = RootUser.new @root_key, @root_secret, :service_url=>@service_url
+    @application = Application.new @app_key, @app_secret, :service_url=>@service_url
+    @profile = Profile.new @profile_key, @profile_secret, :service_url=>@service_url
   end
 
   it "should not be null" do
-    @client.should_not be nil
-    @client.to_s.should == "Appush Client = I6ieYiJtbH3YPriyR3AK3VZtgSP:48907eb5efbffe9ee23e62e2b9273929, Push Secret = 72781d3c6d508699e8f3918de6dceb25, Server = appush.com/api"
-    @client.protocol.should == "http://"
+    @root_user.should_not be nil
+    @root_user.to_s.should == "Server = https://09a539a84e32ddbce7c6bcdcedba78f4:e77694945eff115f4b0cc6d0bcf800ec@appush.com/api"
+
+    @application.should_not be nil
+    @application.to_s.should == "Server = https://38KaiutatmjKWPsbksVco1YeQeE:5ZulDkmNY230rRyx3v6CaJfkAhP@appush.com/api"
+
+    @profile.should_not be nil
+    @profile.to_s.should == "Server = https://GkYwZ5xTV8PXJJZksQDV3POKMCp:TqRrqWfnW0Zp4jsxOEQQR6iCcLH@appush.com/api"
+  end
+
+  it "should create an application" do
+    result = "{\"id\":\"YZgzHWpxdt4emUAYTptovTcfYdW\"}"
+
+    stub_request(:post, "https://#{@root_key}:#{@root_secret}@appush.com/api/application").to_return(:body=>result)
+
+    @root_user.create_application("test").to_s.should == result
+
+    WebMock.should have_requested(:post, "https://#{@root_key}:#{@root_secret}@appush.com/api/application").once
+  end
+
+  it "should modify an application" do
+    result = ""
+    id = "test"
+
+    stub_request(:put, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}").to_return(:body=>result)
+
+    @root_user.modify_application("test", :name=>"new name").to_s.should == result
+
+    WebMock.should have_requested(:put, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}").once
   end
-  
-  it "should get device information" do
-    result = {"tags"=>["foo", "waa"], "status"=> 200}
 
-    stub_request(:get, "#{@client.protocol}#{@client.app_key}:#{@client.app_secret}@#{@client.service_url}/device/test_device").to_return(:body=>result.to_json)
+  it "should list all applications" do
+    result = "[\"app1\", \"app2\"]"
+
+    stub_request(:get, "https://#{@root_key}:#{@root_secret}@appush.com/api/application").to_return(:body=>result)
+
+    @root_user.list_applications.to_s.should == result
+
+    WebMock.should have_requested(:get, "https://#{@root_key}:#{@root_secret}@appush.com/api/application").once
+  end
+
+  it "should get an application" do
+    result = "{\"name\":\"My New Application\", \"application_token\": \"EVtmyITWMKzDRtawXxubVmfIYWU\", \"application_secret\": \"e52c6cbd232e2111671953d320ff80a2\", \"status\":\"dev\",\"dev_pem\":\"Bag Attributes\", \"active_devices\":0}\""
+    id = "test"
+
+    stub_request(:get, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}").to_return(:body=>result)
+
+    @root_user.get_application(id).to_s.should == result
+
+    WebMock.should have_requested(:get, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}").once
+  end
+
+  it "should get an application icon" do
+    result = File.read("#{File.dirname(__FILE__)}/no-icon.png")
+    id = "test"
+
+    stub_request(:get, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}/icon").to_return(:body=>result)
+
+    @root_user.get_application_icon(id).to_s.should == result
+
+    WebMock.should have_requested(:get, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}/icon").once
+  end
+
+  it "should save an application icon" do
+    icon = File.read("#{File.dirname(__FILE__)}/no-icon.png")
+    id = "test"
+
+    stub_request(:put, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}/icon").with(:body=>icon, :headers=>{"Content-Type"=>"image/png"}).to_return(:body=>"")
+
+    @root_user.save_application_icon(id, icon).to_s.should == ""
+
+    WebMock.should have_requested(:put, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}/icon").once
+  end
+
+  it "should delete an application" do
+    id = "test"
+
+    stub_request(:delete, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}").to_return(:body=>"")
+
+    @root_user.delete_application(id).to_s.should == ""
+
+    WebMock.should have_requested(:delete, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}").once
+  end
+
+  it "should send a notification" do
+    id = "test"
+
+    params={:tags=>["one", "two", "three"],
+            :devices=>["lol", "waa"],
+            :exclude=>["do", "not", "exclude", "me"],
+            :alert=>"w00t!",
+            :sound=>"cat.ogg",
+            :badge=>1,
+            :kv=>{:go=>"crazy"}}
+
+    stub_request(:post, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}/notification").with(:body=>"{\"devices\":[\"lol\",\"waa\"],\"payload\":{\"go\":\"crazy\",\"aps\":{\"badge\":1,\"sound\":\"cat.ogg\",\"alert\":\"w00t!\"}},\"exclude\":[\"do\",\"not\",\"exclude\",\"me\"],\"tags\":[\"one\",\"two\",\"three\"]}", :headers=>{"Content-Type"=>"application/json"}).to_return(:body=>"")
+
+    @root_user.send_notification(id, params).to_s.should == ""
+
+    WebMock.should have_requested(:post, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{id}/notification").once
+  end
+
+  it "should get an notification status" do
+    app_id = "test_app"
+    notification_id = "test_notification"
+
+    stub_request(:get, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{app_id}/notification/#{notification_id}").to_return(:body=>"")
+
+    @root_user.get_notification_status(app_id, notification_id).to_s.should == ""
+
+    WebMock.should have_requested(:get, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{app_id}/notification/#{notification_id}").once
+  end
+
+  it "should get all devices by tag" do
+    app_id = "test"
+    tag = "waa"
+
+    stub_request(:get, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{app_id}/tag/#{tag}").to_return(:body=>"")
 
-    @client.get_device("test_device").should == result
+    @root_user.get_devices_by_tag(app_id, tag).to_s.should == ""
 
-    WebMock.should have_requested(:get, "#{@client.protocol}#{@client.app_key}:#{@client.app_secret}@#{@client.service_url}/device/test_device").once
+    WebMock.should have_requested(:get, "https://#{@root_key}:#{@root_secret}@appush.com/api/application/#{app_id}/tag/#{tag}").once
   end
 
-  it "should register devices" do
-    result = {"status"=>204}
+  it "should get a device information" do
+    dev_token = "test_dev"
 
-    stub_request(:put, "#{@client.protocol}#{@client.app_key}:#{@client.app_secret}@#{@client.service_url}/device/test_device2").to_return(:body=>result.to_json, :status=>204)
+    stub_request(:get, "https://#{@profile_key}:#{@profile_secret}@appush.com/api/device/#{dev_token}").to_return(:body=>"")
 
-    @client.register_device("test_device2").should == result
+    @profile.get_device(dev_token).to_s.should == ""
 
-    WebMock.should have_requested(:put, "#{@client.protocol}#{@client.app_key}:#{@client.app_secret}@#{@client.service_url}/device/test_device2").once
+    WebMock.should have_requested(:get, "https://#{@profile_key}:#{@profile_secret}@appush.com/api/device/#{dev_token}").once
   end
 
-  it "should unregister devices" do
-    result = {"status"=>204}
+  it "should register a device with tags" do
+    dev_token = "test_dev"
+    tags = ["foo", "bar"]
 
-    stub_request(:delete, "#{@client.protocol}#{@client.app_key}:#{@client.app_secret}@#{@client.service_url}/device/test_device").to_return(:body=>result.to_json, :status=>204)
+    stub_request(:put, "https://#{@profile_key}:#{@profile_secret}@appush.com/api/device/#{dev_token}").with(:body=>{:tags=>tags}.to_json, :headers=>{"Content-Type"=>"application/json"}).to_return(:body=>"")
 
-    @client.unregister_device("test_device").should == result
+    @profile.register_device(dev_token, tags).to_s.should == ""
 
-    WebMock.should have_requested(:delete, "#{@client.protocol}#{@client.app_key}:#{@client.app_secret}@#{@client.service_url}/device/test_device").once
+    WebMock.should have_requested(:put, "https://#{@profile_key}:#{@profile_secret}@appush.com/api/device/#{dev_token}").once
   end
 
-  it "should get devices using a tag" do
-    result = {"devices"=>["test_device"],"status"=>200}
+  it "should register a device without tags" do
+    dev_token = "test_dev"
+    tags = []
 
-    stub_request(:get, "#{@client.protocol}#{@client.app_key}:#{@client.push_secret}@#{@client.service_url}/tag/waa").to_return(:body=>result.to_json, :status=>200)
+    stub_request(:put, "https://#{@profile_key}:#{@profile_secret}@appush.com/api/device/#{dev_token}").with(:body=>{:tags=>tags}.to_json, :headers=>{"Content-Type"=>"application/json"}).to_return(:body=>"")
 
-    @client.get_devices_by_tag("waa").should == result
+    @profile.register_device(dev_token, tags).to_s.should == ""
 
-    WebMock.should have_requested(:get, "#{@client.protocol}#{@client.app_key}:#{@client.push_secret}@#{@client.service_url}/tag/waa").once
+    WebMock.should have_requested(:put, "https://#{@profile_key}:#{@profile_secret}@appush.com/api/device/#{dev_token}").once
   end
 
-  it "should send notifications" do
-    result = {"status"=>201}
-    tags = ["foo", "waa"]
-    devices = ["test_device"]
-    exclude = ["invalid_device"]
-    alert = "hello"
-    sound = "meow.aiff"
-    badge = 1
-    kv = {"spam"=>"foo"}
+  it "should unregister a device" do
+    dev_token = "test_dev"
 
-    stub_request(:post, "#{@client.protocol}#{@client.app_key}:#{@client.push_secret}@#{@client.service_url}/notification").to_return(:status=>201, :body=>result.to_json)
+    stub_request(:delete, "https://#{@profile_key}:#{@profile_secret}@appush.com/api/device/#{dev_token}").to_return(:body=>"")
 
-    @client.send_notification(:tags=>tags, :devices=>devices, :exclude=>exclude, :alert=>alert, :sound=>sound, :badge=>badge, :kv=>kv).should == {"status"=>201}
+    @profile.unregister_device(dev_token).to_s.should == ""
 
-    WebMock.should have_requested(:post, "#{@client.protocol}#{@client.app_key}:#{@client.push_secret}@#{@client.service_url}/notification").once
+    WebMock.should have_requested(:delete, "https://#{@profile_key}:#{@profile_secret}@appush.com/api/device/#{dev_token}").once
   end
 
-  it "should get notifications statuses" do
-    result = {"devices"=>["test_device"], "completed"=>0, "payload"=>{"aps"=>{"badge"=>1, "sound"=>"meow.aiff", "alert"=>"Hello World"}, "spam"=>"eggs"}, "delivered"=>[], "tags"=>["foo", "bar", "baz"], "status"=>200}
+  it "should create a profile" do
+    result = "[\"x\", \"y\"]"
 
-    stub_request(:get, "#{@client.protocol}#{@client.app_key}:#{@client.push_secret}@#{@client.service_url}/notification/id_notify").to_return(:body=>result.to_json)
+    stub_request(:post, "https://#{@app_key}:#{@app_secret}@appush.com/api/profile").with(:headers=>{"Content-Type"=>"application/json"}).to_return(:body=>result)
 
-    @client.get_notification_status("id_notify").should == result
+    @application.create_profile.to_s.should == result
 
-    WebMock.should have_requested(:get, "#{@client.protocol}#{@client.app_key}:#{@client.push_secret}@#{@client.service_url}/notification/id_notify").once
+    WebMock.should have_requested(:post, "https://#{@app_key}:#{@app_secret}@appush.com/api/profile").once
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appush_client
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Igor Guerrero
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.0"
+        version: 1.3.1
     version: 
 description: Ruby client library for Appush PUSH service.
 email: