aliyun-cloudpush 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445f13f3637f1f66845f3bfc0e7a22895f083546
-  data.tar.gz: fc864093550ab09d1433682226caa652a7077b99
+  metadata.gz: 4698262d9211119c9f349b8f9c4a7a1e36fbcf32
+  data.tar.gz: b25b15dd8ea479d96743653df6f06e1179cbb5ad
 SHA512:
-  metadata.gz: 660f8b7dc155244806e595e93b5fadc06be0fd2d397a03f1930228e0427bf70ead3b50ab16ce3f94a3349e68c885c4a4c3e27385162ffde62839385138c01a38
-  data.tar.gz: fa8437ab636230d35e859ca8269af7657ff5f63feb954be2f459e0d7251b32d1a980c0f4080a1ed3a64c1f4598975506aa2c3c39baf7d6595dfc0f6f97f962d9
+  metadata.gz: 6dd443b836b3ab50fc3eb73cbdd94e726ae159fbe8ef1b5a637080fb572a368f6b227aab49c2c026f7dedcbdfb8525966d56579b3b492b47427960a218fa8c48
+  data.tar.gz: 837f8a3c5383dd79540131d4773ffc0217e0e8b2e6bfeddf5b30471f97c1b94828293095521d3662cb0cda452bdd484a43a793bfe913b1afe930d36b85146826

data/README.md

@@ -22,7 +22,19 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+push_client = Aliyun::Cloudpush::Client.new('app_key', 'access_key_id', 'acess_key_secret')
+push_client.push('acccount_id', 'title', 'conttent')
+
+
+# Or use global config
+Aliyun::Cloudpush.configure do |config|
+  config.app_key = 'app_key'
+  config.access_key_id = 'access_key_id'
+  config.access_key_secret = 'acess_key_secret'
+end
+Aliyun::Cloudpush.default_client.push('acccount_id', 'title', 'conttent')
+```
 
 ## Development
 

data/lib/aliyun/cloudpush.rb

@@ -1,6 +1,6 @@
 require "aliyun/cloudpush/version"
-require "aliyun/cloudpush/config"
 require "aliyun/cloudpush/client"
+require "aliyun/cloudpush/config"
 
 module Aliyun
   module Cloudpush

data/lib/aliyun/cloudpush/client.rb

@@ -7,14 +7,21 @@ require 'rest-client'
 module Aliyun
   module Cloudpush
     class Client
+      attr_reader :app_key, :access_key_id, :access_key_secret
 
-      def push(employee_id, title, body)
+      def initialize(app_key, access_key_id, access_key_secret)
+        @access_key_id = access_key_id
+        @access_key_secret = access_key_secret
+        @app_key = app_key
+      end
+
+      def push(employee_id, title, body, options = {})
         params = {
           "TargetValue": employee_id,
           "Title": title,
           "Body": body,
         }
-        http_post(default_push_params.merge(params))
+        http_post(default_push_params.merge(params).merge(options))
       end
 
       private
@@ -22,7 +29,7 @@ module Aliyun
         def default_push_params
           {
             "Action": "Push",
-            "AppKey": Aliyun::Cloudpush.app_key,
+            "AppKey": self.app_key,
             "Target": "ACCOUNT",
             "DeviceType": "ALL",
             "PushType": "NOTICE",
@@ -37,7 +44,7 @@ module Aliyun
             'Format': "json",
             'RegionId': "cn-hangzhou",
             'Version': "2016-08-01",
-            'AccessKeyId': Aliyun::Cloudpush.access_key_id,
+            'AccessKeyId': self.access_key_id,
             'SignatureMethod': "HMAC-SHA1",
             'SignatureVersion': "1.0",
             'SignatureNonce': (rand * 1_000_000_000).to_s,
@@ -46,13 +53,13 @@ module Aliyun
         end
 
         def params_str(action, params)
-          str = params.sort.map { |k, v| [CGI.escape(k.to_s), CGI.escape(v.to_s)].join('=') }.join('&')
+          str = params.sort.map { |k, v| [CGI.escape(k.to_s), escape(v.to_s)].join('=') }.join('&')
           "#{action}&#{CGI.escape('/')}&#{CGI.escape(str)}"
         end
 
         def signature(str)
           Base64.strict_encode64(
-            OpenSSL::HMAC.digest('sha1', "#{Aliyun::Cloudpush.access_key_secret}&", str)
+            OpenSSL::HMAC.digest('sha1', "#{self.access_key_secret}&", str)
           )
         end
 
@@ -61,6 +68,14 @@ module Aliyun
           s = signature(params_str('POST', p))
           res = RestClient.post(ENDPOINT, p.merge('Signature': s))
           JSON.parse(res)
+        rescue RestClient::ExceptionWithResponse =>e
+          puts e.response
+        end
+
+        def escape(str)
+          # https://help.aliyun.com/document_detail/48047.html?spm=a2c4g.11186623.2.4.NsNXUo
+          # convert space " " to "%20" instead of "+"
+          CGI.escape(str).gsub("+", "%20")
         end
     end
   end

data/lib/aliyun/cloudpush/config.rb

@@ -7,12 +7,12 @@ module Aliyun
         yield self.config ||= Config.new
       end
 
-      def app_key
-        @app_key ||= config.app_key
+      def default_client
+        @client ||= Client.new(app_key, access_key_id, access_key_secret)
       end
 
-      def app_secret
-        @app_secret ||= config.app_secret
+      def app_key
+        @app_key ||= config.app_key
       end
 
       def access_key_id
@@ -25,7 +25,7 @@ module Aliyun
     end
 
     class Config
-      attr_accessor :app_key, :app_secret, :access_key_id, :access_key_secret
+      attr_accessor :app_key, :access_key_id, :access_key_secret
     end
   end
 end

data/lib/aliyun/cloudpush/version.rb

@@ -1,5 +1,5 @@
 module Aliyun
   module Cloudpush
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-cloudpush
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeff Lai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client