wechat-api 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 197097c39777d37a55379fcd924dbfd58af2fb184502a775508b7249e2587b0a
-  data.tar.gz: '081365b0f92bd3fe4d949b80720763466916184bb4d6937692bf3e8373da5aa6'
+  metadata.gz: 8586728146eb49d713757e2a324ef9607ddf1098355e8347c35a5b8acd34c392
+  data.tar.gz: b6d7f195acf180b876802a1c52516ac96a085e35bbd10612ad68a87023ffc049
 SHA512:
-  metadata.gz: da4a09f2c50ade7695c3e9b0ba106744f48c2330aed02bfde03187327e25a31093a8fc660daeb424b230372a7e4deb46f9f1f8b2d2d3eea4a25a462939d56ca4
-  data.tar.gz: 590da45cc6017a13c342fbf1252b69258327adeae15acfe25139fe2ffb93c1c84df175e3d708597fdbda86ef8d9b818431adabfee346328e10cc4169d7be81c7
+  metadata.gz: 07a8e8d9ac1157d77196a895c282011cc248fa9dbc4e3932de24037461fef6fbb3284869a97f3f01d585d77b1a3a7c0509ae2396e07571e19f5d4bf0cc74e0c2
+  data.tar.gz: 6a182e5b2058d6aa8bc8c8260e06f53f6f0e86ba7ebbf5bf414a6a212a8d12b61e1cbfe2143a759a1a222989008875a840b13c3fa0df79a203ba2b151aeec16a

data/Gemfile

@@ -1,9 +1,3 @@
 source 'https://rubygems.org'
 # Specify your gem's dependencies in ucpaas.gemspec
 gemspec
-
-group :development do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'rspec-its'
-end

data/lib/wechat-api.rb

@@ -1,3 +1,2 @@
 require 'wechat/api'
-require 'wechat/pay'
 require 'wechat/qy'

data/lib/wechat/api/version.rb

@@ -2,6 +2,6 @@
 module Wechat
   #
   module Api
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/wechat-api.gemspec

@@ -17,14 +17,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "faraday", ">= 0.9"
-  spec.add_runtime_dependency "rest-client", ">= 1.7.0"
-  spec.add_runtime_dependency "multi_json", ">= 1.2"
-  spec.add_runtime_dependency 'gyoku', '>= 1.0.0'
-  spec.add_runtime_dependency 'nori'
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "webmock", "~> 1.18"
+  spec.add_runtime_dependency 'faraday', '~> 1.0'
+  spec.add_runtime_dependency 'multi_json', '~> 1.0'
+
+  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.add_development_dependency 'guard', '~> 2.0'
+  spec.add_development_dependency 'guard-rspec', '~> 4.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-its', '~> 1.0'
+  spec.add_development_dependency 'webmock', '~> 3.0'
+  
 end

metadata

@@ -1,156 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: wechat-api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Wong
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: gyoku
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
+        version: '1.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: nori
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
-description: 
+        version: '3.0'
+description:
 email:
 - lazing@gmail.com
 executables: []
@@ -171,21 +157,17 @@ files:
 - lib/wechat/api/user.rb
 - lib/wechat/api/util.rb
 - lib/wechat/api/version.rb
-- lib/wechat/pay.rb
-- lib/wechat/pay/client.rb
-- lib/wechat/pay/redpack.rb
 - lib/wechat/qy.rb
 - lib/wechat/qy/client.rb
 - lib/wechat/qy/message.rb
 - spec/spec_helper.rb
 - spec/wechat/api/client_spec.rb
-- spec/wechat/pay/client_spec.rb
 - wechat-api.gemspec
 homepage: https://github.com/lazing/wechat-api
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,10 +183,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Wechat API wrapper
 test_files:
 - spec/spec_helper.rb
 - spec/wechat/api/client_spec.rb
-- spec/wechat/pay/client_spec.rb

data/lib/wechat/pay.rb

@@ -1,7 +0,0 @@
-require 'wechat/pay/client'
-
-module Wechat
-  #
-  module Pay
-  end
-end

data/lib/wechat/pay/client.rb

@@ -1,116 +0,0 @@
-require 'rest-client'
-require 'logger'
-require 'multi_json'
-require 'openssl'
-require 'nori'
-require 'gyoku'
-
-require 'wechat/pay/redpack'
-
-module Wechat
-  module Pay
-    class PayError < StandardError; end
-    class NoAuthError < PayError; end
-    class NotEnoughError < PayError; end
-    class TimeLimitedError < PayError; end
-    class MoneyLimitedError < PayError; end
-
-    #
-    class Client
-      include Redpack
-      BASE_URL = 'https://api.mch.weixin.qq.com'
-      REQUIRED_OPTS = %w(key password cert sign_key).map(&:to_sym).freeze
-      ERRORS = {
-        'NO_AUTH' => NoAuthError,
-        'NOTENOUGH' => NotEnoughError,
-        'TIME_LIMITED' => TimeLimitedError,
-        'MONEY_LIMITED' => MoneyLimitedError
-      }
-
-      attr_accessor :logger
-
-      def initialize(mch_id, wxappid, opts = {})
-        @mch_id = mch_id
-        @wxappid = wxappid
-        @opts = Hash[opts.map { |k, v| [k.to_sym, v] }]
-        unless (REQUIRED_OPTS - @opts.keys).empty?
-          fail format('%s required', REQUIRED_OPTS.join(','))
-        end
-        @logger = Logger.new(STDOUT)
-        rsa_setup
-        @parser = Nori.new
-      end
-
-      def post(path, params)
-        merged_params = merge(params)
-        logger.debug { merged_params }
-        resp = resource(path).post(xml(sign(merged_params)))
-        handle(resp)
-      rescue RestClient::ExceptionWithResponse => err
-        raise PayError, err.response
-      end
-
-      private
-
-      def handle(resp)
-        response = parser.parse(resp)
-        check(response)
-        response
-      end
-
-      def check(r)
-        return if r['xml']['result_code'] == 'SUCCESS'
-        handle_error(r['xml']['err_code'], r)
-      end
-
-      def handle_error(error_code, response)
-        fail ERRORS[error_code] || PayError, response.inspect
-      end
-
-      def rsa_setup
-        @rsa_key = OpenSSL::PKey::RSA.new @opts[:key], @opts[:password]
-        @rsa_cert = OpenSSL::X509::Certificate.new @opts[:cert]
-      rescue StandardError => e
-        logger.error { e.inspect }
-      end
-
-      def resource(path)
-        RestClient.log = logger
-        RestClient::Resource.new\
-          [BASE_URL, path].join,
-          ssl_client_key: @rsa_key,
-          ssl_client_cert: @rsa_cert,
-          verify_ssl: OpenSSL::SSL::VERIFY_NONE
-      end
-
-      def xml(hash)
-        Gyoku.xml({ xml: hash }, key_converter: :none)
-      end
-
-      def sign(params)
-        ordered = trim_and_sort(params)
-        keystr = format('key=%s', @opts[:sign_key])
-        origin =
-          ordered.map { |k, v| [k, v].join('=') }.push(keystr).join('&')
-        sign = Digest::MD5.hexdigest(origin).upcase
-        logger.debug { format('origin: %s, sign: %s', origin, sign) }
-        params.merge(sign: sign)
-      end
-
-      def trim_and_sort(params)
-        params.delete_if { |_k, v| v.blank? }
-        Hash[params.sort]
-      end
-
-      def merge(params)
-        params.reverse_merge\
-          mch_id: @mch_id,
-          nonce_str: nonce_str
-      end
-
-      def nonce_str
-        SecureRandom.hex
-      end
-    end
-  end
-end

data/lib/wechat/pay/redpack.rb

@@ -1,39 +0,0 @@
-require 'securerandom'
-
-module Wechat
-  module Pay
-    #
-    module Redpack
-      def redpack(transaction_id, openid, params = {})
-        post\
-          '/mmpaymkttransfers/sendredpack',
-          params.merge(
-            mch_billno: tran_id(transaction_id),
-            wxappid: @wxappid, re_openid: openid
-          )
-      end
-
-      def group_redpack(transaction_id, openid, params = {})
-        post\
-          '/mmpaymkttransfers/sendgroupredpack',
-          params.merge(
-            mch_billno: tran_id(transaction_id),
-            wxappid: @wxappid, re_openid: openid
-          )
-      end
-
-      def redpack_info(transaction_id)
-        post\
-          '/mmpaymkttransfers/gethbinfo',
-          mch_billno: tran_id(transaction_id),
-          bill_type: 'MCHT', appid: @wxappid
-      end
-
-      private
-
-      def tran_id(origin)
-        format('%s%s', @mch_id, origin)
-      end
-    end
-  end
-end

data/spec/wechat/pay/client_spec.rb

@@ -1,24 +0,0 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
-RSpec.describe Wechat::Pay::Client do
-  subject do
-    described_class.new\
-      'mch_id', 'wxappid',
-      key: 'key', password: 'password', cert: 'cert',
-      sign_key: 'sign_key'
-  end
-
-  it :trim_and_sort do
-    expect(
-      subject.send(:trim_and_sort, b: 2, c: 3, a: 1).values
-    ).to start_with(1)
-  end
-
-  it :sign do
-    expect(subject.send(:sign, b: 2, a: 1)).to have_key(:sign)
-  end
-
-  it :xml do
-    expect(subject.send(:xml, b_1: 2, a: 1)).to match(/xml/)
-  end
-end