dianping-api 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d999be27de932ac3ae044dc8d4c08c899635f87943ce3fc7b739cb3b2eb4d8d
-  data.tar.gz: '009a90b2734a3e30fd0ae2b77b1e5ab3a5938d2c256deb8e9effa4b6c3ccf24b'
+  metadata.gz: 273a0b63e1a93932e0418017345a05999480e3b24666a79cd7d8027cf6665422
+  data.tar.gz: c240ad8116fc4ea92cbfaf292c4b2b8dc5cead0b321c5178da860bd96ce7a603
 SHA512:
-  metadata.gz: 6f8ee2af9d86267855fd6e1d04efa89523332117674b86540fff847fdb740a9417b1f2fcad16577222b64875418729bc6d13fa45f18a20b53b7c96164884d2d3
-  data.tar.gz: 94756099193ad357b47a4ee524fb346d6a810c1391cfb14a76af04aa11c1ee0aa5f1e366a8c972cebab6e679c1065152055ad6c10c704715ccfc52aa0d643ab2
+  metadata.gz: 3b381e73e5f1b843b19106794740772d67ed279f066465a6ed93d672107e10590d79f8a30a26e302f0f9f75a40f79cb9b021b9a60f8b9169ad5a98be84d3ab30
+  data.tar.gz: 4d62e49edc8261d014fe4108aa730723a9005c0c99cb7ba9320946a34bd001ea5a338f0940e0d7a016b3687aa54dc01a23080bffb6ba93ccfaff7651357c520b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dianping-api (0.1.3)
+    dianping-api (0.1.4)
       faraday (~> 1.0)
       multi_json (~> 1.0)
 

data/lib/dianping/api.rb

@@ -10,11 +10,11 @@ module Dianping
     class UsageError < Error; end
 
     def self.logger
-      @@logger ||= defined?(Rails) ? Rails.logger : ::Logger.new(STDOUT)
+      @logger ||= defined?(Rails) ? Rails.logger : ::Logger.new(STDOUT)
     end
-  
+
     def self.logger=(logger)
-      @@logger = logger
+      @logger = logger
     end
 
     def self.client

data/lib/dianping/api/client.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'securerandom'
 
 module Dianping
   module Api
@@ -6,7 +7,7 @@ module Dianping
 
       include Modules::Tuangou
 
-      attr_reader :app_key, :site, :token
+      attr_reader :app_key, :site, :token, :token_root
       attr_accessor :redirect_url
 
       def initialize(app_key, secret, **options)
@@ -14,6 +15,7 @@ module Dianping
         @secret = secret
         @site = options[:site] || 'https://openapi.dianping.com'
         @redirect_url = options[:redirect_url]
+        @token_root = options[:token_root] || '/tmp'
         @token = Token.new(self)
       end
 
@@ -84,6 +86,10 @@ module Dianping
         MultiJson.load(text || '{}', symbolize_keys: true)
       end
 
+      def requestid
+        SecureRandom.hex
+      end
+
       def share_params
         {
           app_key: app_key,
@@ -96,13 +102,17 @@ module Dianping
       end
 
       def sign_with_share(params = {})
-        merged = share_params.merge(params || {}).dup
+        merged = merge_params(params)
         content = merged.to_a.sort.flatten.join.encode!('UTF-8')
         # puts @secret + content
         Api.logger.debug { format('content: %s', content) }
         sign = Digest::MD5.hexdigest([@secret, content, @secret].compact.join)
         merged.merge(sign: sign)
       end
+
+      def merge_params(params)
+        share_params.merge(params || {}).dup.reject { |_k, v| v.nil? }
+      end
     end
   end
 end

data/lib/dianping/api/modules/tuangou.rb

@@ -6,10 +6,10 @@ module Dianping
           post('/router/tuangou/receipt/prepare', open_shop_uuid: shop_uuid, receipt_code: code)
         end
 
-        def receipt_consume(shop_uuid, code, request_id, count = 1, **params)
+        def receipt_consume(shop_uuid, code, count = 1, request_id = nil, **params)
           params.merge! open_shop_uuid: shop_uuid,
                         receipt_code: code,
-                        requestid: request_id,
+                        requestid: request_id || requestid,
                         count: count
           keys = %i[requestid receipt_code count open_shop_uuid app_shop_account app_shop_accountname]
           raise "missing keys #{keys - params.keys}" unless (keys - params.keys).empty?

data/lib/dianping/api/token.rb

@@ -7,20 +7,24 @@ module Dianping
 
       def initialize(client)
         @client = client
-        @token_file = File.join(ENV['TOKEN_ROOT'] || '/tmp', "dianping-api-#{client.app_key}")
+        @token_file = File.join(client.token_root || 'tmp', "dianping-api-#{client.app_key}")
       end
 
       def access_hash
-        @access_hash ||=
-          begin
-            token = MultiJson.load(File.read(@token_file), symbolize_keys: true)
-            token[:access_hash] || (raise 'empty token')
-          rescue Errno::ENOENT
-            {}
-          end
+        @access_hash ||= load_token
+      end
+
+      def load_token
+        token = MultiJson.load(File.read(@token_file), symbolize_keys: true)
+        token[:access_hash] || (raise 'empty token')
+      rescue Errno::ENOENT
+        {}
       end
 
       def refresh
+        @access_hash = load_token # try to use shared token first
+        return unless expired?
+
         raise Error, 'no refresh_token' unless refresh_token && remain_refresh_count > 1
 
         save_token(client.refresh_token(@access_hash[:refresh_token]))

data/lib/dianping/api/version.rb

@@ -1,5 +1,5 @@
 module Dianping
   module Api
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dianping-api
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryan Wong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday