c2dm 0.1.6 → 0.2.0

data/Gemfile

@@ -5,9 +5,11 @@ source "http://rubygems.org"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
+gem "httparty"
+
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem 'simplecov', :require => false
 end

data/Gemfile.lock

@@ -2,19 +2,28 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.2)
-    rcov (0.9.9)
+    multi_json (1.0.4)
+    multi_xml (0.4.1)
+    rake (0.9.2.2)
     shoulda (2.11.3)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  httparty
   jeweler (~> 1.5.1)
-  rcov
   shoulda
+  simplecov

data/README.markdown

@@ -12,43 +12,54 @@ An Android device running 2.2 or newer, its registration token, and a google acc
 
 ##Usage
 
+*Important*: Version 0.2.0+ decouples auth from sending so the API changed. Please update your code.
+
 There are two ways to use c2dm.
 
 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")```
+
+	notifications = [
+	  {
+	    :registration_id => "...", 
+	    :data => {
+	      :some_message => "Some payload"
+	      :another_message => 10
+	    },
+	    :collapse_key => "foobar" #optional
+	  }
+	]
+	
+	C2DM.authenticate!("your@googleuser.com", "somepassword", "YourCo-App-1.0.0")
+	C2DM.send_notifications(notifications)
 
 ...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.authenticate!("your@googleuser.com", "somepassword", "YourCo-App-1.0.0")
+	c2dm = C2DM.new
+
+	notification = {
+	  :registration_id => "...", 
+	  :data => {
+	    :some_message => "Some payload",
+	    :another_message => 10
+	  },
+	  :collapse_key => "foobar" #optional
+	}
+
+	c2dm.send_notification(notification)
+
+Note that calling *authenticate!* will authenticate all new instances of C2DM. You can override this by passing in your own auth_token:
 
-c2dm.send_notification(notification)```
+	c2dm = C2DM.new(auth_token)
 
 ##Copyrights
 
-* Copyright (c) 2010-2011 Amro Mousa, Shawn Veader. See LICENSE.txt for details.
+* Copyright (c) 2010-2012 Amro Mousa, Shawn Veader. See LICENSE.txt for details.
 
 ##Thanks
 
 * [Paul Chun](https://github.com/sixofhearts)
+* [gowalla](https://github.com/gowalla)
 
 ##Other stuff
 

data/Rakefile

@@ -34,13 +34,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/c2dm.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{c2dm}
-  s.version = "0.1.6"
+  s.name = "c2dm"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amro Mousa"]
-  s.date = %q{2011-06-23}
-  s.description = %q{c2dm sends push notifications to Android devices via google c2dm.}
-  s.email = %q{amromousa@gmail.com}
+  s.date = "2012-02-07"
+  s.description = "c2dm sends push notifications to Android devices via google c2dm."
+  s.email = "amromousa@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -29,11 +29,11 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_c2dm.rb"
   ]
-  s.homepage = %q{http://github.com/amro/c2dm}
+  s.homepage = "http://github.com/amro/c2dm"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{c2dm sends push notifications to Android devices via google c2dm.}
+  s.rubygems_version = "1.8.10"
+  s.summary = "c2dm sends push notifications to Android devices via google c2dm."
   s.test_files = [
     "test/helper.rb",
     "test/test_c2dm.rb"
@@ -43,23 +43,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, ["> 0.6.0"])
     else
+      s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<httparty>, ["> 0.6.0"])
     end
   else
+    s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<httparty>, ["> 0.6.0"])
   end
 end

data/lib/c2dm.rb

@@ -5,48 +5,70 @@ class C2DM
   include HTTParty
   default_timeout 30
 
-  attr_accessor :timeout, :username, :password, :source, :access_token
+  attr_accessor :timeout, :auth_token
 
   AUTH_URL = 'https://www.google.com/accounts/ClientLogin'
-  PUSH_URL = 'https://android.apis.google.com/c2dm/send'
-  DEFAULT_SOURCE = 'MyCompany-MyAppName-1.0'
+  PUSH_URL = 'http://android.apis.google.com/c2dm/send' # Work around expired/bad SSL cert...
 
-  def initialize(username=nil, password=nil, source=DEFAULT_SOURCE)
-    @username = username
-    @password = password
-    @source   = source
+  class << self
+    attr_accessor :auth_token
+
+    def authenticate!(username, password, source = nil)
+      auth_options = {
+        'accountType' => 'HOSTED_OR_GOOGLE',
+        'service'     => 'ac2dm',
+        'Email'       => username,
+        'Passwd'      => password,
+        'source'      => source || 'MyCompany-MyAppName-1.0'
+      }
+      post_body = build_post_body(auth_options)
+
+      params = {
+        :body    => post_body,
+        :headers => {
+          'Content-type'   => 'application/x-www-form-urlencoded',
+          'Content-length' => post_body.length.to_s
+        }
+      }
 
-    authenticate!
-  end
+      response = self.post(AUTH_URL, params)
 
-  def authenticated?
-    !@auth_token.nil?
-  end
+      # check for authentication failures
+      raise response.parsed_response if response['Error=']
 
-  def authenticate!(username=nil, password=nil, source=nil)
-    auth_options = {
-      'accountType' => 'HOSTED_OR_GOOGLE',
-      'service'     => 'ac2dm',
-      'Email'       => username || self.username,
-      'Passwd'      => password || self.password,
-      'source'      => source   || self.source
-    }
-    post_body = build_post_body(auth_options)
-
-    params = {
-      :body    => post_body,
-      :headers => {
-        'Content-type'   => 'application/x-www-form-urlencoded',
-        'Content-length' => post_body.length.to_s
-      }
-    }
+      @auth_token = response.body.split("\n")[2].gsub('Auth=', '')
+    end
 
-    response = self.class.post(AUTH_URL, params)
+    def send_notifications(notifications = [])
+      c2dm = C2DM.new(@auth_token)
+      notifications.collect do |notification|
+        {
+          :body => c2dm.send_notification(notification),
+          :registration_id => notification[:registration_id]
+        }
+      end
+    end
+    
+    def build_post_body(options={})
+      post_body = []
+
+      # data attributes need a key in the form of "data.key"...
+      data_attributes = options.delete(:data)
+      data_attributes.each_pair do |k,v|
+        post_body << "data.#{k}=#{CGI::escape(v.to_s)}"
+      end if data_attributes
+
+      options.each_pair do |k,v|
+        post_body << "#{k}=#{CGI::escape(v.to_s)}"
+      end
 
-    # check for authentication failures
-    raise response.parsed_response if response['Error=']
+      post_body.join('&')
+    end
+    
+  end
 
-    @auth_token = response.body.split("\n")[2].gsub('Auth=', '')
+  def initialize(auth_token = nil)
+    @auth_token = auth_token || self.class.auth_token
   end
 
   # {
@@ -59,7 +81,7 @@ class C2DM
   # }
   def send_notification(options)
     options[:collapse_key] ||= 'foo'
-    post_body = build_post_body(options)
+    post_body = self.class.build_post_body(options)
 
     params = {
       :body    => post_body,
@@ -73,32 +95,4 @@ class C2DM
     self.class.post(PUSH_URL, params)
   end
 
-  class << self
-    def send_notifications(username=nil, password=nil, notifications=[], source=nil)
-      c2dm = C2DM.new(username, password, source)
-
-      notifications.collect do |notification|
-        { :body => c2dm.send_notification(notification),
-          :registration_id => notification[:registration_id] }
-      end
-    end
-  end
-
-private
-  def build_post_body(options={})
-    post_body = []
-
-    # data attributes need a key in the form of "data.key"...
-    data_attributes = options.delete(:data)
-    data_attributes.each_pair do |k,v|
-      post_body << "data.#{k}=#{CGI::escape(v.to_s)}"
-    end if data_attributes
-
-    options.each_pair do |k,v|
-      post_body << "#{k}=#{CGI::escape(v.to_s)}"
-    end
-
-    post_body.join('&')
-  end
-
 end

metadata

@@ -1,83 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: c2dm
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.6
 platform: ruby
-authors: 
+authors:
 - Amro Mousa
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-23 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &70329319587220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70329319587220
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70329319586360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70329319586360
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70329319585400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70329319585400
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70329319584520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70329319584520
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70329319583540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70329319583540
+- !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70329319582780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *70329319582780
 description: c2dm sends push notifications to Android devices via google c2dm.
 email: amromousa@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -89,37 +96,34 @@ files:
 - lib/c2dm.rb
 - test/helper.rb
 - test/test_c2dm.rb
-has_rdoc: true
 homepage: http://github.com/amro/c2dm
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2874560584859296799
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 21375347209724665
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: c2dm sends push notifications to Android devices via google c2dm.
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_c2dm.rb