wechat 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc6d264f5abaaa4f22369e54e341f95ee9d5f50
-  data.tar.gz: 52284eb6380ee4969955c512cf95a3fda69e4784
+  metadata.gz: a46351d945927448378043c4d7ff5305d42a16dc
+  data.tar.gz: b8f2ab96e6f7c04803a993cede138db3ac385b53
 SHA512:
-  metadata.gz: 479c18b6cdc4d889a159a81fa9dc9256e83ae6c9543d8f8cc1e42c92cba3618639219287a0b372b3a7ddb56a0c0bae365dc8761a0f0a737839ed090ae0be6026
-  data.tar.gz: 64ad4d1f5204fae608786226f07c00761645f4c381d2359235b480bd8cbf6190f5475c2901527d03c9bbb8bece37e359fb4940d15f104fec26708e3d04c9c21c
+  metadata.gz: 388f39cc6658760db382a9f0cb327716a1cacaa2673ed655c32d10d160169d290342c70d259c560ad894d204e6481c453a7d26cd35c934cbf2b15d134f9df3c6
+  data.tar.gz: 93cd2d31a610c60ff6cb7962aea8f3e42813c55f35cd687ace7dd5091c1459549792ca8d76e244d79a5d68194705c6bd856ded5aad8c9730ee23449b0cfd6217

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # 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)
 
 * Fix token refresh bug on multi worker. #76

data/README.md

@@ -418,7 +418,6 @@ 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_loader.rb

@@ -48,9 +48,10 @@ 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)
-          config = YAML.load(ERB.new(File.read(rails_config_file)).result)['default']
+          rails_env = ENV['RAILS_ENV'] || 'default'
+          config = YAML.load(ERB.new(File.read(rails_config_file)).result)[rails_env]
           if config.present? && (config['appid'] || config['corpid'])
-            puts 'Using rails project config/wechat.yml default setting...'
+            puts "Using rails project config/wechat.yml #{rails_env} setting..."
             return config
           end
         end

data/lib/wechat/responder.rb

@@ -8,7 +8,7 @@ module Wechat
 
     included do
       # Rails 5 remove before_filter and skip_before_filter
-      if defined?(:skip_before_action)
+      if respond_to?(: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,7 +29,13 @@ 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)
-          self.known_scan_key_lists = with if message_type == :scan
+          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
         else
           fail 'Message type click, view, scan and batch_job must specify :with parameters' if [:click, :view, :scan, :batch_job].include?(message_type)
         end
@@ -41,6 +47,8 @@ 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
@@ -64,6 +72,10 @@ module Wechat
         @batch_job_responders[with] ||= []
       end
 
+      def user_defined_scan_responders
+        @scan_responders ||= []
+      end
+
       def user_defined_location_responders
         @location_responders ||= []
       end
@@ -88,7 +100,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_responders(:scan), message))
+            yield(* known_scan_with_match_responders(user_defined_scan_responders, message))
           elsif 'batch_job_result' == message[:Event]
             yield(* user_defined_batch_job_responders(message[:BatchJob][:JobType]), message[:BatchJob])
           elsif 'location' == message[:Event]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -139,12 +139,14 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  *****WECHAT BREAK CHANGE*****
-  1. Scan 2D barcode using new syntax `on :scan, with: 'BINDING_QR_CODE' `
+  *****************************  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'`
   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