qqpush 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f66184800ba05b981f6588daacc379efda78d1f1
-  data.tar.gz: 10b5b5383c96134155fcd11f8b1c6403b1caedd1
+  metadata.gz: 2f7719143373f6a0a0ae05ddcb3e2324c20b8806
+  data.tar.gz: fa23865351048a738c09d677b6fa28de09063176
 SHA512:
-  metadata.gz: bc7362d250b87ed8b8dff0187ced6c749c945e41c92161882c0976c8625437c7d08f2bf129ca1294cbc547b50aca16b651b7591daf69bb0c55fb9fc43c9ff282
-  data.tar.gz: 3eb730141b1981e949b0f1e5c7f8be11defc802b9f23e0095e76ec87e1d43e42113a72bf841e516f17b5b1efdc882630f78951a6f1b71eba946c0a0977841942
+  metadata.gz: 543dbf2ce721bd3b7f47dadeeed12d7994b4c1c5dda422bb4bb383e887b9f288ef7b51e2950fa4cb2692ba881ee65d341511705b8f78a615e5ac79a3f1401e7a
+  data.tar.gz: 50602f46e6e659aff3687d0362552780aec688d8e5b7334e22bf677de66ed2fa6ab83b55b8e72dfe3f0a98b2a67068b4e8dcd957202732e01c0375c5c1114b46

data/.gitignore

@@ -1,2 +1,3 @@
 *.DS_Store
 *.gem
+settings.yml

data/Rakefile

@@ -21,6 +21,17 @@ task :spec, :spec_name, :examples do |_t, args|
   end
 end
 
+desc 'generate settings.yml'
+task :init do
+  require 'yaml'
+  file = File.open('settings.yml', 'w+')
+  settings = { access_id: nil, secret_key: nil }.to_yaml
+  file.puts '# http://developer.xg.qq.com/index.php/Rest_API'
+  file.puts settings
+  file.close
+  puts './settings.yml created.'
+end
+
 desc 'build gem'
 task :build do
   Dir.glob('*push-*.gem').each { |f| File.delete(f) }

data/lib/qqpush/general.rb

@@ -1,37 +1,46 @@
 require 'uri'
 require 'openssl'
 require 'rest-client'
+require 'json'
+require 'yaml'
 
 module QQpush
   class General
     attr_accessor :settings
 
-    ROOT_URL = 'openapi.xg.qq.com'
     PROTOCAL = 'http'
+    ROOT_URL = 'openapi.xg.qq.com'
     VERSION = 'v2'
-    SERVICES =
-      { push: %w(single_device single_account
-                 account_list all_device tags_device) }
+    SERVICES = { push: %w(single_device single_account
+                          account_list all_device tags_device) }
 
     SERVICES.each do |param_class, param_methods|
       param_methods.each do |param_method|
         define_method("#{param_class}_#{param_method}") do |params = {}|
-          request(params)
+          params[:param_request] = 'get'
+          request(
+            params.merge(param_class: param_class,
+                         param_method: param_method))
         end
       end
     end
 
+    def initialize
+      @settings =
+        File.exist?('settings.yml') ? YAML.load_file('settings.yml') : {}
+    end
+
     def request(params = {})
-      RestClient.post(
-        request_url(params),
-        general_params(params).merge(business_params(params)).to_json,
-        content_type: 'application/x-www-form-urlencoded')
+      response = RestClient.send(
+        params[:param_request], request_url(params))
+      JSON.parse response
     end
 
     def request_url(params)
       params[:param_encode] = true
+      all_params = params.merge(general_params(params))
       "#{PROTOCAL}://#{ROOT_URL}/#{VERSION}/#{params[:param_class]}/" \
-      "#{params[:param_method]}#{params_string(params).gsub(/\&$/, '')}"
+      "#{params[:param_method]}?#{params_string(all_params).gsub(/\&$/, '')}"
     end
 
     def general_params(params)
@@ -44,16 +53,18 @@ module QQpush
     end
 
     def param_sign(params)
-      sign_string = "POST#{ROOT_URL}/#{VERSION}/#{params[:param_class]}/" \
-        "#{params[:param_method]}#{params_string(params).gsub(/\&/, '')}" \
-        "#{params[:secret_key]}"
+      params.delete(:param_encode)
+      sign_string = "#{params[:param_request].upcase}" \
+        "#{ROOT_URL}/#{VERSION}/#{params[:param_class]}/" \
+        "#{params[:param_method]}#{params_string(params)}" \
+        "#{settings[:secret_key]}"
       OpenSSL::Digest::MD5.new(sign_string).to_s
     end
 
     private
 
     def business_params(params)
-      params.reject { |k, _v| k.to_s =~ /param_.*/ || k == :secret_key }
+      params.reject { |k, _v| k.to_s =~ /param_.*/ }
     end
 
     def params_string(params)
@@ -61,8 +72,9 @@ module QQpush
       business_params(params).keys.map(&:to_s).sort.each do |key|
         next unless params[key] || params[key.to_sym]
         value = [params[key], params[key.to_sym]].compact.first
+        value = value.is_a?(Hash) ? value.to_json : value.to_s
         new_value =
-          params[:param_encode] ? URI.encode(value) : "#{value}&"
+          params[:param_encode] ? "#{URI.encode(value)}&" : value
         new_string += "#{key}=#{new_value}" if new_value
       end
       new_string

data/qqpush.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'qqpush'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.date = '2015-08-31'
   s.summary = 'Tencent XG Push'
   s.description = 'App push service by Tencent XG'
@@ -11,6 +11,6 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.require_paths = ['lib']
-  s.add_runtime_dependency 'rest-client', '~> 1.8'
+  s.add_runtime_dependency 'rest-client', '~> 1.7'
   s.add_development_dependency 'rspec', '~> 3.3'
 end

data/spec/general_spec.rb

@@ -4,15 +4,22 @@ require 'qqpush/general'
 describe 'General methods' do
   before do
     @request = QQpush::General.new
-    @request.settings = { access_id: '123' }
   end
 
   it 'can generate sign by params' do
     # http://developer.xg.qq.com/index.php/Rest_API
-    new_params = { param_class: 'push', param_method: 'single_device',
-                   timestamp: 1386691200, secret_key: 'abcde',
+    @request.settings = { access_id: '123', secret_key: 'abcde' }
+    new_params = { timestamp: 1386691200, param_request: 'post',
+                   param_class: 'push', param_method: 'single_device',
                    'Param1' => 'Value1', 'Param2' => 'Value2' }
     params = @request.general_params(new_params)
     expect(params[:sign]).to eq('ccafecaef6be07493cfe75ebc43b7d53')
   end
+
+  it 'can push to single device' do
+    response = @request.push_single_device(
+      message_type: 1, message: { content: 'content', title: 'title' })
+    expect(response['ret_code']).to eq(-1)
+    expect(response['err_msg']).to eq('param device_token error!')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qqpush
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Chao Li
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement