weixin_authorize 1.6.0 → 1.6.2

data/spec/spec_helper.rb

@@ -37,12 +37,13 @@ SimpleCov.start
 ENV['CODECLIMATE_REPO_TOKEN'] = "c91fecbbd9e414e7cc3ad7a7d99207145de0ac65a3368de09e8c19295343d399"
 CodeClimate::TestReporter.start
 
-ENV["APPID"]="wxe371e0960de5426a"
-ENV["APPSECRET"]="572b93d3d20aea242692a804243a141b"
-ENV["OPENID"]="oEEoyuEasxionjR5HygmEOQGwRcw"
+# If you want test, change your weixin test profile
+ENV["APPID"]="wx986f04063d341d04"
+ENV["APPSECRET"]="1a941cd88cb4579ba98ec06b6813af03"
+ENV["OPENID"]="o9k6BuB0kydAcPTc7sPxppB1GQqA"
 
 # Comment to test for ClientStorage
-redis = Redis.new(:host => "127.0.0.1",:port => "6379")
+redis = Redis.new(host: "127.0.0.1", port: "6379", db: 15)
 
 namespace = "weixin_test:weixin_authorize"
 
@@ -54,9 +55,11 @@ redis_with_ns = Redis::Namespace.new("#{namespace}", :redis => redis)
 
 WeixinAuthorize.configure do |config|
   config.redis = redis_with_ns
+  config.rest_client_options = {timeout: 10, open_timeout: 10, verify_ssl: true}
 end
 
 $client = WeixinAuthorize::Client.new(ENV["APPID"], ENV["APPSECRET"])
+
 RSpec.configure do |config|
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.

data/weixin_authorize.gemspec

@@ -19,16 +19,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rest-client", ">= 1.6.7"
-  spec.add_dependency "redis", "~> 3.0.7"
+  spec.add_dependency "redis", ">= 3.1.0"
 
-  spec.add_dependency "carrierwave", "~> 0.10.0"
-  spec.add_dependency 'mini_magick', '~> 3.7.0'
+  spec.add_dependency "carrierwave", ">= 0.10.0"
+  spec.add_dependency 'mini_magick', '>= 3.7.0'
 
   # A streaming JSON parsing and encoding library for Ruby (C bindings to yajl)
   # https://github.com/brianmario/yajl-ruby
-  spec.add_dependency "yajl-ruby", "~> 1.2.0"
+  spec.add_dependency "yajl-ruby", ">= 1.2.0"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_authorize
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -28,72 +28,72 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -124,15 +124,16 @@ files:
 - README.md
 - Rakefile
 - lib/weixin_authorize.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/data_cube.rb
 - lib/weixin_authorize/api/groups.rb
+- lib/weixin_authorize/api/mass.rb
 - lib/weixin_authorize/api/media.rb
 - lib/weixin_authorize/api/menu.rb
+- lib/weixin_authorize/api/oauth.rb
 - lib/weixin_authorize/api/qrcode.rb
+- lib/weixin_authorize/api/template.rb
 - lib/weixin_authorize/api/user.rb
 - lib/weixin_authorize/carrierwave/weixin_uploader.rb
 - lib/weixin_authorize/client.rb
@@ -141,10 +142,18 @@ files:
 - lib/weixin_authorize/handler/exceptions.rb
 - lib/weixin_authorize/handler/global_code.rb
 - lib/weixin_authorize/handler/result_handler.rb
+- lib/weixin_authorize/js_ticket/object_store.rb
+- lib/weixin_authorize/js_ticket/redis_store.rb
+- lib/weixin_authorize/js_ticket/store.rb
+- lib/weixin_authorize/token/object_store.rb
+- lib/weixin_authorize/token/redis_store.rb
+- lib/weixin_authorize/token/store.rb
 - lib/weixin_authorize/version.rb
 - spec/1_fetch_access_token_spec.rb
+- spec/2_fetch_jsticket_spec.rb
 - spec/api/custom_spec.rb
 - spec/api/groups_spec.rb
+- spec/api/mass_spec.rb
 - spec/api/media_spec.rb
 - spec/api/medias/favicon.ico
 - spec/api/medias/ruby-logo.jpg
@@ -173,14 +182,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: weixin api authorize access_token
 test_files:
 - spec/1_fetch_access_token_spec.rb
+- spec/2_fetch_jsticket_spec.rb
 - spec/api/custom_spec.rb
 - spec/api/groups_spec.rb
+- spec/api/mass_spec.rb
 - spec/api/media_spec.rb
 - spec/api/medias/favicon.ico
 - spec/api/medias/ruby-logo.jpg

data/lib/weixin_authorize/adapter/client_storage.rb

@@ -1,23 +0,0 @@
-# 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 refresh_token
-      super
-    end
-
-    def access_token
-      super
-      client.access_token
-    end
-  end
-end

data/lib/weixin_authorize/adapter/redis_storage.rb

@@ -1,34 +0,0 @@
-# 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 refresh_token
-      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.weixin_redis
-    end
-
-  end
-end

data/lib/weixin_authorize/adapter/storage.rb

@@ -1,73 +0,0 @@
-# encoding: utf-8
-module WeixinAuthorize
-
-  class Storage
-
-    attr_accessor :client
-
-    def initialize(client)
-      @client = client
-    end
-
-    def self.init_with(client)
-      if WeixinAuthorize.weixin_redis.nil?
-        ClientStorage.new(client)
-      else
-        RedisStorage.new(client)
-      end
-    end
-
-    def valid?
-      authenticate["valid"]
-    end
-
-    def authenticate
-      auth_result = http_get_access_token
-      auth = false
-      if auth_result.is_ok?
-        set_access_token_for_client(auth_result.result)
-        auth = true
-      end
-      {"valid" => auth, "handler" => auth_result}
-    end
-
-    def refresh_token
-      handle_valid_exception
-      set_access_token_for_client
-    end
-
-    def access_token
-      refresh_token if token_expired?
-    end
-
-    def token_expired?
-      raise NotImplementedError, "Subclasses must implement a token_expired? method"
-    end
-
-    def set_access_token_for_client(access_token_infos=nil)
-      token_infos = access_token_infos || http_get_access_token.result
-      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: GRANT_TYPE, appid: client.app_id, secret: client.app_secret}
-    end
-
-    private
-
-      def handle_valid_exception
-        auth_result = authenticate
-        if !auth_result["valid"]
-          result_handler = auth_result["handler"]
-          raise ValidAccessTokenException, result_handler.full_error_message
-        end
-      end
-
-  end
-
-end