imwukong 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f839e78ed7eb750f06fe3b23a20e9d2b2038b77
-  data.tar.gz: 2cb0f34fa327598e8e5f0da64b1829cf605b7bdf
+  metadata.gz: 646a6144178082387c93319db9fe27f04f89733c
+  data.tar.gz: a09298d354196e1afdbcbc3b0bf30445e4ab2f24
 SHA512:
-  metadata.gz: fb6fff8bdd2c0c775db24fdfbbcd018c5616ab3fe29c8b87fa6a241edd4cdaaf42cf5ce5078b237001485e5e1541686933c0f9d4b2ed3594b55465b5c48f54f2
-  data.tar.gz: 4c197d257bc8ea4217c268dfdf7600503885c43b61387bf6f4cd7c74fd346de7ae459fbfb44a9fed31e015d9e80cf9aaeadacf81f88eb7100297d860afb5043d
+  metadata.gz: 64528f4879b345a808a8432bdbfaf40c72a613b5a5213899b37b77f4a51ef10b9b1d51b0d5b181be2d8c31598239808ed1131bd650fc8b8ada6dc5257a64d738
+  data.tar.gz: f49e656fb60f748696029f76d6e5f730eff76955ac0e2984da9c02c731417735582c9b1839a2b00dea01e3f1a2e5836ee796fee217bf03da32727a45d2163794

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    imwukong (0.1.4)
+    imwukong (0.1.5)
       activesupport (~> 4.2.0)
-      httparty (~> 0.13.0)
+      httpclient (~> 2.7.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -15,13 +15,10 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     diff-lcs (1.2.5)
-    httparty (0.13.3)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
+    httpclient (2.7.0.1)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.8.2)
-    multi_xml (0.5.5)
+    minitest (5.8.3)
     rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)

data/README.md

@@ -6,7 +6,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'imwukong', github: 'dannyxu2015/imwukong', branch: 'master'
+gem 'imwukong'
 ```
 
 And then execute:

data/imwukong.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_dependency "httparty", "~> 0.13.0"
+  spec.add_dependency "httpclient", "~> 2.7.0.1"
   spec.add_dependency "activesupport", "~> 4.2.0"
 end

data/lib/imwukong/api.rb

@@ -5,6 +5,14 @@ module Imwukong
     STATUS_FOLLOW_BY = 1 # 被关注
     STATUS_BI_FOLLOW = 2 # 双向关系
 
+    # api description
+    #   method_group: string, 接口分组名
+    #   method_pluralize: boolean, 接口名是否为复数形式, 默认为false
+    #   method_name: 接口名
+    #   prefix: url前缀, 默认是'v1/im',
+    #   url: 接口url
+    #   args: 参数列表, symbol array
+    #   default: 可选参数的默认值, 调用时可以不用传
     API_LIST = [
       # 用户
       {
@@ -46,7 +54,12 @@ module Imwukong
         method_name:      'create',
         method_pluralize: false,
         http_method:      :post,
-        url:              'create'
+        url:              'create',
+        args: [:openId, :type, :icon, :title, :members],
+        default: {
+          icon: '',
+          title: ''
+        }
       },
       {
         # 查询聊天会话的概要信息
@@ -452,6 +465,7 @@ module Imwukong
         method_name  = "wk_#{method_group}_#{api[:method_name]}"
         fail "Method #{method_name} already defined" if respond_to?(method_name)
         define_method method_name do |params|
+          params.merge!(api[:default]||{})
           check_params(params, api[:args]||[])
           self.send "wk_#{api[:http_method]}", method_group, api[:url], api[:prefix]||'v1/im', params
         end

data/lib/imwukong/base.rb

@@ -1,63 +1,48 @@
-require 'httparty'
+require 'httpclient'
 require 'digest'
+require 'json'
 
 module Imwukong
   class Base
-    include HTTParty
-    # include Api::User
-    # include Api::Conversation
-    # include Api::Message
-    # include Api::Follow
-    # include Api::Upload
-    # include Api::Push
 
-    DEFAULT_OPTIONS = { api_version: 'v1' }
     DEV_HOST        = 'https://sandbox-wkapi.laiwang.com'.freeze
     PRODUCTION_HOST = "https://wkapi.laiwang.com"
 
     def initialize(app_domain = Imwukong.config[:domain],
                    app_token = Imwukong.config[:server][:app_token])
       fail 'app domain/token is invalid' unless app_domain.present? && app_token.present?
-      @app_domain = app_domain.strip
-      @app_token  = app_token.strip
-      @options    = DEFAULT_OPTIONS
+      @app_domain  = app_domain.strip
+      @app_token   = app_token.strip
+      @http_client = HTTPClient.new
     end
 
     def wk_post(type, method, prefix='v1/im', params)
-      options = {
-        body:    params.to_json,
-        headers: wukong_header
-      }
-      prefix  ||= 'v1/im'
-      result = self.class.send(:post, get_request_url(type, method, prefix), options) rescue nil
+      prefix ||= 'v1/im'
+      result = @http_client.post(get_request_url(type, method, prefix), params.to_json, wukong_header) rescue nil
       handle_response(result)
     end
 
     def wk_get(type, method, prefix='v1/im', params)
-      options = {
-        query:   params,
-        headers: wukong_header
-      }
-      prefix  ||= 'v1/im'
-      result = self.class.send(:get, get_request_url(type, method, prefix), options) rescue nil
+      prefix ||= 'v1/im'
+      result = @http_client.get(get_request_url(type, method, prefix), params, wukong_header) rescue nil
       handle_response(result)
     end
 
-    # def safe_json_parse(data)
-    #   warn data.inspect
-    #   JSON.parse(data)
-    #     # rescue TypeError which will cause 'no implicit conversion of HTTParty::Response into String'
-    # rescue JSON::ParserError, TypeError
-    #   {}
-    # end
-
     private
 
+    def safe_json_parse(data)
+      JSON.parse(data)
+        # rescue TypeError which will cause 'no implicit conversion of HTTParty::Response into String'
+    rescue JSON::ParserError, TypeError
+      warn data.inspect
+      {}
+    end
+
     def handle_response(result)
+      # warn result.inspect
       fail 'No respond from server' if result.nil?
-      warn ">>> Code: #{result.code}, " + result.inspect
-      r = result.parsed_response
-      fail result.inspect unless result.code == 200
+      fail "Request fail, return code:#{result.code}" unless result.ok?
+      r = safe_json_parse(result.body)
       fail "#{r['errorCode']}, #{r['errorMessage']}" if r['success'] == false
       r['data']
     end
@@ -67,7 +52,7 @@ module Imwukong
     end
 
     def get_request_url(type, method, prefix='v1/im')
-      warn "#{wukong_host}/#{prefix}/#{type}/#{method}"
+      # warn "#{wukong_host}/#{prefix}/#{type}/#{method}"
       "#{wukong_host}/#{prefix}/#{type}/#{method}"
     end
 
@@ -76,7 +61,6 @@ module Imwukong
       @nonce     = rand(100000..200000).to_s
       array      = [token, @timestamp, @nonce].sort
       sign       = Digest::SHA1.hexdigest(array.join)
-      warn "Sign: #{sign}"
       sign
     end
 

data/lib/imwukong/version.rb

@@ -1,3 +1,3 @@
 module Imwukong
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imwukong
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Danny Xu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 2.7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 2.7.0.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement