umeng 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 289fec890eec50324ceedd24c68a6d40d4e366ad
-  data.tar.gz: 048d084bb74c17f9de5c7e5cc518a9e98ef246fb
+  metadata.gz: 7205bc19e1e3ae9022ebfe36f203d6c5d309caa4
+  data.tar.gz: 15cde5cb45348ac742c1e7f90ed92052441cf907
 SHA512:
-  metadata.gz: 57a95bdada2dd5a5aec66d36c9befd657457f08b9a72ddffdf627b4113fb7b2b5b7e1796cb0060626c76b6d4b9715f46a5790585b3a6837014ceb3698ed835e3
-  data.tar.gz: 3bba0640877f6e2274586eaea4a259069f92e4534521905eedcdf018bbe5108f08431a93222153348dac1de1ee791040a2a8c69d89850c10daed2b1e44520697
+  metadata.gz: 9c30236f863baff4e11a31be6768815c98c0164ad5c39f81a383cc73c94f6099248c7b120b6cdd12d977bf14e5b7352a48a93af7c544bc5d1cd10ba56e97b4f6
+  data.tar.gz: 690e0bb15024cc3e075e7a06d59ff4d40864d3eda001fa987bdd1a21dfac45805dfd5ead0709237968c856d2aee841d76d485538c231c4ab7164196f4195d642

data/README.md

@@ -23,7 +23,7 @@ Or install it yourself as:
 ## Usage
 ```
 ument = Umeng::Client.new(appkey, app_master_secret)
-umeng.send_message(params)
+umeng.push(params)
 umeng.status(task_id)
 umeng.cancel(task_id)
 ```

data/lib/umeng/client.rb

@@ -1,3 +1,6 @@
+require 'json'
+require 'faraday'
+require 'digest'
 require 'umeng/services'
 
 module Umeng
@@ -16,5 +19,3 @@ module Umeng
 end
 
 
-
-

data/lib/umeng/services.rb

@@ -1,12 +1,12 @@
-require 'json'
-require 'faraday'
-require 'digest'
+require 'umeng/util'
 
 module Umeng
   module Services
+    include Umeng::Util
+
     # 消息发送
     # POST http://msg.umeng.com/api/send?sign=mysign
-    def send_message(params={})
+    def push(params={})
       uri = 'api/send'
       params.merge!({
         appkey: @appkey,
@@ -41,8 +41,6 @@ module Umeng
 
     private
       def request(uri, params)
-        sign = generate_sign(uri, params)
-
         conn = Faraday.new(:url => Umeng::UMENG_HOST) do |faraday|
           faraday.request  :url_encoded
           faraday.response :logger
@@ -50,19 +48,12 @@ module Umeng
         end
 
         response = conn.post do |req|
-          req.url uri, sign: sign
+          req.url uri, sign: generate_sign(uri, params)
           req.headers['Content-Type'] = 'application/json'
           req.body = params.to_json
         end
 
-        puts response.body
-      end
-
-      def generate_sign(uri, params)
-        method = 'POST'
-        url = [Umeng::UMENG_HOST, '/', uri]
-        post_body = JSON.dump(params)
-        Digest::MD5.hexdigest([method, url, post_body, @app_master_secret].join)
+        result(response.body, uri)
       end
   end
 end

data/lib/umeng/util.rb

@@ -0,0 +1,25 @@
+module Umeng
+  module Util
+    def generate_sign(uri, params)
+      method = 'POST'
+      url = [Umeng::UMENG_HOST, '/', uri]
+      post_body = JSON.dump(params)
+      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}
+    def result(body, type)
+      result = JSON.load(body)
+
+      case type
+      when 'api/send'
+        body
+      when 'api/status'
+        body
+      when 'api/cancel'
+        body
+      end
+
+    end
+  end
+end

data/lib/umeng/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umeng
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - menghuanwd
@@ -71,6 +71,7 @@ files:
 - lib/umeng.rb
 - lib/umeng/client.rb
 - lib/umeng/services.rb
+- lib/umeng/util.rb
 - lib/umeng/version.rb
 - umeng.gemspec
 homepage: https://github.com/menghuanwd/umeng