wechat 0.6.10 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a46351d945927448378043c4d7ff5305d42a16dc
-  data.tar.gz: b8f2ab96e6f7c04803a993cede138db3ac385b53
+  metadata.gz: b7f55b06f42f4f81535e3eac7cb4030d7850758e
+  data.tar.gz: 5b8992563a4e96c2e084a2f371601445678a3a8c
 SHA512:
-  metadata.gz: 388f39cc6658760db382a9f0cb327716a1cacaa2673ed655c32d10d160169d290342c70d259c560ad894d204e6481c453a7d26cd35c934cbf2b15d134f9df3c6
-  data.tar.gz: 93cd2d31a610c60ff6cb7962aea8f3e42813c55f35cd687ace7dd5091c1459549792ca8d76e244d79a5d68194705c6bd856ded5aad8c9730ee23449b0cfd6217
+  metadata.gz: 602388ebebfda0bba1b5bc2f7cf7601cb313255acdc658902bd3bab5785c52aa23139bdd9bb503d787175012691cccebf0aa17e0637e2aa84f6e251321c43cdb
+  data.tar.gz: 3700915a52962394b839d77d8b3d6478cdb1df903f5d026910f9bd330755353396c5ae572e199da9f5a8e31bbfe492a0aa4f022bcbc8b7dac50d6f6b268df62f

data/CHANGELOG.md

@@ -1,27 +1,8 @@
 # Changelog
 
-* Support Rails 3.2 again after support Rails 5.0. by @guange2015 #87 
-* Fetch setting from RAILS_ENV first, then fetch default. by @kikyous #85
-* Warning not support on :scan with regular expression. by @kikyous #84 
-
-## v0.7.1 (released at 1/11/2016)
-
-* Fix after using http, upload file function break. #78
-* Add callback function after_wechat_response support. by @zfben #79
-* Should using department_id instead of departmentid at enterprise api: user_simplelist/user_list.
-
 ## v0.7.0 (released at 1/1/2016)
 
-* Using [http](https://github.com/httprb/http) instead of rest-client for performance reason. (not support upload file yet)
-
-## v0.6.10 (released at 1/17/2016)
-
-* Support Rails 3.2 again after support Rails 5.0. by @guange2015 #87 
-* Fetch setting from RAILS_ENV first, then fetch default. by @kikyous #85
-* Warning not support on :scan with regular expression. by @kikyous #84 
-
-## v0.6.9 (released at 1/6/2016)
-
+* Using [http](https://github.com/httprb/http) instead of rest-client for performance reason.
 * Fix token refresh bug on multi worker. #76
 * Rewrite the token relative code to add more storage support in future.
 

data/README.md

@@ -418,6 +418,7 @@ So the ActionController should defined like below:
 ```ruby
 class WechatsController < ActionController::Base
   wechat_responder
+  wechat_responder
 
   # default text responder when no other match
   on :text do |request, content|

data/lib/wechat/api.rb

@@ -1,7 +1,7 @@
 require 'wechat/api_base'
 require 'wechat/client'
 require 'wechat/token/public_access_token'
-require 'wechat/ticket/public_jsapi_ticket'
+require 'wechat/ticket/jsapi_ticket'
 
 module Wechat
   class Api < ApiBase
@@ -11,7 +11,7 @@ module Wechat
     def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file)
       @client = Client.new(API_BASE, timeout, skip_verify_ssl)
       @access_token = Token::PublicAccessToken.new(@client, appid, secret, token_file)
-      @jsapi_ticket = Ticket::PublicJsapiTicket.new(@client, @access_token, jsapi_ticket_file)
+      @jsapi_ticket = Ticket::JsapiTicket.new(@client, @access_token, jsapi_ticket_file)
     end
 
     def groups

data/lib/wechat/api_loader.rb

@@ -48,10 +48,9 @@ HELP
         rails_config_file = File.join(Dir.getwd, 'config/wechat.yml')
         home_config_file = File.join(Dir.home, '.wechat.yml')
         if File.exist?(rails_config_file)
-          rails_env = ENV['RAILS_ENV'] || 'default'
-          config = YAML.load(ERB.new(File.read(rails_config_file)).result)[rails_env]
+          config = YAML.load(ERB.new(File.read(rails_config_file)).result)['default']
           if config.present? && (config['appid'] || config['corpid'])
-            puts "Using rails project config/wechat.yml #{rails_env} setting..."
+            puts 'Using rails project config/wechat.yml default setting...'
             return config
           end
         end

data/lib/wechat/client.rb

@@ -1,24 +1,27 @@
-require 'rest_client'
+require 'http'
 
 module Wechat
   class Client
-    attr_reader :base, :timeout, :verify_ssl
+    attr_reader :base, :ssl_context
 
     def initialize(base, timeout, skip_verify_ssl)
       @base = base
-      @timeout = timeout
-      @verify_ssl = skip_verify_ssl ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
+      HTTP.timeout(:global, write: timeout, connect: timeout, read: timeout)
+      @ssl_context = OpenSSL::SSL::SSLContext.new
+      @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_verify_ssl
     end
 
-    def get(path, header = {})
-      request(path, header) do |url, header|
-        RestClient::Request.execute(method: :get, url: url, headers: header, timeout: timeout, verify_ssl: verify_ssl)
+    def get(path, get_header = {})
+      request(path, get_header) do |url, header|
+        params = header.delete(:params)
+        HTTP.headers(header).get(url, params: params, ssl_context: ssl_context)
       end
     end
 
-    def post(path, payload, header = {})
-      request(path, header) do |url, header|
-        RestClient::Request.execute(method: :post, url: url, payload: payload, headers: header, timeout: timeout, verify_ssl: verify_ssl)
+    def post(path, payload, post_header = {})
+      request(path, post_header) do |url, header|
+        params = header.delete(:params)
+        HTTP.headers(header).post(url, params: params, body: payload, ssl_context: ssl_context)
       end
     end
 
@@ -30,7 +33,7 @@ module Wechat
       header.merge!(accept: :json)
       response = yield(url, header)
 
-      fail "Request not OK, response code #{response.code}" if response.code != 200
+      fail "Request not OK, response status #{response.status}" if response.status != 200
       parse_response(response, as || :json) do |parse_as, data|
         break data unless parse_as == :json && data['errcode'].present?
 
@@ -65,7 +68,7 @@ module Wechat
         data = file
 
       when :json
-        data = JSON.parse(response.body.gsub /[\u0000-\u001f]+/, '')
+        data = JSON.parse response.body.to_s.gsub(/[\u0000-\u001f]+/, '')
       else
         data = response.body
       end

data/lib/wechat/corp_api.rb

@@ -90,12 +90,12 @@ module Wechat
       get 'department/list', params: { id: departmentid }
     end
 
-    def user_simplelist(department_id, fetch_child = 0, status = 0)
-      get 'user/simplelist', params: { department_id: department_id, fetch_child: fetch_child, status: status }
+    def user_simplelist(departmentid, fetch_child = 0, status = 0)
+      get 'user/simplelist', params: { departmentid: departmentid, fetch_child: fetch_child, status: status }
     end
 
-    def user_list(department_id, fetch_child = 0, status = 0)
-      get 'user/list', params: { department_id: department_id, fetch_child: fetch_child, status: status }
+    def user_list(departmentid, fetch_child = 0, status = 0)
+      get 'user/list', params: { departmentid: departmentid, fetch_child: fetch_child, status: status }
     end
 
     def tag_create(tagname, tagid = nil)

data/lib/wechat/responder.rb

@@ -8,7 +8,7 @@ module Wechat
 
     included do
       # Rails 5 remove before_filter and skip_before_filter
-      if respond_to?(:skip_before_action)
+      if defined?(:skip_before_action)
         # Rails 5 API mode won't define verify_authenticity_token
         skip_before_action :verify_authenticity_token unless defined?(:verify_authenticity_token)
         before_action :verify_signature, only: [:show, :create]
@@ -29,13 +29,7 @@ module Wechat
         if with.present?
           fail 'Only text, event, click, view, scan and batch_job can having :with parameters' unless [:text, :event, :click, :view, :scan, :batch_job].include?(message_type)
           config.merge!(with: with)
-          if message_type == :scan
-            if with.is_a?(String)
-              self.known_scan_key_lists = with
-            else
-              fail 'on :scan only support string in parameter with, detail see https://github.com/Eric-Guo/wechat/issues/84'
-            end
-          end
+          self.known_scan_key_lists = with if message_type == :scan
         else
           fail 'Message type click, view, scan and batch_job must specify :with parameters' if [:click, :view, :scan, :batch_job].include?(message_type)
         end
@@ -47,8 +41,6 @@ module Wechat
           user_defined_view_responders(with) << config
         when :batch_job
           user_defined_batch_job_responders(with) << config
-        when :scan
-          user_defined_scan_responders << config
         when :location
           user_defined_location_responders << config
         else
@@ -72,10 +64,6 @@ module Wechat
         @batch_job_responders[with] ||= []
       end
 
-      def user_defined_scan_responders
-        @scan_responders ||= []
-      end
-
       def user_defined_location_responders
         @location_responders ||= []
       end
@@ -100,7 +88,7 @@ module Wechat
           elsif 'click' == message[:Event]
             yield(* match_responders(responders, message[:EventKey]))
           elsif known_scan_key_lists.include?(message[:EventKey])
-            yield(* known_scan_with_match_responders(user_defined_scan_responders, message))
+            yield(* known_scan_with_match_responders(user_defined_responders(:scan), message))
           elsif 'batch_job_result' == message[:Event]
             yield(* user_defined_batch_job_responders(message[:BatchJob][:JobType]), message[:BatchJob])
           elsif 'location' == message[:Event]

data/lib/wechat/ticket/{public_jsapi_ticket.rb → jsapi_ticket.rb}

@@ -2,7 +2,8 @@ require 'wechat/ticket/jsapi_base'
 
 module Wechat
   module Ticket
-    class PublicJsapiTicket < JsapiBase
+    class JsapiTicket < JsapiBase
+      # refresh jsapi ticket
       def refresh
         data = client.get('ticket/getticket', params: { access_token: access_token.token, type: 'jsapi' })
         write_ticket_to_file(data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.7.0
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -60,19 +60,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +136,7 @@ files:
 - lib/wechat/signature.rb
 - lib/wechat/ticket/corp_jsapi_ticket.rb
 - lib/wechat/ticket/jsapi_base.rb
-- lib/wechat/ticket/public_jsapi_ticket.rb
+- lib/wechat/ticket/jsapi_ticket.rb
 - lib/wechat/token/access_token_base.rb
 - lib/wechat/token/corp_access_token.rb
 - lib/wechat/token/public_access_token.rb
@@ -139,14 +145,12 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  *****************************  WeChat Notice  *****************************
-  Last version of v6 series, v7 relay on http gems and performance improved.
-
-  1. Scan 2D barcode using new syntax `on :scan, with: 'BINDING_QR_CODE'`
+  *****WECHAT BREAK CHANGE*****
+  1. Scan 2D barcode using new syntax `on :scan, with: 'BINDING_QR_CODE' `
   instead of previous `on :event, with: 'BINDING_QR_CODE' `.
   2. Batch job using new syntax `on :batch_job, with: 'replace_user' `
   instead of previous `on :event, with: 'replace_user' `.
-  ***************************************************************************
+  *****************************
 rdoc_options: []
 require_paths:
 - lib