pushmeup 0.0.3 → 0.1.0

data/README.md

@@ -38,7 +38,7 @@ and install it with
 
         $ openssl pkcs12 -in cert.p12 -out cert.pem -nodes -clcerts
 
-3. After you have created your ``pem`` file. Set what host, port, certificate file location on the APNS class. You just need to set this once:
+3. After you have created your ``pem`` file. Set the host, port and certificate file location on the APNS class. You just need to set this once:
 
         APNS.host = 'gateway.push.apple.com' 
         # gateway.sandbox.push.apple.com is default
@@ -153,6 +153,38 @@ for more information on parameters check documentation: [GCM | Android Developer
 
 Check this link [GCM: Getting Started](http://developer.android.com/guide/google/gcm/gs.html)
 
+### (Optional) You can add multiple keys for GCM
+
+You can use multiple keys to send notifications, to do it just do this changes in the code 
+
+#### Configure
+
+		GCM.key = { :key1 => "123abc456def", :key2 => "456def123abc" }
+		# the ``:key1`` and the ``:key2`` can be any object, they can be the projectID, the date, the version, doesn't matter.
+		# The only restrain is: they need to be valid keys for a hash.
+
+#### Usage
+
+		# For single notification
+    GCM.send_notification( destination, :identity => :key1 )
+    # Empty notification
+
+    GCM.send_notification( destination, data, :identity => :key1 )
+    # Notification with custom information
+
+    GCM.send_notification( destination, data, :collapse_key => "placar_score_global", :time_to_live => 3600, :delay_while_idle => false, :identity => :key1 )
+    # Notification with custom information and parameters
+
+		# For multiple notifications
+		options1 = {}
+		options2 = {..., :identity => :key2}
+		n1 = GCM::Notification.new(destination1, data1, options1.merge({:identity => :key2}))
+		n2 = GCM::Notification.new(destination2, data2, :identity => :key1)
+    n3 = GCM::Notification.new(destination3, data3, options2)
+
+    GCM.send_notifications( [n1, n2, n3] )
+    # In this case, every notification has his own parameters, options and key
+
 ## Build Status [![Build Status](https://secure.travis-ci.org/NicosKaralis/pushmeup.png?branch=master)](http://travis-ci.org/NicosKaralis/pushmeup) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/NicosKaralis/pushmeup)
 
 ## Dependency Status [![Dependency Status](https://gemnasium.com/NicosKaralis/pushmeup.png?travis)](https://gemnasium.com/NicosKaralis/pushmeup)

data/lib/pushmeup/apns/core.rb

@@ -32,19 +32,20 @@ module APNS
   
   def self.feedback
     raise "Not implemented yet"
-    # sock, ssl = self.feedback_connection
-    # 
-    # apns_feedback = []
-    # while line = ssl.read(38) # Read lines from the socket
-    #   line.strip!
-    #   f = line.unpack('N1n1H140')
-    #   apns_feedback << [Time.at(f[0]), f[1], f[2]]
-    # end
-    # 
-    # ssl.close
-    # sock.close
-    # 
-    # return apns_feedback
+    sock, ssl = self.feedback_connection
+
+    apns_feedback = []
+
+    while line = sock.gets   # Read lines from the socket
+      line.strip!
+      f = line.unpack('N1n1H140')
+      apns_feedback << [Time.at(f[0]), f[2]]
+    end
+
+    ssl.close
+    sock.close
+
+    return apns_feedback
   end
   
   protected
@@ -64,32 +65,22 @@ module APNS
     return sock, ssl
   end
   
-  # def self.feedback_connection
-  #   raise "The path to your pem file is not set. (APNS.pem = /path/to/cert.pem)" unless self.pem
-  #   raise "The path to your pem file does not exist!" unless File.exist?(self.pem)
-  #   
-  #   context      = OpenSSL::SSL::SSLContext.new
-  #   context.cert = OpenSSL::X509::Certificate.new(File.read(self.pem))
-  #   context.key  = OpenSSL::PKey::RSA.new(File.read(self.pem), self.pass)
-  #   context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-  #   
-  #   fhost = self.host.gsub('gateway','feedback')
-  #   puts fhost
-  #   
-  #   sock         = TCPSocket.new(fhost, 2196)
-  #   ssl          = OpenSSL::SSL::SSLSocket.new(sock,context)
-  #   # ssl.connect
-  #   
-  #   ssl.sync_close = true
-  #   ssl.connect
-  # 
-  #   ssl.puts("GET / HTTP/1.0")
-  #   ssl.puts("")
-  #   while line = ssl.gets
-  #     puts line
-  #   end
-  #   
-  #   return sock, ssl
-  # end
+  def self.feedback_connection
+    raise "The path to your pem file is not set. (APNS.pem = /path/to/cert.pem)" unless self.pem
+    raise "The path to your pem file does not exist!" unless File.exist?(self.pem)
+    
+    context      = OpenSSL::SSL::SSLContext.new
+    context.cert = OpenSSL::X509::Certificate.new(File.read(self.pem))
+    context.key  = OpenSSL::PKey::RSA.new(File.read(self.pem), self.pass)
+    
+    fhost = self.host.gsub('gateway','feedback')
+    puts fhost
+    
+    sock         = TCPSocket.new(fhost, 2196)
+    ssl          = OpenSSL::SSL::SSLSocket.new(sock,context)
+    ssl.connect
+
+    return sock, ssl
+  end
   
 end

data/lib/pushmeup/gcm/core.rb

@@ -35,6 +35,9 @@ module GCM
     if !n.collapse_key.nil? && n.time_to_live.nil?
       raise %q{If you are defining a "colapse key" you need a "time to live"}
     end
+    if self.key.is_a?(Hash) && n.identity.nil?
+      raise %{If your key is a hash of keys you'l need to pass a identifier to the notification!}
+    end
     
     if self.format == :json
       self.send_push_as_json(n)
@@ -47,7 +50,7 @@ module GCM
   
   def self.send_push_as_json(n)
     headers = {
-      'Authorization' => "key=#{self.key}",
+      'Authorization' => "key=#{ self.key.is_a?(Hash) ? self.key[n.identity] : self.key }",
       'Content-Type' => 'application/json',
     }
     body = {
@@ -63,7 +66,8 @@ module GCM
   def self.send_push_as_plain_text(n)
     raise "Still has to be done: http://developer.android.com/guide/google/gcm/gcm.html"
     headers = {
-      'Authorization' => "key=#{self.key}",
+      # TODO: Aceitar key ser um hash
+      'Authorization' => "key=#{ self.key.is_a?(Hash) ? self.key[n.identity] : self.key }",
       'Content-Type' => 'application/x-www-form-urlencoded;charset=UTF-8',
     }
     return self.send_to_server(headers, body)
@@ -78,7 +82,7 @@ module GCM
   def self.build_response(response)
     case response.code
       when 200
-        {:response =>  'success', :body => response.body, :headers => response.headers, :status_code => response.code}
+        {:response =>  'success', :body => JSON.parse(response.body), :headers => response.headers, :status_code => response.code}
       when 400
         {:response => 'Only applies for JSON requests. Indicates that the request could not be parsed as JSON, or it contained invalid fields.', :status_code => response.code}
       when 401

data/lib/pushmeup/gcm/notification.rb

@@ -1,6 +1,6 @@
 module GCM
   class Notification
-    attr_accessor :device_tokens, :data, :collapse_key, :time_to_live, :delay_while_idle
+    attr_accessor :device_tokens, :data, :collapse_key, :time_to_live, :delay_while_idle, :identity
     
     def initialize(tokens, data, options = {})
       self.device_tokens = tokens
@@ -9,6 +9,7 @@ module GCM
       @collapse_key = options[:collapse_key]
       @time_to_live = options[:time_to_live]
       @delay_while_idle = options[:delay_while_idle]
+      @identity = options[:identity]
     end
     
     def device_tokens=(tokens)

data/lib/pushmeup/version.rb

@@ -1,3 +1,3 @@
 module Pushmeup
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushmeup
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1966969484721973380
+      hash: -2576380722783718588
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1966969484721973380
+      hash: -2576380722783718588
 requirements: []
 rubyforge_project: pushmeup
 rubygems_version: 1.8.24