pingpp 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54fbeebdd4c17270d3bc56116fe6341d897c6b0c
-  data.tar.gz: 7d86343dda0da20c99b85f254a47c7758fadd4d2
+  metadata.gz: 9e400717b5fb25538403e1276d4938a01b061956
+  data.tar.gz: b177462b2b6949988f9207a0f9b0f7032d052b13
 SHA512:
-  metadata.gz: 39f3f1b787af4ed9f1eb2fca56fd5901a2ec098cc06f3fa0f1a1dbb1a0470a2807d4500e129cdff124539aa8326caeb4ec2bca45a980ed1be0d3489000bb3f01
-  data.tar.gz: c698c9f1b189c50f6ba70a92337bab92ddb5e09be3005d907ea49ff7960dc278b35fd4db09f407d668452f729ef1a3d16d7fee897e1561bb72e7f95f9cf76f9f
+  metadata.gz: 4b86aca054bc33863c67b950131b7cc844f3abbbe5e2ada5e5de3242e5c047f6b8d08d6ea79f8eb8cf5e94aa3a7d56d9998263ae3f5ebcb0dcd865d4fce1e8b0
+  data.tar.gz: eb04bd61d5c1a8f8cf4a0fe0ebf624351864329155422a650d6e0dbb06bb91b2649504affc15c432b6ebb7e45b53ab6edc0973151241aae2e9b8efe268d6c5be

data/lib/pingpp/certificate_blacklist.rb

@@ -5,7 +5,7 @@ module Pingpp
   module CertificateBlacklist
 
     BLACKLIST = {
-      "api.pingplusplus.com" => [
+      "api.pingxx.com" => [
         '05c0b3643694470a888c6e7feb5c9e24e823dc53',
         '5b7dc7fbc98d78bf76d4d4fa6f597a0c901fad5c',
       ]
@@ -39,7 +39,7 @@ module Pingpp
           raise APIConnectionError.new(
             "Invalid server certificate. You tried to connect to a server that" +
             "has a revoked SSL certificate, which means we cannot securely send" +
-            "data to that server. Please email support@pingplusplus.com if you need" +
+            "data to that server. Please email support@pingxx.com if you need" +
             "help connecting to the correct API server."
           )
         end

data/lib/pingpp/channel.rb

@@ -1,9 +1,15 @@
 module Pingpp
   class Channel
-    ALIPAY = "alipay"
-    WECHAT = "wx"
-    UPMP = "upmp"
+    ALIPAY     = "alipay"
+    WECHAT     = "wx"
+    WX         = "wx" # Alias of WECHAT
+    UPMP       = "upmp"
     ALIPAY_WAP = "alipay_wap"
-    UPMP_WAP = "upmp_wap"
+    UPMP_WAP   = "upmp_wap"
+    WX_PUB     = "wx_pub"
+    BFB        = "bfb"
+    BFB_WAP    = "bfb_wap"
+    UPACP      = "upacp"
+    UPACP_WAP  = "upacp_wap"
   end
 end

data/lib/pingpp/version.rb

@@ -1,3 +1,3 @@
 module Pingpp
-  VERSION = '1.0.3'
+  VERSION = '2.0.0'
 end

data/lib/pingpp/wx_pub_oauth.rb

@@ -0,0 +1,41 @@
+module Pingpp
+  module WxPubOauth
+    def self.create_oauth_url_for_code(app_id, redirect_url, more_info = false)
+      query_parts = {
+        'appid' => app_id,
+        'redirect_uri' => redirect_url,
+        'response_type' => 'code',
+        'scope' => more_info ? 'snsapi_userinfo' : 'snsapi_base'
+      }
+      query_str = Pingpp.uri_encode(query_parts)
+      'https://open.weixin.qq.com/connect/oauth2/authorize?' + query_str + '#wechat_redirect'
+    end
+
+    def self.get_openid(app_id, app_secret, code)
+      url = create_oauth_url_for_openid(app_id, app_secret, code)
+      request_opts = {
+        :url => url,
+        :verify_ssl => false,
+        :ssl_version => 'TLSv1',
+        :method => 'GET',
+        :headers => false,
+        :open_timeout => 30,
+        :timeout => 30
+      }
+      response = RestClient::Request.execute(request_opts)
+      response = JSON.parse(response.body)
+      response['openid']
+    end
+
+    def self.create_oauth_url_for_openid(app_id, app_secret, code)
+      query_parts = {
+        'appid' => app_id,
+        'secret' => app_secret,
+        'code' => code,
+        'grant_type' => 'authorization_code'
+      }
+      query_str = Pingpp.uri_encode(query_parts)
+      'https://api.weixin.qq.com/sns/oauth2/access_token?' + query_str
+    end
+  end
+end

data/lib/pingpp.rb

@@ -1,5 +1,5 @@
 # Pingpp Ruby bindings
-# API spec at https://pingplusplus.com/document/api
+# API spec at https://pingxx.com/document/api
 require 'cgi'
 require 'set'
 require 'openssl'
@@ -35,11 +35,14 @@ require 'pingpp/errors/api_connection_error'
 require 'pingpp/errors/invalid_request_error'
 require 'pingpp/errors/authentication_error'
 
+# WxPubOauth
+require 'pingpp/wx_pub_oauth'
+
 module Pingpp
   DEFAULT_CA_BUNDLE_PATH = File.dirname(__FILE__) + '/data/ca-certificates.crt'
-  @api_base = 'https://api.pingplusplus.com'
+  @api_base = 'https://api.pingxx.com'
 
-  @api_version = '2014-10-10'
+  @api_version = '2015-01-01'
 
   @ssl_bundle_path  = DEFAULT_CA_BUNDLE_PATH
   @verify_ssl_certs = true
@@ -59,15 +62,15 @@ module Pingpp
       raise AuthenticationError.new('No API key provided. ' +
         'Set your API key using "Pingpp.api_key = <API-KEY>". ' +
         'You can generate API keys from the Pingpp web interface. ' +
-        'See https://pingplusplus.com/document/api for details, or email support@pingplusplus.com ' +
+        'See https://pingxx.com/document/api for details, or email support@pingxx.com ' +
         'if you have any questions.')
     end
 
     if api_key =~ /\s/
       raise AuthenticationError.new('Your API key is invalid, as it contains ' +
         'whitespace. (HINT: You can double-check your API key from the ' +
-        'Pingpp web interface. See https://pingplusplus.com/document/api for details, or ' +
-        'email support@pingplusplus.com if you have any questions.)')
+        'Pingpp web interface. See https://pingxx.com/document/api for details, or ' +
+        'email support@pingxx.com if you have any questions.)')
     end
 
     request_opts = { :verify_ssl => false, :ssl_version => 'TLSv1' }
@@ -90,10 +93,10 @@ module Pingpp
       url += "#{URI.parse(url).query ? '&' : '?'}#{uri_encode(params)}" if params && params.any?
       payload = nil
     else
-      payload = uri_encode(params)
+      payload = JSON.generate(params)
     end
 
-    request_opts.update(:headers => request_headers(api_key).update(headers),
+    request_opts.update(:headers => request_headers(api_key, method.to_s.downcase.to_sym == :post).update(headers),
                         :method => method, :open_timeout => 30,
                         :payload => payload, :url => url, :timeout => 80)
 
@@ -167,11 +170,11 @@ module Pingpp
       map { |k,v| "#{k}=#{Util.url_encode(v)}" }.join('&')
   end
 
-  def self.request_headers(api_key)
+  def self.request_headers(api_key, is_post=false)
     headers = {
       :user_agent => "Pingpp/v1 RubyBindings/#{Pingpp::VERSION}",
       :authorization => "Bearer #{api_key}",
-      :content_type => 'application/x-www-form-urlencoded'
+      :content_type => is_post ? 'application/json' : 'application/x-www-form-urlencoded'
     }
 
     headers[:pingplusplus_version] = api_version if api_version
@@ -242,7 +245,7 @@ module Pingpp
   def self.handle_restclient_error(e)
     connection_message = "Please check your internet connection and try again. " \
         "If this problem persists, you should check Pingpp's service status at " \
-        "https://pingplusplus.com, or let us know at support@pingplusplus.com."
+        "https://pingxx.com, or let us know at support@pingxx.com."
 
     case e
     when RestClient::RequestTimeout
@@ -256,16 +259,16 @@ module Pingpp
       message = "Could not verify Pingpp's SSL certificate. " \
         "Please make sure that your network is not intercepting certificates. " \
         "(Try going to (#{@api_base}) in your browser.) " \
-        "If this problem persists, let us know at support@pingplusplus.com."
+        "If this problem persists, let us know at support@pingxx.com."
 
     when SocketError
       message = "Unexpected error communicating when trying to connect to Pingpp. " \
         "You may be seeing this message because your DNS is not working. " \
-        "To check, try running 'host pingplusplus.com' from the command line."
+        "To check, try running 'host pingxx.com' from the command line."
 
     else
       message = "Unexpected error communicating with Pingpp. " \
-        "If this problem persists, let us know at support@pingplusplus.com."
+        "If this problem persists, let us know at support@pingxx.com."
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingpp
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Xufeng Weng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -126,10 +126,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: PingPlusPlus is the easiest way to accept payments online.  See https://pingplusplus.com
+description: PingPlusPlus is the easiest way to accept payments online.  See https://pingxx.com
   for details.
 email:
-- xufeng.weng@pingplusplus.com
+- xufeng.weng@pingxx.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -155,7 +155,8 @@ files:
 - lib/pingpp/singleton_api_resource.rb
 - lib/pingpp/util.rb
 - lib/pingpp/version.rb
-homepage: https://pingplusplus.com/document/api
+- lib/pingpp/wx_pub_oauth.rb
+homepage: https://pingxx.com/document/api
 licenses:
 - MIT
 metadata: {}
@@ -175,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the PingPlusPlus API