c2dm 0.1.2 → 0.1.3

data/README.markdown

@@ -14,16 +14,34 @@ An Android device running 2.2 or newer, its registration token, and a google acc
 
 There are two ways to use c2dm.
 
-Sending an array of notifications:
-
-    notifications = [{:registration_id => registration_id2_from_client, :message => "Some awesome message"}]
-    C2DM::Push.send_notifications(your_google_account_id, your_password, "MyCompany-MyApp-1.0", notifications)
-
-or one at a time:
+Sending many notifications:
+    notifications = [
+      {
+        :registration_id => "...", 
+        :data => {
+          :some_message => "Some payload"
+          :another_message => 10
+        },
+        :collapse_key => "foobar" #optional
+      }
+    ]
+
+    C2DM.send_notifications("someone@gmail.com", "and_their_password", notifications, "MyCompany-MyApp-1.0.0")
+
+...or one at a time:
+    c2dm = C2DM.new("someone@gmail.com", "and_their_password", "MyCompany-MyApp-1.0")
+    
+    notification = {
+      :registration_id => "...", 
+      :data => {
+        :some_message => "Some payload"
+        :another_message => 10
+      },
+      :collapse_key => "foobar" #optional
+    }
 
-    c2dm = C2DM::Push.new(your_google_account_id, your_password, "MyCompany-MyApp-1.0")
-    c2dm.send_notification(registration_id2_from_client, "Some awesome message")
+    c2dm.send_notification(notification)
 
 ##Copyrights
 
-* Copyright (c) 2010 Amro Mousa. See LICENSE.txt for details.
+* Copyright (c) 2010-2011 Amro Mousa. See LICENSE.txt for details.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/c2dm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{c2dm}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amro Mousa"]
-  s.date = %q{2011-03-29}
+  s.date = %q{2011-03-31}
   s.description = %q{c2dm sends push notifications to Android devices via google c2dm.}
   s.email = %q{amromousa@gmail.com}
   s.extra_rdoc_files = [

data/lib/c2dm.rb

@@ -1,48 +1,72 @@
 require 'httparty'
 require 'cgi'
 
-module C2DM
-  class Push
-    include HTTParty
-    default_timeout 30
-
-    attr_accessor :timeout
-
-    AUTH_URL = 'https://www.google.com/accounts/ClientLogin'
-    PUSH_URL = 'https://android.apis.google.com/c2dm/send'
-
-    def initialize(username, password, source)
-      post_body = "accountType=HOSTED_OR_GOOGLE&Email=#{username}&Passwd=#{password}&service=ac2dm&source=#{source}"
-      params = {:body => post_body,
-                :headers => {'Content-type' => 'application/x-www-form-urlencoded', 
-                             'Content-length' => "#{post_body.length}"}}
-
-      response = Push.post(AUTH_URL, params)
-      
-      raise response if response["Error="]
-      
-      response_split = response.body.split("\n")
-      @auth_token = response_split[2].gsub("Auth=", "")
-    end
+class C2DM
+  include HTTParty
+  default_timeout 30
+
+  attr_accessor :timeout
+
+  AUTH_URL = 'https://www.google.com/accounts/ClientLogin'
+  PUSH_URL = 'https://android.apis.google.com/c2dm/send'
+  DEFAULT_SOURCE = 'MyCompany-MyAppName-1.0'
 
-    def send_notification(registration_id, message)
-      post_body = "registration_id=#{registration_id}&collapse_key=foobar&data.message=#{CGI::escape(message)}"
-      params = {:body => post_body,
-                :headers => {'Authorization' => "GoogleLogin auth=#{@auth_token}"}}
+  def initialize(username, password, source = DEFAULT_SOURCE)
+    post_body = "accountType=HOSTED_OR_GOOGLE&Email=#{username}&Passwd=#{password}&service=ac2dm&source=#{source}"
+    params = {
+      :body => post_body, 
+      :headers => {
+        'Content-type' => 'application/x-www-form-urlencoded', 
+        'Content-length' => "#{post_body.length}"
+      }
+    }
 
-      response = Push.post(PUSH_URL, params)
-      response
+    response = self.class.post(AUTH_URL, params)
+
+    raise response if response["Error="] #Raise error in case of auth failure
+
+    response_split = response.body.split("\n")
+    @auth_token = response_split[2].gsub("Auth=", "")
+  end
+
+  # {
+  #   :registration_id => "...",
+  #   :data => {
+  #     :some_message => "Hi!", 
+  #     :another_message => 7
+  #   }
+  #   :collapse_key => "optional collapse_key string"
+  # }
+  def send_notification(options)
+    post_body = []
+    options.delete(:data).each_pair do |k,v| 
+      post_body << "data.#{k}=#{CGI::escape(v.to_s)}"
     end
 
-    def self.send_notifications(username, password, source, notifications)
-      c2dm = Push.new(username, password, source)
-    
-      responses = []
-      notifications.each do |notification|
-        responses << {:body => c2dm.send_notification(notification[:registration_id], notification[:message]), :registration_id => notification[:registration_id]}
-      end
-      responses
+    options[:collapse_key] = "foo" unless options[:collapse_key]
+
+    options.each_pair do |k,v| 
+      post_body << "#{k}=#{CGI::escape(v.to_s)}"
     end
 
+    post_body = post_body.join("&")
+    params = {
+      :body => post_body, 
+      :headers => {
+        'Authorization' => "GoogleLogin auth=#{@auth_token}",
+        'Content-type' => 'application/x-www-form-urlencoded',
+        'Content-length' => "#{post_body.length}"
+      }
+    }
+    self.class.post(PUSH_URL, params)
+  end
+
+  def self.send_notifications(username, password, notifications, source = DEFAULT_SOURCE)
+    c2dm = C2DM.new(username, password, source)
+    responses = []
+    notifications.each do |notification|
+      responses << {:body => c2dm.send_notification(notification), :registration_id => notification[:registration_id]}
+    end
+    responses
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: c2dm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Amro Mousa
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -04:00
+date: 2011-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1271509393017915368
+      hash: 4436036205569639874
       segments: 
       - 0
       version: "0"