weixin_authorize 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 9c7e75ae1a9b81d02ddaba6cf28d0ef9afe64a7c
-  data.tar.gz: 5aeca7b27d5a5a81c780c406ab520bff27835871
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWIzYzY2N2NmMTJjYmZmOThjZDQ1ZmZkMDVlZmVjOGIxNDYwNjgyOQ==
+  data.tar.gz: !binary |-
+    OTNkNzc1MmNjY2I1MGZlNjE0YmI0ZTZhZDc4ZTZiMDZlNzcwM2U3Yw==
 SHA512:
-  metadata.gz: 18949cdd4dc1d47ca7123da41290422c6bc65a8ec5aa50556f890c657ddc525fa5970e222b50acea27e358c493e0558f05e8c84e254a779f94f3f8c70d7ddd7f
-  data.tar.gz: dd6135a09e0e930e441dfc886303c5d83e33129e105719c51a79927a264ba9a86c619b4599cb6ca45987b7696e2d8ad60221c6aa267f5dc3999750640f34a27c
+  metadata.gz: !binary |-
+    N2ZlNTJmMWQxNDFlZDMzYzQ1MDhhNDE4ZDU5OGUwM2E0ZDRkNjg3YmMwMTVm
+    OWE1MDlhMzg4MzBjMDMzNDY2NmNkMDUwYjlkMDM1MjVmNjc2YjdkOTlhZmQz
+    ODZmZTE1YjY1YjFiNDg4MTk4MzRlYTg2MGJlYjg5ZTFlY2E5NDk=
+  data.tar.gz: !binary |-
+    ZDg4MjkwYzRhODM0YWYxYWE4NjI4MzhhOWMyNWMzZDQ2ZTdlOTllMjFhZDFl
+    NGI3NjAwYmQzYTI5ZTlhM2Y0MmRkYmNkMjRjN2M5ODNhMGQ5MjNkOTI1NGQ3
+    NjRmZWQyMTQxYjZlYWMyYTJlZjNlYWZjMWM1OTc5ZDMxODVkNDQ=

data/Gemfile

@@ -2,10 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in weixin_authorize.gemspec
 gemspec
-
-group :development, :test do
-  # For debugger
-  gem "pry-rails", "~> 0.3.2"
-  gem "pry-debugger", "~> 0.2.2"
-  gem "redis-namespace", "~> 1.4.1"
-end

data/lib/weixin_authorize/adapter/client_storage.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+module WeixinAuthorize
+  class ClientStorage < Storage
+
+    def valid?
+      super
+    end
+
+    def token_expired?
+      # 如果当前token过期时间小于现在的时间，则重新获取一次
+      client.expired_at <= Time.now.to_i
+    end
+
+    def authenticate
+      super
+    end
+
+    def access_token
+      super
+      client.access_token
+    end
+  end
+end

data/lib/weixin_authorize/adapter/redis_storage.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+module WeixinAuthorize
+
+  class RedisStorage < Storage
+
+    def valid?
+     weixin_redis.del(client.redis_key)
+     super
+    end
+
+    def token_expired?
+      weixin_redis.hvals(client.redis_key).empty?
+    end
+
+    def authenticate
+      super
+      weixin_redis.hmset(client.redis_key, :access_token, client.access_token,
+                         :expired_at, client.expired_at)
+      weixin_redis.expireat(client.redis_key, client.expired_at.to_i-10) # 提前10秒超时
+    end
+
+    def access_token
+      super
+      client.access_token = weixin_redis.hget(client.redis_key, "access_token")
+      client.expired_at   = weixin_redis.hget(client.redis_key, "expired_at")
+      client.access_token
+    end
+
+    def weixin_redis
+      WeixinAuthorize.config.redis
+    end
+
+  end
+end

data/lib/weixin_authorize/adapter/storage.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+module WeixinAuthorize
+
+  class Storage
+
+    attr_accessor :client
+
+    def initialize(client)
+      @client = client
+    end
+
+    def self.init_with(client)
+      if WeixinAuthorize.config.redis.nil?
+        ClientStorage.new(client)
+      else
+        RedisStorage.new(client)
+      end
+    end
+
+    def valid?
+      valid_result = http_get_access_token
+      if valid_result.keys.include?("access_token")
+        set_access_token_for_client(valid_result)
+        return true
+      end
+      false
+    end
+
+    def token_expired?
+      raise NotImplementedError, "Subclasses must implement a token_expired? method"
+    end
+
+    def authenticate
+      raise "APPID or APPSECRET is invalid" if !valid?
+      set_access_token_for_client
+    end
+
+    def access_token
+      authenticate if token_expired?
+    end
+
+    def set_access_token_for_client(access_token_infos=nil)
+      token_infos = access_token_infos || http_get_access_token
+      client.access_token = token_infos["access_token"]
+      client.expired_at   = Time.now.to_i + token_infos["expires_in"].to_i
+    end
+
+    def http_get_access_token
+      WeixinAuthorize.http_get_without_token("/token", authenticate_headers)
+    end
+
+    def authenticate_headers
+      {grant_type: "client_credential", appid: client.app_id, secret: client.app_secret}
+    end
+
+  end
+
+end

data/lib/weixin_authorize/adapter.rb

@@ -0,0 +1,3 @@
+require "weixin_authorize/adapter/storage"
+require "weixin_authorize/adapter/client_storage"
+require "weixin_authorize/adapter/redis_storage"

data/lib/weixin_authorize/api/media.rb

@@ -7,19 +7,18 @@ module WeixinAuthorize
       # http请求方式: POST/FORM
       # http://file.api.weixin.qq.com/cgi-bin/media/upload?access_token=ACCESS_TOKEN&type=TYPE
       # 支持传路径或者文件类型
-      def upload_media(media, type)
+      def upload_media(media, media_type)
         file = media.is_a?(File) ? media : File.new(media)
         upload_media_url = "#{media_base_url}/upload"
-        http_upload(upload_media_url, {media: file, media_type: type})
+        http_post(upload_media_url, {media: file}, {type: media_type}, "file")
       end
 
       # 目前仅仅把下载链接返回给第三方开发者，由第三方开发者处理下载
-      # php重新写入文件方式：
-      # http://www.cnblogs.com/txw1958/p/weixin80-upload-download-media-file.html
       def download_media_url(media_id)
-        download_media_url = file_endpoint + "#{media_base_url}/get"
-        download_media_url += "?access_token=#{get_access_token}"
-        download_media_url += "&media_id=#{media_id}"
+        download_media_url = WeixinAuthorize.endpoint_url("file", "#{media_base_url}/get")
+        params = URI.encode_www_form("access_token" => get_access_token,
+                                     "media_id"     => media_id)
+        download_media_url += "?#{params}"
         download_media_url
       end
 
@@ -28,15 +27,6 @@ module WeixinAuthorize
         def media_base_url
           "/media"
         end
-
-        def http_upload(url, options)
-          media_type = options.delete(:media_type)
-          upload_url = file_endpoint + url
-          upload_url += "?access_token=#{get_access_token}"
-          upload_url += "&type=#{media_type}"
-          JSON.parse(RestClient.post(upload_url, options))
-        end
-
     end
   end
 end

data/lib/weixin_authorize/api/qrcode.rb

@@ -6,7 +6,7 @@ module WeixinAuthorize
 
       # 临时二维码
       def create_qr_scene(scene_id, expire_seconds=1800)
-        post_url = "#{qrcode_base_url}/create"
+        post_url     = "#{qrcode_base_url}/create"
         qrcode_infos = {action_name: "QR_SCENE", expire_seconds: expire_seconds}
         qrcode_infos = qrcode_infos.merge(action_info(scene_id))
         http_post(post_url, qrcode_infos)
@@ -14,7 +14,7 @@ module WeixinAuthorize
 
       # 永久二维码
       def create_qr_limit_scene(scene_id)
-        post_url = "#{qrcode_base_url}/create"
+        post_url     = "#{qrcode_base_url}/create"
         qrcode_infos = {action_name: "QR_LIMIT_SCENE"}
         qrcode_infos = qrcode_infos.merge(action_info(scene_id))
         http_post(post_url, qrcode_infos)
@@ -22,7 +22,7 @@ module WeixinAuthorize
 
       # 通过ticket换取二维码, 直接访问即可显示！
       def qr_code_url(ticket)
-        "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=#{ticket}"
+        WeixinAuthorize.mp_endpoint("/showqrcode?ticket=#{ticket}")
       end
 
       private

data/lib/weixin_authorize/api.rb

@@ -0,0 +1,6 @@
+require "weixin_authorize/api/user"
+require "weixin_authorize/api/menu"
+require "weixin_authorize/api/custom"
+require "weixin_authorize/api/groups"
+require "weixin_authorize/api/qrcode"
+require "weixin_authorize/api/media"

data/lib/weixin_authorize/client.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require "redis"
-require 'digest'
+require 'digest/md5'
 module WeixinAuthorize
 
   class Client
@@ -13,116 +13,40 @@ module WeixinAuthorize
 
     attr_accessor :app_id, :app_secret, :expired_at # Time.now + expires_in
     attr_accessor :access_token, :redis_key
+    attr_accessor :storage
 
     def initialize(app_id, app_secret, redis_key=nil)
       @app_id     = app_id
       @app_secret = app_secret
       @expired_at = Time.now.to_i
       @redis_key  = security_redis_key((redis_key || "weixin_" + app_id))
+      @storage    = Storage.init_with(self)
     end
 
     # return token
     def get_access_token
-      authenticate if token_expired?
-      if !is_weixin_redis_blank?
-        self.access_token = weixin_redis.hget(redis_key, "access_token")
-        self.expired_at   = weixin_redis.hget(redis_key, "expired_at")
-      end
-      @access_token
+      @storage.access_token
     end
 
     # 检查appid和app_secret是否有效。
     def is_valid?
-      valid_result = http_get_access_token
-      if valid_result.keys.include?("access_token")
-        set_access_token_for_client(valid_result)
-        return true
-      end
-      false
-    end
-
-    def token_expired?
-      if is_weixin_redis_blank?
-        # 如果当前token过期时间小于现在的时间，则重新获取一次
-        @expired_at <= Time.now.to_i
-      else
-        weixin_redis.hvals(redis_key).empty?
-      end
+      @storage.valid?
     end
 
     private
 
-      # authenticate access_token
-      def authenticate
-        raise "APPID or APPSECRET is invalid" if !is_valid?
-        if is_weixin_redis_blank?
-          set_access_token_for_client
-        else
-          authenticate_with_redis
-        end
-      end
-
-      def authenticate_with_redis
-        set_access_token_for_client
-        weixin_redis.hmset(redis_key, :access_token, access_token, :expired_at, expired_at)
-        weixin_redis.expireat(redis_key, expired_at.to_i-10) # 提前10秒超时
-      end
-
-      def set_access_token_for_client(access_token_infos=nil)
-        token_infos = access_token_infos || http_get_access_token
-        self.access_token = token_infos["access_token"]
-        self.expired_at   = Time.now.to_i + token_infos["expires_in"].to_i
-      end
-
-      def http_get_access_token
-        hash_infos = http_get_without_token("/token", authenticate_options)
-        hash_infos
-      end
-
-      def authenticate_options
-        {grant_type: "client_credential", appid: app_id, secret: app_secret}
-      end
-
       def access_token_param
         {access_token: get_access_token}
       end
 
-      def http_get_without_token(url, options={}, endpoint="plain")
-        get_api_url = endpoint_url(endpoint) + url
-        JSON.parse(RestClient.get(get_api_url, :params => options))
-      end
-
-      def http_get(url, options={})
-        options = options.merge(access_token_param)
-        http_get_without_token(url, options)
-      end
-
-      # Refactor
-      def http_post(url, options={}, endpoint="plain")
-        post_api_url = endpoint_url(endpoint) + url + "?access_token=#{get_access_token}"
-        options      = MultiJson.dump(options) # to json
-        JSON.parse(RestClient.post(post_api_url, options))
-      end
-
-      def endpoint_url(endpoint)
-        send("#{endpoint}_endpoint")
-      end
-
-      def plain_endpoint
-        "https://api.weixin.qq.com/cgi-bin"
-      end
-
-      def file_endpoint
-        "http://file.api.weixin.qq.com/cgi-bin"
-      end
-
-      def weixin_redis
-        return nil if WeixinAuthorize.config.nil?
-        @redis ||= WeixinAuthorize.config.redis
+      def http_get(url, headers={}, endpoint="plain")
+        headers = headers.merge(access_token_param)
+        WeixinAuthorize.http_get_without_token(url, headers, endpoint)
       end
 
-      def is_weixin_redis_blank?
-        weixin_redis.nil?
+      def http_post(url, payload={}, headers={}, endpoint="plain")
+        headers = {:params => access_token_param.merge(headers)}
+        WeixinAuthorize.http_post_without_token(url, payload, headers, endpoint)
       end
 
       def security_redis_key(key)

data/lib/weixin_authorize/version.rb

@@ -1,3 +1,3 @@
 module WeixinAuthorize
-  VERSION = "1.5.5"
+  VERSION = "1.5.6"
 end

data/lib/weixin_authorize.rb

@@ -1,14 +1,46 @@
 require "rest-client"
 require "multi_json"
 require "weixin_authorize/config"
-require "weixin_authorize/api/user"
-require "weixin_authorize/api/menu"
-require "weixin_authorize/api/custom"
-require "weixin_authorize/api/groups"
-require "weixin_authorize/api/qrcode"
-require "weixin_authorize/api/media"
+require "weixin_authorize/adapter"
+require "weixin_authorize/api"
 require "weixin_authorize/client"
 
 module WeixinAuthorize
 
+  class << self
+
+    def http_get_without_token(url, headers={}, endpoint="plain")
+      get_api_url = endpoint_url(endpoint, url)
+      load_json(RestClient.get(get_api_url, :params => headers))
+    end
+
+    def http_post_without_token(url, payload={}, headers={}, endpoint="plain")
+      post_api_url = endpoint_url(endpoint, url)
+      payload = MultiJson.dump(payload) if endpoint == "plain" # to json
+      load_json(RestClient.post(post_api_url, payload, headers))
+    end
+
+    # return hash
+    def load_json(string)
+      JSON.parse(string)
+    end
+
+    def endpoint_url(endpoint, url)
+      send("#{endpoint}_endpoint") + url
+    end
+
+    def plain_endpoint
+      "https://api.weixin.qq.com/cgi-bin"
+    end
+
+    def file_endpoint
+      "http://file.api.weixin.qq.com/cgi-bin"
+    end
+
+    def mp_endpoint
+      "https://mp.weixin.qq.com/cgi-bin"
+    end
+
+  end
+
 end

data/spec/api/groups_spec.rb

@@ -11,7 +11,12 @@ describe WeixinAuthorize::Api::Groups do
 
   it "create a group" do
     response = $client.create_group(group_name)
-    expect(response["group"]["name"]).to eq(group_name)
+    if !response["errcode"].nil?
+      expect(response.keys).to eq(["errcode", "errmsg"])
+      puts "SB WEIXIN says: system error"
+    else
+      expect(response["group"]["name"]).to eq(group_name)
+    end
   end
 
   it "get groups" do
@@ -26,11 +31,16 @@ describe WeixinAuthorize::Api::Groups do
 
   it "#update_group_name" do
     response = $client.create_group(group_name)
-    expect(response["group"]["name"]).to eq(group_name)
-    response = $client.update_group_name(response["group"]["id"], group_name_2)
-    expect(response["errcode"]).to eq(0)
-    groups = $client.groups
-    expect(groups["groups"][-1]["name"]).to eq(group_name_2)
+    if !response["errcode"].nil?
+      expect(response.keys).to eq(["errcode", "errmsg"])
+      puts "SB WEIXIN says: system error"
+    else
+      expect(response["group"]["name"]).to eq(group_name)
+      response = $client.update_group_name(response["group"]["id"], group_name_2)
+      expect(response["errcode"]).to eq(0)
+      groups = $client.groups
+      expect(groups["groups"][-1]["name"]).to eq(group_name_2)
+    end
   end
 
   it "#update_group_for_openid" do

data/spec/api/media_spec.rb

@@ -15,11 +15,11 @@ describe WeixinAuthorize::Api::Media do
     expect(response.keys).to eq(["type", "media_id", "created_at"])
   end
 
-  # it "#download_media_url" do
-  #   image = $client.upload_media(image_file, "image")
-  #   media_id = image["media_id"]
-  #   response = $client.download_media_url(media_id)
-  #   response
-  # end
+  it "#download_media_url return a String url" do
+    image = $client.upload_media(image_file, "image")
+    media_id = image["media_id"]
+    response = $client.download_media_url(media_id)
+    expect(response.class).to eq(String)
+  end
 
 end

data/spec/api/user_spec.rb

@@ -7,6 +7,13 @@ describe WeixinAuthorize::Api::User do
   end
 
   it "can get followers infos" do
+    valid_info = $client.is_valid?
+    expect(valid_info).to eq(true)
+    followers = $client.followers
+    expect(followers.keys).to eq(["total", "count", "data", "next_openid"])
+
+    valid_info = $client.is_valid?
+    expect(valid_info).to eq(true)
     followers = $client.followers
     expect(followers.keys).to eq(["total", "count", "data", "next_openid"])
   end

data/spec/spec_helper.rb

@@ -19,8 +19,6 @@ require "multi_json"
 require "redis"
 require "redis-namespace"
 
-require "pry-rails"
-
 redis = Redis.new(:host => "127.0.0.1",:port => "6379")
 
 namespace = "weixin_test:weixin_authorize"

data/weixin_authorize.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "redis-namespace", "~> 1.4.1"
 
   spec.add_development_dependency "rspec", "~> 3.0.0.beta1"
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: weixin_authorize
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
 - !ruby/object:Gem::Dependency
@@ -70,16 +70,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,11 @@ files:
 - README.md
 - Rakefile
 - lib/weixin_authorize.rb
+- lib/weixin_authorize/adapter.rb
+- lib/weixin_authorize/adapter/client_storage.rb
+- lib/weixin_authorize/adapter/redis_storage.rb
+- lib/weixin_authorize/adapter/storage.rb
+- lib/weixin_authorize/api.rb
 - lib/weixin_authorize/api/custom.rb
 - lib/weixin_authorize/api/groups.rb
 - lib/weixin_authorize/api/media.rb
@@ -137,12 +156,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []