dianping-api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3221f07cd5c4e9b610a2ad6e5752816a542387b8db12f0f3c86f2d631ed39089
-  data.tar.gz: 15032efba732a33d797ab1d3a8f96695ef6f55ce92c09cc6048b777684e315ec
+  metadata.gz: 8739ca18c627d07503c20dc80087fb335e4c67165490c301db372ec9a506168d
+  data.tar.gz: 97e6298fe7d94c9f78cd6ed25d9f8cfa39b88cf5054e9325bca77b40cdebb273
 SHA512:
-  metadata.gz: 5d94c5c7381bb2e560689cbd858f98748d5aa743f7da4fd39db94d142a679a2c5df70c77c42417d051c045eae6b37e96a88840c99bd2eb6f138e61446ece3e73
-  data.tar.gz: c4c76fab3731eccc2b31244c852451403cb7310d33f4a25d3824f3419fdabe68b143117dbf0a1e3902abd7fd81f9d5363cd9e280388cbf871f8896d474a259c0
+  metadata.gz: 1ed02e94b7c8ff8e7d6a039ffe7466aeb15fb53dd459fc0dd045795cacddd32e6f77ff376c7e6cad39383e0a37ab7ca40fa24eff3f6f6ed342bbf1d8af7d3af6
+  data.tar.gz: 158b17cc9141e222e2c3e1d820747ddf678075035227eba2cae13e56f22605d717f7f6ebcdd12fdb5aa83e49cfee05a0f829f9f1f6f711a1ffed7f37418d5b44

data/Gemfile.lock

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

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

@@ -1,12 +1,27 @@
 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

data/lib/dianping/api/client.rb

@@ -94,7 +94,8 @@ module Dianping
         merged = share_params.merge(params || {}).dup
         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
     end

data/lib/dianping/api/middle_ware.rb

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

data/lib/dianping/api/token.rb

@@ -54,7 +54,7 @@ module Dianping
       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.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dianping-api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan Wong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday