umeng 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7205bc19e1e3ae9022ebfe36f203d6c5d309caa4
-  data.tar.gz: 15cde5cb45348ac742c1e7f90ed92052441cf907
+  metadata.gz: b5adfb51aa1f4972ff06e38a2cbbdb38d41c97ad
+  data.tar.gz: 547566d862759c92fddb98b7eade3fd64eb5fdc1
 SHA512:
-  metadata.gz: 9c30236f863baff4e11a31be6768815c98c0164ad5c39f81a383cc73c94f6099248c7b120b6cdd12d977bf14e5b7352a48a93af7c544bc5d1cd10ba56e97b4f6
-  data.tar.gz: 690e0bb15024cc3e075e7a06d59ff4d40864d3eda001fa987bdd1a21dfac45805dfd5ead0709237968c856d2aee841d76d485538c231c4ab7164196f4195d642
+  metadata.gz: 5771efadc6ce8085fb2d90338e61f1973d0f6109f141078aa5aff011cd3cbebd0ef8db4b1ab351ded7c0296e487d0c8f4b360f3265cafb720faa4b192df051dd
+  data.tar.gz: f98e6125a63f7c85ca20d6faf80c82dad1c929c9f6af990d34706aff0f0bf27260520334b076569a8e74ab6feb53d34dd8f9bc972d57e816ec4998b6ef9b0774

data/README.md

@@ -22,9 +22,17 @@ Or install it yourself as:
 
 ## Usage
 ```
-ument = Umeng::Client.new(appkey, app_master_secret)
-umeng.push(params)
+umeng = Umeng::Client.new(appkey, app_master_secret, plantform)
+
+广播
+umeng.push_broadcast(content, opt={})
+单播
+umeng.push_unicast(device_tokens, content, opt={})
+列播
+umeng.push_listcast(device_tokens, content, opt={})
+
 umeng.status(task_id)
+
 umeng.cancel(task_id)
 ```
 

data/bin/console

@@ -11,4 +11,4 @@ require "umeng"
 # Pry.start
 
 require "irb"
-IRB.start
+IRB.start

data/lib/umeng/client.rb

@@ -1,21 +1,20 @@
 require 'json'
 require 'faraday'
 require 'digest'
-require 'umeng/services'
+require 'umeng/send_message'
 
 module Umeng
   UMENG_HOST = 'http://msg.umeng.com'
   
   class Client
-    include Umeng::Services
+    include Umeng::SendMessage
 
-    attr_accessor :appkey, :app_master_secret
+    attr_accessor :appkey, :app_master_secretm, :plantform
 
-    def initialize(appkey, app_master_secret)
+    def initialize(appkey, app_master_secret, plantform)
+      @plantform = plantform
       @appkey = appkey
       @app_master_secret = app_master_secret
     end
   end
-end
-
-
+end

data/lib/umeng/json_body.rb

@@ -0,0 +1,25 @@
+module Umeng
+  module JsonBody
+    def android_params(content, opt={})
+      display_type = opt[:display_type] || "message"
+      {
+        'payload': {
+          'display_type': display_type,
+          'body': {
+            'custom': content
+          }
+        }
+      }
+    end
+
+    def ios_params(content, opt={})
+      {
+        'payload': {
+          'aps': {
+            'alert': content
+          }
+        }.merge(opt[:kv])
+      }
+    end
+  end
+end

data/lib/umeng/send_message.rb

@@ -0,0 +1,63 @@
+require 'umeng/services'
+require 'umeng/json_body'
+
+module Umeng
+  module SendMessage
+    include Umeng::Services
+    include Umeng::JsonBody
+
+    # 广播
+    def push_broadcast(content, opt={})
+      params = {
+        type: 'broadcast',
+        description: opt['description'] || '广播',
+        production_mode: opt['production_mode'] || 'true'
+      }
+      case @plantform
+      when 'android'
+        params.merge! android_params(content, opt)
+        push(params)
+      when 'ios'
+        params.merge! ios_params(content, opt)
+        push(params)
+      end
+    end
+
+    # 单播
+    def push_unicast(device_tokens, content, opt={})
+      params = {
+        device_tokens: device_tokens,
+        type: 'unicast',
+        description: opt['description'] || '单播',
+        production_mode: opt['production_mode'] || 'false',
+      }
+      case @plantform
+      when 'android'
+        params.merge! android_params(content, opt)
+        push(params)
+      when 'ios'
+        params.merge! ios_params(content, opt)
+        push(params)
+      end
+    end
+
+    # 列播
+    def push_listcast(device_tokens, content, opt={})
+      params = {
+        device_tokens: device_tokens,
+        type: 'listcast',
+        description: opt['description'] || '列播',
+        production_mode: opt['production_mode'] || 'false',
+      }
+      case @plantform
+      when 'android'
+        params.merge! android_params(content, opt)
+        push(params)
+      when 'ios'
+        params.merge! ios_params(content, opt)
+        push(params)
+      end
+    end
+
+  end
+end

data/lib/umeng/services.rb

@@ -3,7 +3,7 @@ require 'umeng/util'
 module Umeng
   module Services
     include Umeng::Util
-
+    
     # 消息发送
     # POST http://msg.umeng.com/api/send?sign=mysign
     def push(params={})

data/lib/umeng/util.rb

@@ -7,7 +7,7 @@ module Umeng
       Digest::MD5.hexdigest([method, url, post_body, @app_master_secret].join)
     end
 
-    {"status"=>6, "total_count"=>0, "accept_count"=>0, "sent_count"=>0, "open_count"=>0, "dismiss_count"=>0}
+    # {"status"=>6, "total_count"=>0, "accept_count"=>0, "sent_count"=>0, "open_count"=>0, "dismiss_count"=>0}
     def result(body, type)
       result = JSON.load(body)
 

data/lib/umeng/version.rb

@@ -1,3 +1,3 @@
 module Umeng
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umeng
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - menghuanwd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,8 @@ files:
 - bin/setup
 - lib/umeng.rb
 - lib/umeng/client.rb
+- lib/umeng/json_body.rb
+- lib/umeng/send_message.rb
 - lib/umeng/services.rb
 - lib/umeng/util.rb
 - lib/umeng/version.rb