wework 0.3.4 → 1.1.0

data/mock_responses/service/get_pre_auth_code.json

@@ -0,0 +1,6 @@
+{
+    "errcode":0 ,
+    "errmsg":"ok" ,
+    "pre_auth_code":"xxxx",
+    "expires_in":1200
+}

data/mock_responses/service/get_provider_token.json

@@ -0,0 +1,4 @@
+{
+    "provider_access_token":"enLSZ5xxxxxxJRL",
+    "expires_in":7200
+ }

data/mock_responses/service/get_suite_token.json

@@ -0,0 +1,4 @@
+{
+    "suite_access_token":"61W3mEpU66027wgNZ_MhGHNQDHnFATkDa9-2llqrMBjUwxRSNPbVsMmyD-yq8wZETSoE5NQgecigDrSHkPtIYA",
+    "expires_in":7200
+}

data/mock_responses/success.json

@@ -0,0 +1,4 @@
+{
+   "errcode": 0,
+   "errmsg": "ok"
+}

data/mock_responses/user/convert_to_openid.json

@@ -0,0 +1,6 @@
+{
+   "errcode": 0,
+   "errmsg": "ok",
+   "openid": "oDOGms-6yCnGrRovBj2yHij5JL6E",
+   "appid":"wxf874e15f78cc84a7"
+}

data/mock_responses/user/convert_to_userid.json

@@ -0,0 +1,5 @@
+{
+   "errcode": 0,
+   "errmsg": "ok",
+   "userid": "zhangsan"
+}

data/mock_responses/user/get.json

@@ -0,0 +1,18 @@
+{
+   "errcode": 0,
+   "errmsg": "ok",
+   "userid": "zhangsan",
+   "name": "李四",
+   "department": [1, 2],
+   "order": [1, 2],
+   "position": "后台工程师",
+   "mobile": "15913215421",
+   "gender": "1",
+   "email": "zhangsan@gzdev.com",
+   "isleader": 1,
+   "avatar": "http://wx.qlogo.cn/mmopen/ajNVdqHZLLA3WJ6DSZUfiakYe37PKnQhBIeOQBO4czqrnZDS79FH5Wm5m4X69TBicnHFlhiafvDwklOpZeXYQQ2icg/0",
+   "telephone": "020-123456",
+   "english_name": "jackzhang",
+   "extattr": {"attrs":[{"name":"爱好","value":"旅游"},{"name":"卡号","value":"1234567234"}]},
+   "status": 1
+}

data/mock_responses/user/getuserdetail.json

@@ -0,0 +1,10 @@
+{
+   "userid":"lisi",
+   "name":"李四",
+   "department":[3],
+   "position": "后台工程师",
+   "mobile":"15050495892",
+   "gender":1,
+   "email":"xxx@xx.com",
+   "avatar":"http://shp.qpic.cn/bizmp/xxxxxxxxxxx/0"
+}

data/mock_responses/user/getuserinfo.json

@@ -0,0 +1,8 @@
+{
+   "errcode": 0,
+   "errmsg": "ok",
+   "UserId":"USERID",
+   "DeviceId":"DEVICEID",
+   "user_ticket": "USER_TICKET",
+   "expires_in":7200
+}

data/mock_responses/user/list.json

@@ -0,0 +1,22 @@
+{
+    "errcode": 0,
+    "errmsg": "ok",
+    "userlist": [
+        {
+            "userid": "zhangsan",
+            "name": "李四",
+            "department": [1, 2],
+            "order": [1, 2],
+            "position": "后台工程师",
+            "mobile": "15913215421",
+            "gender": "1",
+            "email": "zhangsan@gzdev.com",
+            "isleader": 0,
+            "avatar":           "http://wx.qlogo.cn/mmopen/ajNVdqHZLLA3WJ6DSZUfiakYe37PKnQhBIeOQBO4czqrnZDS79FH5Wm5m4X69TBicnHFlhiafvDwklOpZeXYQQ2icg/0",
+            "telephone": "020-123456",
+            "english_name": "jackzhang",
+            "status": 1,
+            "extattr": {"attrs":[{"name":"爱好","value":"旅游"},{"name":"卡号","value":"1234567234"}]}
+        }
+    ]
+}

data/mock_responses/user/simplelist.json

@@ -0,0 +1,11 @@
+{
+   "errcode": 0,
+   "errmsg": "ok",
+   "userlist": [
+           {
+                  "userid": "zhangsan",
+                  "name": "李四",
+                  "department": [1, 2]
+           }
+     ]
+}

data/wework.gemspec

@@ -20,11 +20,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'http', '>= 1.0.4', '< 3'
+  spec.add_dependency 'http', '>= 2.2'
   spec.add_dependency 'activesupport', '~> 5.0'
-  spec.add_dependency 'redis', '~>3.2'
+  spec.add_dependency 'redis', '~>3.3'
+  spec.add_dependency 'builder', '~> 3.2.2'
+  spec.add_dependency 'sinatra', '~>2.0.0'
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.10"
+  spec.add_development_dependency 'webmock', '~> 3.4.1'
+  spec.add_development_dependency 'mock_redis', '~>0.18.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wework
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 1.1.0
 platform: ruby
 authors:
 - seandong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +122,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.1
+- !ruby/object:Gem::Dependency
+  name: mock_redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
 description: Ruby API wrapper for work wechat.
 email:
 - sindon@gmail.com
@@ -120,17 +170,62 @@ files:
 - lib/wework/api/agent.rb
 - lib/wework/api/base.rb
 - lib/wework/api/contact.rb
+- lib/wework/api/corp.rb
+- lib/wework/api/methods/agent.rb
+- lib/wework/api/methods/approval.rb
+- lib/wework/api/methods/batch.rb
+- lib/wework/api/methods/checkin.rb
+- lib/wework/api/methods/department.rb
+- lib/wework/api/methods/media.rb
+- lib/wework/api/methods/menu.rb
+- lib/wework/api/methods/message.rb
+- lib/wework/api/methods/provider.rb
+- lib/wework/api/methods/suite.rb
+- lib/wework/api/methods/user.rb
+- lib/wework/api/provider.rb
+- lib/wework/api/suite.rb
 - lib/wework/cipher.rb
 - lib/wework/config.rb
-- lib/wework/engine.rb
 - lib/wework/global_code.rb
-- lib/wework/js_ticket/redis_store.rb
-- lib/wework/js_ticket/store.rb
-- lib/wework/provider.rb
+- lib/wework/mock_api.rb
 - lib/wework/request.rb
-- lib/wework/token/redis_store.rb
-- lib/wework/token/store.rb
+- lib/wework/token/app_token.rb
+- lib/wework/token/base.rb
+- lib/wework/token/corp_token.rb
+- lib/wework/token/js_ticket.rb
+- lib/wework/token/provider_token.rb
+- lib/wework/token/suite_token.rb
 - lib/wework/version.rb
+- mock_responses/agent/get.json
+- mock_responses/agent/list.json
+- mock_responses/agent/set.json
+- mock_responses/batch/getresult.json
+- mock_responses/department/list.json
+- mock_responses/error.json
+- mock_responses/files/party.csv
+- mock_responses/files/sample.amr
+- mock_responses/files/sample.mp4
+- mock_responses/files/sample.txt
+- mock_responses/files/user.csv
+- mock_responses/files/zhiren.png
+- mock_responses/get_jsapi_ticket.json
+- mock_responses/gettoken.json
+- mock_responses/menu/get.json
+- mock_responses/service/get.json
+- mock_responses/service/get_corp_token.json
+- mock_responses/service/get_login_info.json
+- mock_responses/service/get_permanent_code.json
+- mock_responses/service/get_pre_auth_code.json
+- mock_responses/service/get_provider_token.json
+- mock_responses/service/get_suite_token.json
+- mock_responses/success.json
+- mock_responses/user/convert_to_openid.json
+- mock_responses/user/convert_to_userid.json
+- mock_responses/user/get.json
+- mock_responses/user/getuserdetail.json
+- mock_responses/user/getuserinfo.json
+- mock_responses/user/list.json
+- mock_responses/user/simplelist.json
 - wework.gemspec
 homepage: https://github.com/mycolorway/wework
 licenses:
@@ -152,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby API wrapper for work wechat.

data/lib/wework/engine.rb

@@ -1,31 +0,0 @@
-module Wework
-  class Engine
-
-    attr_reader :corp_id, :corp_secret, :app_id, :app_secret
-
-    def initialize(options={})
-      @corp_id = options[:corp_id]
-      @corp_secret = options[:corp_secret]
-      @app_id = options[:app_id]
-      @app_secret = options[:app_secret]
-    end
-
-    def contact
-      @contact ||= Wework::Api::Contact.new(corp_id, corp_secret) if contact?
-    end
-
-    def agent
-      @agent ||= Wework::Api::Agent.new(corp_id, app_id, app_secret) if agent?
-    end
-
-    private
-
-    def agent?
-      corp_id.present? && app_id.present? && app_secret.present?
-    end
-
-    def contact?
-      corp_id.present? && corp_secret.present?
-    end
-  end
-end

data/lib/wework/js_ticket/redis_store.rb

@@ -1,41 +0,0 @@
-module Wework
-  module JsTicket
-    class RedisStore < Store
-
-      def initialize(agent)
-        raise RedisNotConfigException if redis.nil?
-        super
-      end
-
-      def jsapi_ticket
-        super
-        redis.hget(key, "ticket")
-      end
-
-      def expired?
-        redis.hvals(key).empty? || redis.hget(key, "expires_at").to_i <= Time.now.to_i
-      end
-
-      def refresh_token
-        result = super
-        unless result.ticket.nil?
-          expires_at = Time.now.to_i + result.expires_in.to_i - Wework.expired_shift_seconds
-          redis.hmset(
-            key,
-            "ticket", result.ticket,
-            "expires_at", expires_at
-          )
-
-          redis.expireat(key, expires_at)
-        end
-      end
-
-      private
-
-      def redis
-        Wework.redis
-      end
-
-    end
-  end
-end

data/lib/wework/js_ticket/store.rb

@@ -1,36 +0,0 @@
-module Wework
-  module JsTicket
-    class Store
-
-      attr_accessor :app
-
-      def initialize(app)
-        @app = app
-      end
-
-      def jsapi_ticket
-        refresh_token if expired?
-      end
-
-      def expired?
-        raise NotImplementedError, "Subclasses must implement a token_expired? method"
-      end
-
-      def refresh_token
-        result = app.get 'get_jsapi_ticket'
-        if defined?(Rails)
-          Rails.logger.warn "[WEWORK] refresh JsTicket(#{app.corp_id}): #{result.inspect}"
-        end
-
-        result
-      end
-
-      private
-
-      def key
-        @key ||= Digest::MD5.hexdigest("#{JSAPI_TOKEN_PREFIX}_#{app.app_id}_#{app.app_secret}")
-      end
-
-    end
-  end
-end