wechat 0.7.19 → 0.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df08372a47386eb8866ba7739473380696224651
-  data.tar.gz: c9a4a4553563aa7c3fdbd5028b04953d7ae02c8c
+  metadata.gz: a1fcfa80de68c3711415ea5b2a09e2f00a2e89e8
+  data.tar.gz: fdfe9d0212a7536c011d8e3f04579dfca8547052
 SHA512:
-  metadata.gz: 3b7d7be0b12629838ff9d6a5772400049003ec098ac5720358ce246c1561cf407cc1702a3aee51642ee0d8daa6f4b074b31978b34f01bee09acf13b1e971fdc9
-  data.tar.gz: 626f445c5e52cb11eee43a4b07f0459f7804562aeec381dd98cb598cf3e123c19e07bb9d922add8e07b7b03d3f667cf23fe1c98298dad91b090493e92bbdec8e
+  metadata.gz: 98d4bc51b5e7c838a0979e4b51819cfe0fce80f96b6090ea45ddd87e4df844bbf2f8c7b3572918dbc5a275cfbef399f5184741fffed4c0184abc23e672eb8bd1
+  data.tar.gz: c004f7e6e4912667f34a356e0f24cc8f0f0e002080e062996d166bdb706c532cb37a7e8f1c7d69a6708a3fe7d78f117817b62ef25332917dcba7798ce95a9142

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.7.20 (released at 8/29/2016)
+
+* Apply opt and config together when loading controller_wechat, to simplify wechat_responder params. by @bzhang443 #147
+
 ## v0.7.19 (released at 8/25/2016)
 
 * Enterprise account now custom_image/voice/file works now. by @zymiboxpay #145

data/README.md

@@ -5,7 +5,7 @@ WeChat [![Gem Version][version-badge]][rubygems] [![Build Status][travis-badge]]
 
 [中文文档 Chinese document](/README-CN.md)
 
-[Wechat](http://www.wechat.com/) is a free messaging and calling app developed by [Tencent](http://tencent.com/en-us/index.shtml), after linking billion people, Wechat has become a platform of application
+[Wechat](http://www.wechat.com/) is a free messaging and calling app developed by [Tencent](http://tencent.com/en-us/index.shtml), after linking billion people, Wechat had become [a platform of application](https://uxdesign.cc/wechat-the-invincible-app-a-key-to-business-success-in-china-8e9a920deb26?source=wechat_gem).
 
 WeChat gem tries to help Rails developer to integrate [enterprise account](https://qy.weixin.qq.com) / [public account](https://mp.weixin.qq.com/) easily. Features below are ready and there is no need writing adapter code for talking to wechat server directly.
 

data/lib/action_controller/wechat_responder.rb

@@ -14,7 +14,7 @@ module ActionController
       self.wechat_api_client ||= load_controller_wechat
     end
 
-    private_class_method
+    private
 
     def load_controller_wechat(opts = {})
       self.token = opts[:token] || Wechat.config.token
@@ -29,13 +29,18 @@ module ActionController
       Wechat.config.oauth2_cookie_duration ||= 1.hour
       self.oauth2_cookie_duration = opts[:oauth2_cookie_duration] || Wechat.config.oauth2_cookie_duration.to_i.seconds
 
+      access_token = opts[:access_token] || Wechat.config.access_token
+      jsapi_ticket = opts[:jsapi_ticket] || Wechat.config.jsapi_ticket
+
       return self.wechat_api_client = Wechat.api if opts.empty?
       if corpid.present?
-        Wechat::CorpApi.new(corpid, opts[:corpsecret], opts[:access_token], \
-                            agentid, timeout, skip_verify_ssl, opts[:jsapi_ticket])
+        corpsecret = opts[:corpsecret] || Wechat.config.corpsecret
+        Wechat::CorpApi.new(corpid, corpsecret, access_token, \
+                            agentid, timeout, skip_verify_ssl, jsapi_ticket)
       else
-        Wechat::Api.new(appid, opts[:secret], opts[:access_token], \
-                        timeout, skip_verify_ssl, opts[:jsapi_ticket])
+        secret = opts[:secret] || Wechat.config.secret
+        Wechat::Api.new(appid, secret, access_token, \
+                        timeout, skip_verify_ssl, jsapi_ticket)
       end
     end
   end

data/lib/wechat/api_loader.rb

@@ -27,9 +27,7 @@ HELP
       @config
     end
 
-    private_class_method
-
-    def self.loading_config!
+    private_class_method def self.loading_config!
       config ||= config_from_file || config_from_environment
 
       if defined?(::Rails)
@@ -42,7 +40,7 @@ HELP
       @config = OpenStruct.new(config)
     end
 
-    def self.config_from_file
+    private_class_method def self.config_from_file
       if defined?(::Rails)
         config_file = Rails.root.join('config/wechat.yml')
         return YAML.load(ERB.new(File.read(config_file)).result)[Rails.env] if File.exist?(config_file)
@@ -63,7 +61,7 @@ HELP
       end
     end
 
-    def self.config_from_environment
+    private_class_method def self.config_from_environment
       { appid: ENV['WECHAT_APPID'],
         secret: ENV['WECHAT_SECRET'],
         corpid: ENV['WECHAT_CORPID'],
@@ -79,7 +77,7 @@ HELP
         trusted_domain_fullname: ENV['WECHAT_TRUSTED_DOMAIN_FULLNAME'] }
     end
 
-    def self.class_exists?(class_name)
+    private_class_method def self.class_exists?(class_name)
       return Module.const_get(class_name).present?
     rescue NameError
       return false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.7.19
+  version: 0.7.20
 platform: ruby
 authors:
 - Skinnyworm
@@ -31,7 +31,7 @@ cert_chain:
   R5k6Ma92sW8jupX4cqbSu9rntdVQkNRpoHIrfU0MZT0cKsg/D1zMteylxrO3KMsz
   SPQRv+nrI1J0zevFqb8010heoR8SDyUA0Mm3+Q==
   -----END CERTIFICATE-----
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport