wechat_public 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 212bbf261772a3499a1b4ba2da95b20c8ecd131e
-  data.tar.gz: 507316284f6507658225f9a873c51d5b099db2cc
+  metadata.gz: f5d3551cac06a46df46356bafcea88e817d9366b
+  data.tar.gz: da32a4865bacfebcab419d3ea770057612fdc543
 SHA512:
-  metadata.gz: 61cabe3212056283213451e997c50b538983952bd92cbc3f78d1c3306aa5cdc1a0b7fa1218584f7437224f029e6cbe1120e79c5c5293147fc3e281f1abcb1888
-  data.tar.gz: b0672f0f26034b0c76c42e9a70cd48758e26c0ecfb3b69c29e2d98a385738676e92d7853cce56b708e249b343083cb5ab04257fd7da3015f0b7ffbd6caaff7cc
+  metadata.gz: 379c8a938e0f34c283841eaee4ff8ab8825d2c822fb414f9be365d35746fe43c257db26240a74dff618f15a58694168c95a83e186266daf092e01a9921884891
+  data.tar.gz: ea7dd9e850382259a17041bddee864fc9d5c95495e766b1cea34ae461b2bfbbf0dcecf3bd26d711379e65b5c6b5e53ff414092230c033dc7c67fd1cfec684f1d

data/lib/wechat/access_token.rb

@@ -11,21 +11,30 @@ module WechatPublic
 
     def token
       begin
-        @token_data ||= JSON.parse(File.read(token_file))
+        #@token_data ||= JSON.parse(File.read(token_file))
+        data = Object.send(token_file.fetch(:get_token))
+        @token_data ||= data;
       rescue
         self.refresh
       end
       return valid_token(@token_data)
     end
 
+    def token_data
+      self.refresh
+      return @token_data      
+    end
+
     def refresh
       data = client.get("token", params:{grant_type: "client_credential", appid: appid, secret: secret})
-      File.open(token_file, 'w'){|f| f.write(data.to_s)} if valid_token(data)
+      #File.open(token_file, 'w'){|f| f.write(data.to_s)} if valid_token(data)
+      Object.send(token_file.fetch(:set_token),data) if valid_token(data)
       return @token_data = data
     end
 
     private 
     def valid_token token_data
+
       access_token = token_data["access_token"]
       raise "Response didn't have access_token" if  access_token.blank?
       return access_token

data/lib/wechat_public.rb

@@ -5,6 +5,8 @@ module WechatPublic
   autoload :Responder, "wechat/responder"
   autoload :Response, "wechat/response"
   autoload :Test, 'wechat/test'
+  API_BASE = "https://api.weixin.qq.com/cgi-bin/"
+  TICKET_URL = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=";
   #WechatPublic::Test.print
   class AccessTokenExpiredError < StandardError; end
   class ResponseError < StandardError
@@ -17,27 +19,72 @@ module WechatPublic
 
   attr_reader :config
 
-  def self.config
-    @config ||= begin
-      if defined? Rails
-        config_file = Rails.root.join("config/wechat.yml")
-        config = YAML.load(ERB.new(File.new(config_file).read).result)[Rails.env] if (File.exist?(config_file))
-      end
+  def self.config 
+    # @config ||= begin
+    #   if defined? Rails
+    #     config_file = Rails.root.join("config/wechat.yml")
+    #     config = YAML.load(ERB.new(File.new(config_file).read).result)[Rails.env] if (File.exist?(config_file))
+    #   end
 
-      config ||= {appid: ENV["WECHAT_APPID"], secret: ENV["WECHAT_SECRET"], token: ENV["WECHAT_TOKEN"], access_token: ENV["WECHAT_ACCESS_TOKEN"]}
-      config.symbolize_keys!
-      config[:access_token] ||= Rails.root.join("tmp/access_token").to_s
-      puts '======'
-      puts config
-      OpenStruct.new(config)
+    #   config ||= {appid: ENV["WECHAT_APPID"], secret: ENV["WECHAT_SECRET"], token: ENV["WECHAT_TOKEN"], access_token: ENV["WECHAT_ACCESS_TOKEN"]}
+    #   config.symbolize_keys!
+    #   config[:access_token] ||= Rails.root.join("tmp/access_token").to_s
+    #   puts '======'
+    #   puts config
+    #   OpenStruct.new(config)
+    # end
+    @config ||= begin
+      config = {};
+      yield config
+      puts '======',config
+      @config = OpenStruct.new(config)        
     end
   end
 
+
   def self.api
-    puts '...开一下..config..的值',self.config
     @api ||= WechatPublic::Api.new(self.config.appid, self.config.secret, self.config.access_token)
   end
 
+  def self.get_token
+    unless  @access_token 
+      client = WechatPublic::Client.new(API_BASE)
+      @access_token = WechatPublic::AccessToken.new(client, self.config.appid, self.config.secret, self.config.access_token)      
+    end
+    @access_token.token_data 
+  end
+
+  def self.token
+    unless @access_token 
+      client = WechatPublic::Client.new(API_BASE)
+      @access_token = WechatPublic::AccessToken.new(client, self.config.appid, self.config.secret, self.config.access_token)      
+    end    
+    @access_token.token 
+  end
+
+  def self.generate_ticket hash
+    hash ||= {}
+    expire_seconds = hash.fetch("expire_seconds",10);
+    action_name = hash.fetch("action_name","QR_LIMIT_SCENE")
+    scene_id = hash.fetch("scene_id",Random.new.rand(100..10000))
+    form = {
+      expire_seconds: expire_seconds,
+      action_name: action_name,
+      action_info:{
+        scene:{
+          scene_id: scene_id
+        }
+      }
+    }
+    body = RestClient.post(TICKET_URL+self.token,form.to_json,json_header)
+    body = JSON.parse(body)
+    puts body
+    body
+  end
+  private
+  def self.json_header
+    { content_type: :json, accept: :json }
+  end
 end
 
 puts "before 判断 ActionController::Base...加载了么",ActionController::Base

data/lib/wechat_public/version.rb

@@ -1,3 +1,3 @@
 module WechatPublic
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/wechat_public.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 0'
   # spec.add_development_dependency 'rest_client', '~> 1.8'
   # spec.add_development_dependency 'rails', '~> 4.2'
-  spec.add_runtime_dependency 'rest-client', '>= 1.8', '~> 1.8.0'
+  spec.add_runtime_dependency 'rest-client', '>= 1.7'
   spec.add_runtime_dependency 'rails', ">= 4.2", '~>4.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat_public
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Will
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement