push-gcm 0.0.1.pre → 0.0.1.pre4

data/lib/push/configuration_gcm.rb

@@ -0,0 +1,11 @@
+module Push
+  class ConfigurationGcm < Push::Configuration
+    store :properties, accessors: [:key]
+    attr_accessible :app, :enabled, :connections, :key
+    validates :key, :presence => true
+
+    def name
+      :gcm
+    end
+  end
+end

data/lib/push/daemon/gcm_support/connection_gcm.rb

@@ -2,13 +2,13 @@ module Push
   module Daemon
     module GcmSupport
       class ConnectionGcm
-        attr_reader :response, :name
+        attr_reader :response, :name, :provider
         PUSH_URL = "https://android.googleapis.com/gcm/send"
         IDLE_PERIOD = 5.minutes
 
         def initialize(provider, i)
           @provider = provider
-          @name = "ConnectionGcm #{i}"
+          @name = "#{@provider.configuration[:name]}: ConnectionGcm #{i}"
         end
 
         def connect

data/lib/push/feedback_gcm.rb

@@ -1,5 +1,8 @@
 module Push
   class FeedbackGcm < Push::Feedback
+    store :properties, accessors: [:update_to]
+    attr_accessible :app, :device, :follow_up, :failed_at, :update_to
 
+    validates :follow_up, :inclusion => { :in => %w(delete update), :message => "%{value} is not a valid follow-up" }
   end
 end

data/lib/push/message_gcm.rb

@@ -6,7 +6,7 @@ module Push
     # Note that this includes both the size of the keys as well as the values.
 
     store :properties, accessors: [:collapse_key, :delay_when_idle, :time_to_live, :payload]
-    attr_accessible :device, :collapse_key, :delay_when_idle, :time_to_live, :payload
+    attr_accessible :app, :device, :collapse_key, :delay_when_idle, :time_to_live, :payload
 
     def to_message
       hsh = Hash.new
@@ -38,7 +38,8 @@ module Push
 
           if msg == "NotRegistered" or msg == "InvalidRegistration"
             with_database_reconnect_and_retry(connection.name) do
-              Push::FeedbackGcm.create!(:failed_at => Time.now, :device => device) # follow-up: delete device
+              Push::FeedbackGcm.create!(:app => connection.provider.configuration[:name], :failed_at => Time.now,
+                :device => device, :follow_up => 'delete')
             end
           end
 
@@ -46,10 +47,11 @@ module Push
           raise Push::DeliveryError.new(response.code, id, msg, "GCM")
         elsif hsh["canonical_ids"] == 1
           # success, but update device token
-          # follow-up: delete device
-          # with_database_reconnect_and_retry(connection.name) do
-          #   Push::FeedbackGcm.create!(:failed_at => Time.now, :device => device) # follow-up: update device
-          # end
+          update_to = hsh["results"][0]["registration_id"]
+          with_database_reconnect_and_retry(connection.name) do
+            Push::FeedbackGcm.create!(:app => connection.provider.configuration[:name], :failed_at => Time.now,
+              :device => device, :follow_up => 'update', :update_to => update_to)
+          end
         end
       else
         Push::Daemon.logger.error("[#{connection.name}] Error received.")

data/lib/push-gcm/version.rb

@@ -1,3 +1,3 @@
 module PushGcm
-  VERSION = "0.0.1.pre"
+  VERSION = "0.0.1.pre4"
 end

data/lib/push-gcm.rb

@@ -1,6 +1,8 @@
 require 'net/http'
 require 'net/https'
 require 'push-gcm/version'
+require 'push/configuration'
+require 'push/configuration_gcm'
 require 'push/message'
 require 'push/message_gcm'
 require 'push/feedback'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: push-gcm
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.1.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70315674133460 !ruby/object:Gem::Requirement
+  requirement: &70260456443140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315674133460
+  version_requirements: *70260456443140
 - !ruby/object:Gem::Dependency
   name: push-core
-  requirement: &70315674131040 !ruby/object:Gem::Requirement
+  requirement: &70260456442420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.1.pre2
+        version: 0.0.1.pre4
   type: :runtime
   prerelease: false
-  version_requirements: *70315674131040
+  version_requirements: *70260456442420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70315674130040 !ruby/object:Gem::Requirement
+  requirement: &70260456441380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315674130040
+  version_requirements: *70260456441380
 description: GCM support for the modular push daemon.
 email:
 - tom@tnux.net
@@ -53,6 +53,7 @@ extra_rdoc_files: []
 files:
 - lib/push-gcm.rb
 - lib/push-gcm/version.rb
+- lib/push/configuration_gcm.rb
 - lib/push/daemon/gcm.rb
 - lib/push/daemon/gcm_support/connection_gcm.rb
 - lib/push/feedback_gcm.rb