c2dm_batch 0.1.2 → 0.2.0

data/README.md

@@ -14,33 +14,34 @@ gem install typhoeus
 
 Configuration
 -------------
-C2dmBatch.email = 'your_c2dm_sender@gmail.com' 
-C2dmBatch.password = 'password'
-C2dmBatch.source = 'your app name'
-C2dmBatch.logger = Logger.new(STDOUT) # default logger 
+c2dm_batch = C2dmBatch.new
+@c2dm_batch.email = 'your_c2dm_sender@gmail.com' 
+@c2dm_batch.password = 'password'
+@c2dm_batch.source = 'your app name'
+@c2dm_batch.logger = Logger.new(STDOUT) # default logger 
 
 Send a single notification
 --------------------------
 <pre>
-C2dmBatch.email = 'your_c2dm_sender@gmail.com' 
-C2dmBatch.password = 'password'
-C2dmBatch.source = 'your app name'
+@c2dm_batch.email = 'your_c2dm_sender@gmail.com' 
+@c2dm_batch.password = 'password'
+@c2dm_batch.source = 'your app name'
 notification = {
   :registration_id => "your_reg_id",
     :data => { 
       :test => "test"
     }
 }
-C2dmBatch.send_notification(notification)
+@c2dm_batch.send_notification(notification)
 </pre>
 
 Send notifications in batch
 -----------------------------
 
 <pre>
-C2dmBatch.email = 'your_c2dm_sender@gmail.com' 
-C2dmBatch.password = 'password'
-C2dmBatch.source = 'your app name'
+@c2dm_batch.email = 'your_c2dm_sender@gmail.com' 
+@c2dm_batch.password = 'password'
+@c2dm_batch.source = 'your app name'
 notification = [
   {
     :registration_id => "your_reg_id",
@@ -55,7 +56,7 @@ notification = [
       }
   }
 ]
-errors = C2dmBatch.send_batch_notification(notification)
+errors = @c2dm_batch.send_batch_notification(notification)
 </pre>
 
 Using Typhoeus, the send_batch_notification will parallelize the request in up to 200 parallel requests. Once a request finishes, a new request will automatically get send out. The return value is an array of hashes. The hash is of the form { :registration_id => 'reg_id', :error => 'error_code' }

data/c2dm_batch.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "c2dm_batch"
-  s.version     = '0.1.2'
+  s.version     = '0.2.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Alex Rockwell"]
   s.email       = ["arockwell@gmail.com"]

data/lib/c2dm_batch.rb

@@ -8,7 +8,4 @@ require 'json'
 
 $:.unshift File.dirname(__FILE__)
 
-module C2dmBatch
-end
-
 require 'c2dm_batch/core'

data/lib/c2dm_batch/core.rb

@@ -1,19 +1,14 @@
-module C2dmBatch
-  @auth_url = 'https://www.google.com/accounts/ClientLogin'
-  @send_url = 'https://android.apis.google.com/c2dm/send'
-
-  @email = nil
-  @password = nil 
-  @source = nil
-
-  @hydra = Typhoeus::Hydra.new
-  @logger = Logger.new(STDOUT)
-
-  class << self
-    attr_accessor :auth_url, :send_url, :email, :password, :source, :logger
+class C2dmBatch
+  attr_accessor :auth_url, :send_url, :email, :password, :source, :logger
+  
+  def initialize
+    @auth_url = 'https://www.google.com/accounts/ClientLogin'
+    @send_url = 'https://android.apis.google.com/c2dm/send'
+    @hydra = Typhoeus::Hydra.new
+    @logger = Logger.new(STDOUT)
   end
 
-  def self.authenticate!
+  def authenticate!
     request = Typhoeus::Request.new(@auth_url)
     auth_options = {
       'accountType' => 'HOSTED_OR_GOOGLE',
@@ -44,7 +39,7 @@ module C2dmBatch
     @auth_token = auth_token
   end
 
-  def self.send_notification(notification)
+  def send_notification(notification)
     authenticate!
     request = create_notification_request(notification)
 
@@ -53,7 +48,7 @@ module C2dmBatch
     response = request.response
   end
 
-  def self.send_batch_notifications(notifications)
+  def send_batch_notifications(notifications)
     authenticate!
     requests = []
     errors = []
@@ -65,6 +60,7 @@ module C2dmBatch
         if response.success?
           if response.body =~ /Error=(\w+)/
             errors << { :registration_id => notification[:registration_id], :error => $1 }
+            @logger.error("Error received: #{response.body}")
             @logger.info("Error sending: #{notification.to_json}")
           else
             @logger.info("Sent notification: #{notification.to_json}")
@@ -91,7 +87,7 @@ module C2dmBatch
   end
 
   private
-  def self.build_post_body(options={})
+  def build_post_body(options={})
     post_body = []
 
     # data attributes need a key in the form of "data.key"...
@@ -108,7 +104,7 @@ module C2dmBatch
     post_body.join('&')
   end
 
-  def self.create_notification_request(notification)
+  def create_notification_request(notification)
     request = Typhoeus::Request.new(@send_url)
     notification[:collapse_key] = 'collapse'
     request.body = build_post_body(notification)

data/spec/c2dm_batch/core_spec.rb

@@ -3,19 +3,20 @@ require 'spec_helper'
 describe C2dmBatch do
   before do
     @config = YAML::load(File.open("config.yml"))
-    C2dmBatch.email = @config['server']['username']
-    C2dmBatch.password = @config['server']['password']
-    C2dmBatch.source = @config['server']['source']
+    @c2dm_batch = C2dmBatch.new
+    @c2dm_batch.email = @config['server']['username']
+    @c2dm_batch.password = @config['server']['password']
+    @c2dm_batch.source = @config['server']['source']
     @reg_id = @config['client']['registration_id']
   end
 
   it "should give an auth token" do
-    auth_code = C2dmBatch.authenticate!
+    auth_code = @c2dm_batch.authenticate!
     auth_code.should_not eql("")
   end
 
   it "should send a notifcation" do
-    C2dmBatch.send_notification(create_notification(@reg_id, "boston-college-football"))
+    @c2dm_batch.send_notification(create_notification(@reg_id, "boston-college-football"))
   end
 
   it "should send notifications in batches" do
@@ -24,7 +25,7 @@ describe C2dmBatch do
     teams.each do |team|
       notifications << create_notification(@reg_id, team)
     end
-    errors = C2dmBatch.send_batch_notifications(notifications)
+    errors = @c2dm_batch.send_batch_notifications(notifications)
     errors.size.should == 0
   end
 
@@ -34,7 +35,7 @@ describe C2dmBatch do
     bad_reg_id = "bad_reg_id"
     notifications << create_notification(bad_reg_id, teams[0])
     notifications << create_notification(@reg_id, teams[1])
-    errors = C2dmBatch.send_batch_notifications(notifications)
+    errors = @c2dm_batch.send_batch_notifications(notifications)
     errors.size.should == 1
     errors[0][:registration_id].should == bad_reg_id
     errors[0][:error].should == "InvalidRegistration"
@@ -43,7 +44,7 @@ describe C2dmBatch do
   it "should return MessageToBig status code" do
     notifications = []
     notifications << create_notification(@reg_id, "1" * 1025)
-    errors = C2dmBatch.send_batch_notifications(notifications)
+    errors = @c2dm_batch.send_batch_notifications(notifications)
     errors[0][:registration_id].should == @reg_id
     errors[0][:error].should == "MessageTooBig"
   end
@@ -52,13 +53,13 @@ describe C2dmBatch do
     hydra = Typhoeus::Hydra.new
     response = Typhoeus::Response.new(:code => 503, :headers => "", :body => "registration=123")
     hydra.stub(:post, 'https://android.apis.google.com/c2dm/send').and_return(response)
-    C2dmBatch.instance_variable_set("@hydra", hydra)
+    @c2dm_batch.instance_variable_set("@hydra", hydra)
     teams = [ "buffalo-bills", "miami-dolphins", "new-york-jets"]
     notifications = []
     teams.each do |team|
       notifications << create_notification(@reg_id, team)
     end
-    errors = C2dmBatch.send_batch_notifications(notifications)
+    errors = @c2dm_batch.send_batch_notifications(notifications)
     errors.size.should == 3
     errors[0][:error].should == 503
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: c2dm_batch
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alex Rockwell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 -07:00
+date: 2012-06-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency