wechat 0.7.16 → 0.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23916edc0bd81f54751cecf9e3936e7c9c0e3d66
-  data.tar.gz: 7948b1899e0926c4f7c7c1da2e18b3b7ea63e52e
+  metadata.gz: ed2471f9aa568a83e09e3dfbe6515d037ee838c0
+  data.tar.gz: 6eb311ad860d7142dbd5d6fa5a62d2a1b40396b9
 SHA512:
-  metadata.gz: 529950c0422c7ec2e9c20ee8de79bf879528e94d47a61074f2d82bf05ead6305137824304ad38c334bd79bbae9b05ec9f7e0fdca7535b82ebec97502dd6369f9
-  data.tar.gz: 999bda64d6631f8f221d3b4d5e1a6e625bbb3e23adaffe4037856dfce0bc774709731a6289c50e5d307e9c1d8240bc8e2b2974ada59a70687fe09bf9ea572794
+  metadata.gz: e0bb4fb7b20e03761990999d773136f667549d869623dc37dea64d8e8765d147b79e1fe5de4787d2f59953f8a3bbbe1b809d61b7c6d4a215257166125d99b9dd
+  data.tar.gz: 62471faa01c41258219c7bb3799aeea638630c8f5d97514b3cb4dd4520b25e2fe20872571031fc773f0fbff1bd65f2ab73839f8d0cf434dd96871a63c76ea353

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.7.17 (released at 8/18/2016)
+
+* Allow declare wechat_api at ApplicationController, but using wechat at sub controller. #104 
+
 ## v0.7.16 (released at 7/27/2016)
 
 * FIX: consider '' in params as equal with nil, in ControllerApi#wechat_public_oauth2, by @snow #135

data/README-CN.md

@@ -159,7 +159,7 @@ production:
 development:
   <<: *default
   trusted_domain_fullname: "http://your_dev.proxy.qqbrowser.cc"
-  
+
 test:
   <<: *default
 ```
@@ -242,7 +242,7 @@ end
 
 `wechat_oauth2`封装了OAuth2.0验证接口和cookie处理逻辑，用户仅需提供业务代码块即可。userid指的是微信企业成员UserID，openid是关注该公众号的用户openid。
 
-注意: 
+注意:
 * 如果使用 `wechat_responder`, 请不要在 Controller 里定义 `show` 和 `create` 方法, 否则会报错。
 * 如果遇到“redirect_uri参数错误”的错误信息，请登录服务号管理后台，查看“开发者中心/网页服务/网页授权获取用户基本信息”的授权回调页面域名已正确配置。
 
@@ -497,15 +497,15 @@ $ wechat template_message oCfEht9oM*********** template.yml
 在代码中可以这样使用：
 
 ```ruby
-template = YAML.load(File.read(template_yaml_path)).symbolize_keys
-Wechat.api.template_message_send Wechat::Message.to(openid).template(template)
+template = YAML.load(File.read(template_yaml_path))
+Wechat.api.template_message_send Wechat::Message.to(openid).template(template['template'])
 ```
 
 若在Controller中使用wechat_api或者wechat_responder，可以使用wechat：
 
 ```ruby
-template = YAML.load(File.read(template_yaml_path)).symbolize_keys
-wechat.template_message_send Wechat::Message.to(openid).template(template)
+template = YAML.load(File.read(template_yaml_path))
+wechat.template_message_send Wechat::Message.to(openid).template(template['template'])
 ```
 
 ## wechat_api - Rails Controller Wechat API

data/README.md

@@ -24,7 +24,7 @@ Wechat provides OAuth2.0 authentication method `wechat_oauth2`, possibly the eas
 
 There is official [weui](https://github.com/weui/weui), which corresponding Rails gems called [weui-rails](https://github.com/Eric-Guo/weui-rails) available, if you prefer following the same UI design as wechat.
 
-For web page only wechat application, please use [`wechat_api`](#wechat_api---rails-controller-wechat-api), which only contains web feature compare with traditional message type [`wechat_responder`](#wechat_responder---rails-responder-controller-dsl). 
+For web page only wechat application, please use [`wechat_api`](#wechat_api---rails-controller-wechat-api), which only contains web feature compare with traditional message type [`wechat_responder`](#wechat_responder---rails-responder-controller-dsl).
 
 There is a more complete [wechat-starter](https://github.com/goofansu/wechat-starter) demo available, even include the payment SDK feature.
 
@@ -156,7 +156,7 @@ default: &default
   token:    ""
   encoding_aes_key:  ""
   jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
-  
+
 production:
   corpid:     <%= ENV['WECHAT_CORPID'] %>
   corpsecret: <%= ENV['WECHAT_CORPSECRET'] %>
@@ -255,7 +255,7 @@ end
 
 `wechat_oauth2` already implement the necessory OAuth2.0 and cookie logic. userid defined as the enterprise member UserID. openid defined as the user who following the public account, also notice openid will be different for the same user for different following public account.
 
-Notice: 
+Notice:
 * If you use `wechat_responder` in your controller, you cannot use `create` and `show` action in your controller, otherwise will throw errors.
 * If you get *redirect_uri parameter error* message, make sure you set the correct callback site url value in wechat management console with path *Development center / Webpage service / Webpage authorization for retrieving user basic informaiton*.
 
@@ -512,15 +512,15 @@ $ wechat template_message oCfEht9oM*********** template.yml
 In code:
 
 ```ruby
-template = YAML.load(File.read(template_yaml_path)).symbolize_keys
-Wechat.api.template_message_send Wechat::Message.to(openid).template(template)
+template = YAML.load(File.read(template_yaml_path))
+Wechat.api.template_message_send Wechat::Message.to(openid).template(template["template"])
 ```
 
 If using wechat_api or wechat_responder in Controller, can alse use wechat as shortcut(Support multi account):
 
 ```ruby
-template = YAML.load(File.read(template_yaml_path)).symbolize_keys
-wechat.template_message_send Wechat::Message.to(openid).template(template)
+template = YAML.load(File.read(template_yaml_path))
+wechat.template_message_send Wechat::Message.to(openid).template(template["template"])
 ```
 
 ## wechat_api - Rails Controller Wechat API

data/lib/action_controller/wechat_responder.rb

@@ -2,12 +2,16 @@ module ActionController
   module WechatResponder
     def wechat_api(opts = {})
       include Wechat::ControllerApi
-      self.wechat = load_controller_wechat(opts)
+      self.wechat_api_client = load_controller_wechat(opts)
     end
 
     def wechat_responder(opts = {})
       include Wechat::Responder
-      self.wechat = load_controller_wechat(opts)
+      self.wechat_api_client = load_controller_wechat(opts)
+    end
+
+    def wechat
+      self.wechat_api_client ||= load_controller_wechat
     end
 
     private_class_method
@@ -25,7 +29,7 @@ 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
 
-      return self.wechat = Wechat.api if opts.empty?
+      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])

data/lib/wechat/controller_api.rb

@@ -3,7 +3,7 @@ module Wechat
     extend ActiveSupport::Concern
 
     module ClassMethods
-      attr_accessor :wechat, :token, :appid, :corpid, :agentid, :encrypt_mode, :timeout,
+      attr_accessor :wechat_api_client, :token, :appid, :corpid, :agentid, :encrypt_mode, :timeout,
                     :skip_verify_ssl, :encoding_aes_key, :trusted_domain_fullname, :oauth2_cookie_duration
     end
 
@@ -36,7 +36,7 @@ module Wechat
         redirect_to oauth2_url
       elsif cookies.signed_or_encrypted[:we_openid].blank? &&
             params[:code].present? &&
-            params[:state].to_s == wechat.jsapi_ticket.oauth2_state.to_s # params[:state] maybe nil and wechat.jsapi_ticket.oauth2_state may be nil
+            params[:state].to_s == wechat.jsapi_ticket.oauth2_state.to_s # params[:state] maybe '' and wechat.jsapi_ticket.oauth2_state may be nil
         access_info = wechat.web_access_token(params[:code])
         cookies.signed_or_encrypted[:we_openid] = { value: access_info['openid'], expires: self.class.oauth2_cookie_duration.from_now }
         yield access_info['openid'], access_info

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.7.16
+  version: 0.7.17
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,7 +132,6 @@ files:
 - LICENSE
 - README-CN.md
 - README.md
-- Rakefile
 - bin/wechat
 - lib/action_controller/wechat_responder.rb
 - lib/generators/wechat/install_generator.rb

data/Rakefile

@@ -1,27 +0,0 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Wechat'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-require File.join('bundler', 'gem_tasks')
-require File.join('rspec', 'core', 'rake_task')
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec