xmpush 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1152b540182d3c686bd408815b2aaa26f485ece6
-  data.tar.gz: 3ff89e4b902db18baea56fd54f7cd59e99693500
+  metadata.gz: db8c672e180cd6677a2d924c5c7bf2390768d7d9
+  data.tar.gz: ded56f01305c94545bc3ff5cefdec06c98bd3a23
 SHA512:
-  metadata.gz: 8d2bcd10bb02a846c231be79db55ca8c726102bab59c5c64375ac4e74f4ec8c42297e275b097c98b96977185bab4fde057883de648d88a76ea97510c9c76c8f5
-  data.tar.gz: 7fac5cc8c2a0af1fb7c4c08190aac34d691e15a21c476dd454af716f9eec4212b765791ab1ea5877dc18e2c5702de0e9acfcb65110017a3ac785a51d0d3ff1e8
+  metadata.gz: 72b641199e4f4e369d83b3aef4b961358cc6a6088f618291bd633fe7880048d79bc8448955695adaa7dbfac680c1068e1943d33612cb603580fdb7d617e69737
+  data.tar.gz: b725b9917583a1e16e758629f35fd23b55c450dedb7fdd7f3e1f0857af6561c5d990faca3d83980b07293dfa3b43042a62aa3eb35dc72234030b7cc9cba7d295

data/README.md

@@ -35,13 +35,12 @@ end
 @xm_service.push(:alias, @message2, alias: '1043478')
 
 # iOS and Android
-@message3 = @xm_service.build(description: 'push to iOS and Android client')
+@message3 = @xm_service.build(:both, title: "I'm title", description: 'push to iOS and Android client')
 @xm_service.push(:all, @message3)
 
 ```
 
 ## TODO
 
-- Android push
 - Multi push
 - Feedback/ Stats/ Tracer/ Targeted_message

data/lib/xmpush/android_builder.rb

@@ -10,13 +10,32 @@ module Xmpush
     NTF_CENTER_NTF   = 0 # 通知栏消息
     PASS_THROUGH_NTF = 1 # 透传消息
 
-    attr_accessor :pass_through, :notify_id
+    attr_accessor :pass_through, :notify_id, :sound_url
 
     def initialize(**message)
-      @pass_through = message.delete(:pass_through) || 0
-      @notify_id = message.delete(:notify_id) || 0
       super(message)
-      # @extra = {sound_url: sound_url, badge: badge}
+      extra = message.delete(:extra) if message[:extra]
+      @pass_through = message[:pass_through] || NTF_CENTER_NTF
+      @notify_id = message[:notify_id] || 0
+      @notify_type  = message[:notify_type] || NOTIFY_TYPE_DEFAULT_ALL
+      extra_message = {sound_url: ""}
+      extra_message.merge!(extra) if extra
+      @extra = extra_message
+    end
+
+    def build
+      extra_message = extra(@extra) if @extra
+      message = {
+        payload: @payload,
+        title: @title,
+        notify_id: @notify_id,
+        pass_through: @pass_through,
+        notify_type: @notify_type,
+        restricted_package_name: @restricted_package_name,
+        description: @description
+      }
+      message.merge!(extra_message)
+      return message
     end
 
   end

data/lib/xmpush/ios_builder.rb

@@ -3,8 +3,8 @@ module Xmpush
     attr_accessor :sound_url, :badge
 
     def initialize(**message)
-      extra = message.delete(:extra) if message[:extra]
       super(message)
+      extra = message.delete(:extra) if message[:extra]
       extra_message = {sound_url: "", badge: 1}
       extra_message.merge!(extra) if extra
       @extra = extra_message

data/lib/xmpush/version.rb

@@ -1,3 +1,3 @@
 module Xmpush
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/xmpush.rb

@@ -34,7 +34,7 @@ module Xmpush
         build_message = { ios: ios_builder(message)}
       when :android
         build_message = { android: android_builder(message) }
-      else
+      when :both
         build_message = { ios: ios_builder(message),  android: android_builder(message)}
       end
       return build_message
@@ -54,7 +54,7 @@ module Xmpush
         return "must input topic" unless options[:topic]
         message.values.each{|v| v.merge!(topic: options[:topic])}
         resource_post('topic', message)
-      else #:all
+      when :all
         resource_post('all', message)
       end
     end
@@ -77,8 +77,8 @@ module Xmpush
     end
 
     def android_http
-      return "android don't support sandbox" if @sandbox
-      host = @sandbox ? Xmpush::XmResource::SANDBOX_DOMAIN : Xmpush::XmResource::OFFICIAL_DOMAIN
+      # return "android don't support sandbox" if @sandbox
+      host = Xmpush::XmResource::OFFICIAL_DOMAIN
       Xmpush::HttpBase.new(host, @android_secret, @connection_adapter)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmpush
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - blackanger