weixin_js_sdk 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a7c77eb5bf4e109a1ceb2cdca6e42f737978da3
-  data.tar.gz: c3b3100872590b03b809bd0901161e9c69d71a97
+  metadata.gz: ec9759260f854f08d5fc61c89030156e39216add
+  data.tar.gz: 7531d01eb33b517e15754fc90747b474596ee447
 SHA512:
-  metadata.gz: 0b383adf3263554e16055152360c9002979d4a6c8ab6ab8e1486554ed55056410e436ad77159d5d63fc89ee8404d6ba104f424051df03701f0a4f92afc2ec897
-  data.tar.gz: 0ed647af36e5e34ca666742d06e800c8eff3683048ff4b9ec7212f452712526079ddbe97cbc78086f827df6c5d0c841d8556ff51de5d5d23ed669007bedb237a
+  metadata.gz: e47835f4c5e060ba8b292a00438bb07ff8a4b12cd0214b46b85858cbc10c40c8000c392ab300ece5a4d9aa00e659076a453cfb69eb5effb4e642bb972ef39146
+  data.tar.gz: 9748612a4ba156f49715fd446df638d308ffd74540fb8f912971218cb33b6ca15f2877bb5ae5fd7e99f1de250b670d00d98648ddf4d69fa2153086c3a0e4d787

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## v0.0.2
+
+* Deprecated `fetch`
+* Add `token` and `expires_in` to WeixinJsSDK::AccessToken
+* Add `token` and `expires_in` to WeixinJsSDK::Ticket
+
 ## v0.0.1
 
 * Initial release

data/README.md

@@ -30,22 +30,30 @@ Or install it yourself as:
 access_token = WeixinJsSDK::AccessToken.new(
   app_id: ENV['WEIXIN_APP_ID'],
   app_secret: ENV['WEIXIN_APP_SECRET']
-).fetch
+)
+#=> #<WeixinJsSDK::AccessToken:0x007ff9c488a111>
+access_token.token
 #=> xxx
+access_token.expires_in
+#=> 7200
 ```
 
 * Fetch Ticket
 
 ```ruby
-ticket = WeixinJsSDK::Ticket.new(access_token: access_token).fetch
+ticket = WeixinJsSDK::Ticket.new(access_token: access_token.token)
+#=> #<WeixinJsSDK::Ticket:0x007fe62d133c68>
+ticket.token
 #=> xxx
+ticket.expires_in
+#=> 7200
 ```
 
 * Generate Signature
 
 ```ruby
 signature = WeixinJsSDK::Signature.new(
-  ticket: ticket,
+  ticket: ticket.token,
   nonce_str: 'Wm3WZYTPz0wzccnW',
   timestamp: '1414587457',
   url: 'http://mp.weixin.qq.com'

data/lib/weixin_js_sdk/access_token.rb

@@ -2,23 +2,26 @@ module WeixinJsSDK
   class AccessToken
     URI_TEMPLATE = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%{app_id}&secret=%{app_secret}'.freeze
 
-    def initialize(app_id:, app_secret:)
-      @app_id = app_id
-      @app_secret = app_secret
-    end
+    attr_reader :token, :expires_in
 
-    def fetch
+    def initialize(app_id: '', app_secret: '')
       url = URI_TEMPLATE % {
-        app_id: @app_id,
-        app_secret: @app_secret
+        app_id: app_id,
+        app_secret: app_secret
       }
 
       json = Util.get_json(url)
 
-      access_token = json['access_token']
-      expires_in = json['expires_in']
+      @token = json['access_token']
+      @expires_in = json['expires_in']
+    end
 
-      access_token
+    # <b>DEPRECATED:</b> Please use <tt>token</tt> instead.
+    def fetch
+      warn "[DEPRECATION] `fetch` is deprecated.  Please use `token` instead."
+      token
     end
+
+    alias_method :access_token, :token
   end
 end

data/lib/weixin_js_sdk/errors.rb

@@ -5,7 +5,7 @@ module WeixinJsSDK
     class InvalidRequest < Standard
       DOC_URI = 'http://mp.weixin.qq.com/wiki/17/fa4e1434e57290788bde25603fa2fcbd.html'.freeze
 
-      def initialize(error_code:, message:)
+      def initialize(error_code: '', message: '')
         @error_code = error_code
         @message = message
       end

data/lib/weixin_js_sdk/signature.rb

@@ -4,7 +4,7 @@ module WeixinJsSDK
   class Signature
     TEMPLATE = 'jsapi_ticket=%{jsapi_ticket}&noncestr=%{nonce_str}&timestamp=%{timestamp}&url=%{url}'.freeze
 
-    def initialize(ticket:, nonce_str:, timestamp:, url:)
+    def initialize(ticket: '', nonce_str: '', timestamp: '', url: '')
       @ticket = ticket
       @nonce_str = nonce_str
       @timestamp = timestamp
@@ -19,8 +19,6 @@ module WeixinJsSDK
         url: @url
       }
 
-      puts str
-
       Digest::SHA1.hexdigest(str)
     end
   end

data/lib/weixin_js_sdk/ticket.rb

@@ -2,21 +2,25 @@ module WeixinJsSDK
   class Ticket
     URI_TEMPLATE = 'https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%{access_token}&type=jsapi'.freeze
 
-    def initialize(access_token:)
-      @access_token = access_token
-    end
+    attr_reader :token, :expires_in
 
-    def fetch
+    def initialize(access_token: '')
       url = URI_TEMPLATE % {
-        access_token: @access_token
+        access_token: access_token
       }
 
-      json = Util.get_json(url)
+      json = Util.get_json(url) rescue {}
 
-      ticket = json['ticket']
-      expires_in = json['expires_in']
+      @token = json['ticket']
+      @expires_in = json['expires_in']
+    end
 
-      ticket
+    # <b>DEPRECATED:</b> Please use <tt>token</tt> instead.
+    def fetch
+      warn "[DEPRECATION] `fetch` is deprecated.  Please use `token` instead."
+      token
     end
+
+    alias_method :ticket, :token
   end
 end

data/lib/weixin_js_sdk/version.rb

@@ -1,3 +1,3 @@
 module WeixinJsSdk
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_js_sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jun Lin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ 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: A Weixin JS-SDK toolkit.