dianping-api 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d90607c0ebb98542b7b46e660a0e0d58e752e9e9b039605c3b775526d28f4b2
-  data.tar.gz: ea4989f921379d2c2ed163421473edba4702f9178df563fa8af7c814704d6a0e
+  metadata.gz: 273a0b63e1a93932e0418017345a05999480e3b24666a79cd7d8027cf6665422
+  data.tar.gz: c240ad8116fc4ea92cbfaf292c4b2b8dc5cead0b321c5178da860bd96ce7a603
 SHA512:
-  metadata.gz: c39d73c68ff6362a4956829e343d8868d095faa06cd70c3325e2c0d540fe94ec130e0d963cc5c91b9ca0e0b4ef4744141694aaa85c94ec0c6974b7d9150f6ebf
-  data.tar.gz: f4e95c77e75256976d43cb4622b7acb544421a4f92812f8c2e261e8ee3d94c14fc7483afa519e57d38f2de03da0d67d3f6923975bb1535c490512d46fdab1853
+  metadata.gz: 3b381e73e5f1b843b19106794740772d67ed279f066465a6ed93d672107e10590d79f8a30a26e302f0f9f75a40f79cb9b021b9a60f8b9169ad5a98be84d3ab30
+  data.tar.gz: 4d62e49edc8261d014fe4108aa730723a9005c0c99cb7ba9320946a34bd001ea5a338f0940e0d7a016b3687aa54dc01a23080bffb6ba93ccfaff7651357c520b

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dianping-api (0.1.0)
+    dianping-api (0.1.4)
       faraday (~> 1.0)
-      multi_json (>= 1.0)
+      multi_json (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +13,7 @@ GEM
     coderay (1.1.3)
     crack (0.4.4)
     diff-lcs (1.4.4)
-    faraday (1.1.0)
+    faraday (1.2.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     ffi (1.13.1)
@@ -82,12 +82,12 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.17)
   dianping-api!
-  guard (>= 2.0)
-  guard-rspec (>= 4.0)
+  guard (~> 2.0)
+  guard-rspec (~> 4.0)
   rake (~> 10.0)
-  rspec (>= 3.0)
-  rspec-its (>= 1.0)
-  webmock (>= 3.0)
+  rspec (~> 3.0)
+  rspec-its (~> 1.0)
+  webmock (~> 3.0)
 
 BUNDLED WITH
    1.17.3

data/README.md

@@ -1,8 +1,6 @@
 # Dianping::Api
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/dianping/api`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+美团点评北极星平台Open API SDK for Ruby
 
 ## Installation
 
@@ -22,7 +20,19 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+注册 https://open.dianping.com 按开发测试说明使用
+
+```ruby
+
+# redirect_url 专门给获取access_token (session)使用
+client = Dianping::Api::Client.new 'app_key', 'app_secrent', redirect_url: 'https://example.org/callback'
+
+# 公共请求参数会自动提供并签名
+# 正常结果 `code 200` 以外的返回报文会抛出异常
+body_json = client.post '/routers/xxxx', biz_key1: 1, biz_key2: 2 
+body_json = client.get '/routers/xxxx', url_key1: 1, url_key2: 2 
+
+```
 
 ## Development
 

data/lib/dianping-api.rb

@@ -0,0 +1 @@
+require 'dianping/api'

data/lib/dianping/api.rb

@@ -1,18 +1,36 @@
-require "dianping/api/version"
+require 'dianping/api/version'
 require 'faraday'
+require 'logger'
 
 module Dianping
   module Api
     class TokenExpireError < Faraday::RetriableResponse; end
-    class TokenMissingError < StandardError; end
-    class UsageError < StandardError; end
     class Error < StandardError; end
+    class TokenMissingError < Error; end
+    class UsageError < Error; end
 
+    def self.logger
+      @logger ||= defined?(Rails) ? Rails.logger : ::Logger.new(STDOUT)
+    end
+
+    def self.logger=(logger)
+      @logger = logger
+    end
+
+    def self.client
+      return @client = yield(Client) if block_given?
+
+      @client || raise(::Dianping::Api::Error, 'initialize client with block first')
+    end
+
+    module Modules; end
   end
 end
 
+require 'dianping/api/modules/tuangou'
+
 require 'dianping/api/middle_ware'
 require 'dianping/api/token'
 require 'dianping/api/client'
 
-Faraday::Request.register_middleware dianping: ::Dianping::Api::MiddleWare
+Faraday::Request.register_middleware dianping: ::Dianping::Api::MiddleWare

data/lib/dianping/api/client.rb

@@ -1,16 +1,21 @@
 require 'faraday'
+require 'securerandom'
 
 module Dianping
   module Api
     class Client
 
-      attr_reader :app_key, :site, :token, :redirect_url
+      include Modules::Tuangou
+
+      attr_reader :app_key, :site, :token, :token_root
+      attr_accessor :redirect_url
 
       def initialize(app_key, secret, **options)
         @app_key = app_key
         @secret = secret
-        @site = 'https://openapi.dianping.com'
+        @site = options[:site] || 'https://openapi.dianping.com'
         @redirect_url = options[:redirect_url]
+        @token_root = options[:token_root] || '/tmp'
         @token = Token.new(self)
       end
 
@@ -73,10 +78,18 @@ module Dianping
         json(res.body)
       end
 
+      def scope_shops
+        get('/router/oauth/session/scope', bid: token.bid)
+      end
+
       def json(text)
         MultiJson.load(text || '{}', symbolize_keys: true)
       end
 
+      def requestid
+        SecureRandom.hex
+      end
+
       def share_params
         {
           app_key: app_key,
@@ -89,12 +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
-        sign = Digest::MD5.hexdigest(@secret + content + @secret)
+        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
+end

data/lib/dianping/api/middle_ware.rb

@@ -9,9 +9,12 @@ module Dianping
       end
 
       def call(env)
+        Api.logger.debug { { request: env } }
         check_session(env)
         @app.call(env).on_complete do |response_env|
-          check_response(response_env)
+          Api.logger.debug { { response: response_env } }
+          hash = MultiJson.load response_env.body, symbolize_keys: true
+          check_response(hash)
         end
       end
 
@@ -23,7 +26,17 @@ module Dianping
         raise TokenExpireError
       end
 
-      def check_response(env)
+      def check_response(body)
+        code = body[:code].to_i
+        msg = format('[%<code>d]%<msg>s', code: code, msg: body[:msg])
+
+        Api.logger.debug { { response: body, msg: msg } }
+
+        Api.logger.warn body unless code == 200
+
+        raise TokenExpireError, msg if code == 608
+        raise UsageError, msg if code >= 800
+        raise Error, msg unless code == 200
       end
     end
   end

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

@@ -0,0 +1,26 @@
+module Dianping
+  module Api
+    module Modules
+      module Tuangou
+        def receipt_pre_code(shop_uuid, code)
+          post('/router/tuangou/receipt/prepare', open_shop_uuid: shop_uuid, receipt_code: code)
+        end
+
+        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,
+                        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?
+
+          post '/router/tuangou/receipt/consume', params
+        end
+
+        def shop_deals(shop_deals)
+          get('/tuangou/deal/queryshopdeal', open_shop_uuid: shop_deals)
+        end
+      end
+    end
+  end
+end

data/lib/dianping/api/token.rb

@@ -7,20 +7,24 @@ module Dianping
 
       def initialize(client)
         @client = client
-        @token_file = File.join('/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]))
@@ -49,12 +53,16 @@ module Dianping
         access_hash[:expires_in]
       end
 
+      def bid
+        access_hash[:bid]
+      end
+
       def updated_at
-        Time.parse(access_hash[:updated_at])
+        DateTime.parse(access_hash[:updated_at]).to_time
       end
 
       def expires_at
-        updated_at + expires_in
+        updated_at + expires_in rescue nil
       end
 
       def expired?

data/lib/dianping/api/version.rb

@@ -1,5 +1,5 @@
 module Dianping
   module Api
-    VERSION = "0.1.0"
+    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.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryan Wong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -156,9 +156,11 @@ files:
 - bin/console
 - bin/setup
 - dianping-api.gemspec
+- lib/dianping-api.rb
 - lib/dianping/api.rb
 - lib/dianping/api/client.rb
 - lib/dianping/api/middle_ware.rb
+- lib/dianping/api/modules/tuangou.rb
 - lib/dianping/api/token.rb
 - lib/dianping/api/version.rb
 homepage: https://github.com/lazing/dianping-api