pushr-gcm 1.0.0.pre.4 → 1.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55ef9497405d8415d4a814f670165a5542e8e89d
-  data.tar.gz: efe1a18d46c7d2205aa2ed5effb8a9af004539cd
+  metadata.gz: eacd1d24b8a94657b4329e960f0e6a5864fb7b5a
+  data.tar.gz: be1116d4b35743ca8db413c4d6d557a421a7034b
 SHA512:
-  metadata.gz: 155cb8dba85a0b4ef221274950c36a2eafebd5353ec7dd32e01deb228c3b3f5801bcba6f6e23e0356bb951596b788e2967cfa8b081963dee9660c662142f61c1
-  data.tar.gz: 8ae2dfcb65d580f13f75559dda231c94dc59ef9129fd383f6af07c363972f2bef0f1137a4bdefd4952e947ebf81ceec23f083061fcf3c8b142a7aece99142742
+  metadata.gz: b46ec7bcade405d6df91d789a648a868db8fb0ed95b102e068a4b11ef958dbdac3649ffafc09299cd397adc1601e87d88acf1db4f93e89437b446124c255fce6
+  data.tar.gz: f900c4a5fda73b443594d5ddaa544a0530c284610ad2a05ec2f04d690802560d4595d42e7d10609fbf7e2789a0dda29a8cb9ece9b77e97792374dd264df9ccf1

data/lib/pushr-gcm/version.rb

@@ -1,3 +1,3 @@
 module PushrGcm
-  VERSION = '1.0.0.pre.4'
+  VERSION = '1.0.0.rc.1'
 end

data/lib/pushr/configuration_gcm.rb

@@ -1,14 +1,14 @@
 module Pushr
   class ConfigurationGcm < Pushr::Configuration
-    attr_accessor :id, :type, :app, :enabled, :connections, :api
+    attr_accessor :api
     validates :api, presence: true
 
     def name
       :gcm
     end
 
-    def to_json
-      MultiJson.dump(type: self.class.to_s, app: app, enabled: enabled, connections: connections, api: api)
+    def to_hash
+      { type: self.class.to_s, app: app, enabled: enabled, connections: connections, api: api }
     end
   end
 end

data/lib/pushr/daemon/gcm.rb

@@ -13,7 +13,7 @@ module Pushr
           connection = GcmSupport::ConnectionGcm.new(configuration, i + 1)
           connection.connect
 
-          handler = MessageHandler.new("pushr:#{configuration.app}:#{configuration.name}", connection, configuration.app, i + 1)
+          handler = MessageHandler.new("pushr:#{configuration.key}", connection, configuration.app, i + 1)
           handler.start
           @handlers << handler
         end

data/lib/pushr/feedback_gcm.rb

@@ -1,12 +1,10 @@
 module Pushr
   class FeedbackGcm < Pushr::Feedback
-    attr_accessor :type, :app, :device, :follow_up, :failed_at, :update_to
-
+    attr_accessor :device, :follow_up, :failed_at, :update_to
     validates :follow_up, inclusion: { in: %w(delete update), message: '%{value} is not a valid follow-up' }
 
-    def to_json
-      hsh = { type: 'Pushr::FeedbackGcm', app: app, device: device, follow_up: follow_up, failed_at: failed_at, update_to: update_to }
-      MultiJson.dump(hsh)
+    def to_hash
+      { type: 'Pushr::FeedbackGcm', app: app, device: device, follow_up: follow_up, failed_at: failed_at, update_to: update_to }
     end
   end
 end

data/lib/pushr/message_gcm.rb

@@ -2,6 +2,8 @@ module Pushr
   class MessageGcm < Pushr::Message
     POSTFIX = 'gcm'
 
+    attr_accessor :registration_ids, :notification_key, :collapse_key, :delay_while_idle, :time_to_live, :data,
+                  :restricted_package_name, :dry_run
     validates :registration_ids, presence: true
     validate :registration_ids_array
     validate :data_size
@@ -9,9 +11,6 @@ module Pushr
     validates :time_to_live, numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 2419200 },
                              allow_blank: true
 
-    attr_accessor :type, :app, :registration_ids, :notification_key, :collapse_key, :delay_while_idle, :time_to_live, :data,
-                  :restricted_package_name, :dry_run
-
     def to_message
       hsh = {}
       hsh['registration_ids'] = registration_ids
@@ -21,10 +20,11 @@ module Pushr
       MultiJson.dump(hsh)
     end
 
-    def to_json
+    def to_hash
       hsh = { type: self.class.to_s, app: app, registration_ids: registration_ids, notification_key: notification_key,
               collapse_key: collapse_key, delay_while_idle: delay_while_idle, time_to_live: time_to_live, data: data }
-      MultiJson.dump(hsh)
+      hsh[Pushr::Core.external_id_tag] = external_id if external_id
+      hsh
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushr-gcm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.4
+  version: 1.0.0.rc.1
 platform: ruby
 authors:
 - Tom Pesman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json