easemob 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ed81345e9a563df461fd8429d9d00cb3458a79
-  data.tar.gz: 8e1e91fd5bd5f05f98d4e8ac1f06fa87b8a84884
+  metadata.gz: 8055d485f3b40b7996d8bf5419069d97e63385e1
+  data.tar.gz: c636336061874989cad3240a2a7683df9deab07d
 SHA512:
-  metadata.gz: fb273fa328e8ec22595d7c5399830187fcc4ba814b9c0b0437509c253cb4b7c03a95eade2fbc33f45c6a6d6263284dc1db084ae8d1b8a3ef068f95b6618ac5ca
-  data.tar.gz: 2e6d665da1c25459436c770edb202a63c9862c27c7353f893410d1e2c7adc880211d206a8a1cc9ceb829671e6d282ea1b0577f7f9fdeb6d6a5658ee82a8f0c97
+  metadata.gz: 11491457c0ef576aa92f23437c01497654da88241fea5235aa8722c4819f7d9e98900f00456da2e6c2022a298ff97e55a473a9684067c51352870a1aa98dc4c0
+  data.tar.gz: 8b0e157de9dd3aa419656af2b8e723534f891fd2e917a5e26e23ea877e6029ab54a2a989dfd57b015f450ee7131aae5d6c9dca119f4296b3ddbef50aab727753

data/.travis.yml

@@ -3,4 +3,7 @@ language: ruby
 rvm:
   - 2.2.5
 cache: bundler
+script:
+  - bundle exec rake
+  - bundle exec codeclimate-test-reporter
 bundler_args: --jobs=3 --retry=3

data/lib/easemob/fileoperation.rb

@@ -1,13 +1,14 @@
 module Easemob
+  autoload(:FileoperationMessage, File.expand_path('message/fileoperation_message', __dir__))
   module Fileoperation
     def upload_chatfile(file_path, restrict_access: true)
-      request :upload, 'chatfiles', form: { file: HTTP::FormData::File.new(file_path),
+      FileoperationMessage.new request :upload, 'chatfiles', form: { file: HTTP::FormData::File.new(file_path),
                                             hack: 'X' }, # Existing here for http-form_data 1.0.1 handle single param improperly, see https://github.com/httprb/form_data.rb/issues/4
-                                    restrict_access: restrict_access
+                                       restrict_access: restrict_access
     end
 
     def download_chatfile(chatfile_uuid, share_secret: nil, thumbnail: false)
-      request :download, "chatfiles/#{chatfile_uuid}", share_secret: share_secret, thumbnail: thumbnail
+      FileoperationMessage.new request :download, "chatfiles/#{chatfile_uuid}", share_secret: share_secret, thumbnail: thumbnail
     end
   end
 end

data/lib/easemob/groups.rb

@@ -1,35 +1,36 @@
 module Easemob
+  autoload(:GroupMessage, File.expand_path('message/group_message', __dir__))
   module Groups
     def create_group(groupname, description, owner, members: nil, is_public: true, maxusers: 200, is_approval: false)
       jd = { groupname: groupname, desc: description, public: is_public, owner: owner, users: maxusers, approval: is_approval }
       jd[:members] = members unless members.nil?
-      request :post, 'chatgroups', json: jd
+      GroupMessage.new request :post, 'chatgroups', json: jd
     end
 
     def get_groups(group_ids)
-      request :get, "chatgroups/#{[*group_ids].join(',')}"
+      GroupMessage.new request :get, "chatgroups/#{[*group_ids].join(',')}"
     end
 
     def query_groups(limit = 50, cursor: nil)
       params = { limit: limit }
       params[:cursor] = cursor unless cursor.nil?
-      request :get, 'chatgroups', params: params
+      GroupMessage.new request :get, 'chatgroups', params: params
     end
 
     def query_group_users(group_id)
-      request :get, "chatgroups/#{group_id}/users"
+      GroupMessage.new request :get, "chatgroups/#{group_id}/users"
     end
 
     def query_group_blocks(group_id)
-      request :get, "chatgroups/#{group_id}/blocks/users"
+      GroupMessage.new request :get, "chatgroups/#{group_id}/blocks/users"
     end
 
     def user_joined_chatgroups(username)
-      request :get, "users/#{username}/joined_chatgroups"
+      GroupMessage.new request :get, "users/#{username}/joined_chatgroups"
     end
 
     def delete_group(group_id)
-      request :delete, "chatgroups/#{group_id}"
+      GroupMessage.new request :delete, "chatgroups/#{group_id}"
     end
 
     def modify_group(group_id, groupname: nil, description: nil, maxusers: nil)
@@ -37,35 +38,35 @@ module Easemob
       jd[:groupname] = groupname unless groupname.nil?
       jd[:description] = description unless description.nil?
       jd[:maxusers] = maxusers unless maxusers.nil?
-      request :put, "chatgroups/#{group_id}", json: jd
+      GroupMessage.new request :put, "chatgroups/#{group_id}", json: jd
     end
 
     def user_join_group(group_id, username:)
-      request :post, "chatgroups/#{group_id}/users/#{username}"
+      GroupMessage.new request :post, "chatgroups/#{group_id}/users/#{username}"
     end
 
     def user_leave_group(group_id, username:)
-      request :delete, "chatgroups/#{group_id}/users/#{username}"
+      GroupMessage.new request :delete, "chatgroups/#{group_id}/users/#{username}"
     end
 
     def group_add_users(group_id, usernames:)
-      request :post, "chatgroups/#{group_id}/users", json: { usernames: [*usernames] }
+      GroupMessage.new request :post, "chatgroups/#{group_id}/users", json: { usernames: [*usernames] }
     end
 
     def group_remove_users(group_id, usernames:)
-      request :delete, "chatgroups/#{group_id}/users/#{[*usernames].join(',')}"
+      GroupMessage.new request :delete, "chatgroups/#{group_id}/users/#{[*usernames].join(',')}"
     end
 
     def group_set_owner(group_id, newowner:)
-      request :put, "chatgroups/#{group_id}", json: { newowner: newowner }
+      GroupMessage.new request :put, "chatgroups/#{group_id}", json: { newowner: newowner }
     end
 
     def add_to_group_block(group_id, to_block_usernames:)
-      request :post, "chatgroups/#{group_id}/blocks/users", json: { usernames: [*to_block_usernames] }
+      GroupMessage.new request :post, "chatgroups/#{group_id}/blocks/users", json: { usernames: [*to_block_usernames] }
     end
 
     def remove_from_group_block(group_id, blocked_usernames:)
-      request :delete, "chatgroups/#{group_id}/blocks/users/#{[*blocked_usernames].join(',')}"
+      GroupMessage.new request :delete, "chatgroups/#{group_id}/blocks/users/#{[*blocked_usernames].join(',')}"
     end
   end
 end

data/lib/easemob/message/base_message.rb

@@ -0,0 +1,51 @@
+module Easemob
+  class BaseMessage
+    attr_reader :raw_http_response, :code, :body, :body_hash
+    attr_reader :action
+    attr_reader :application
+    attr_reader :params
+    attr_reader :uri
+    attr_reader :entities
+    attr_reader :data
+    attr_reader :timestamp
+    attr_reader :duration
+    attr_reader :organization
+    attr_reader :applicationName
+    attr_reader :cursor
+    attr_reader :count
+
+    def initialize(http_response)
+      @raw_http_response = http_response
+      @code = http_response.code
+      @body = http_response.body
+
+      return if http_response.code != 200 \
+                || http_response.headers['Content-Type'].index('application/octet-stream')
+
+      @body_hash = JSON.parse(http_response.body.to_s)
+      @action = @body_hash['action']
+      @application = @body_hash['application']
+      @params = @body_hash['params']
+      @uri = @body_hash['uri']
+      @entities = @body_hash['entities']
+      @data = @body_hash['data']
+      @timestamp = @body_hash['timestamp']
+      @duration = @body_hash['duration']
+      @organization = @body_hash['organization']
+      @applicationName = @body_hash['applicationName']
+      @cursor = @body_hash['cursor']
+      @count = @body_hash['count']
+    end
+
+    def to_s
+      @body.to_s
+    end
+
+    def inspect
+      "#{self.class.name}(code: #{@code}, body: #{@body}, action: #{@action},
+       application: #{@application}, params: #{@params}, uri: #{@uri}, entities: #{@entities},
+       data: #{@data}, timestamp: #{@timestamp}, duration: #{@duration}, organization: #{@organization},
+       applicationName: #{@applicationName}, cursor: #{@cursor}, count: #{@count})"
+    end
+  end
+end

data/lib/easemob/message/chat_message.rb

@@ -0,0 +1,13 @@
+require_relative 'base_message'
+
+module Easemob
+  class ChatMessage < Easemob::BaseMessage
+
+    def all_success?
+      flag = true
+      @data.values.each{ |ar| flag = false if ar != 'success' }
+
+      flag
+    end
+  end
+end

data/lib/easemob/message/fileoperation_message.rb

@@ -0,0 +1,6 @@
+require_relative 'base_message'
+
+module Easemob
+  class FileoperationMessage < Easemob::BaseMessage
+  end
+end

data/lib/easemob/message/group_message.rb

@@ -0,0 +1,6 @@
+require_relative 'base_message'
+
+module Easemob
+  class GroupMessage < Easemob::BaseMessage
+  end
+end

data/lib/easemob/message/user_message.rb

@@ -0,0 +1,6 @@
+require_relative 'base_message'
+
+module Easemob
+  class UserMessage < Easemob::BaseMessage
+  end
+end

data/lib/easemob/messages.rb

@@ -1,4 +1,5 @@
 module Easemob
+  autoload(:ChatMessage, File.expand_path('message/chat_message', __dir__))
   module Messages
     def message_to(target, target_type: :users, text:,
                    from: nil, ext: nil)
@@ -6,7 +7,7 @@ module Easemob
              msg: { type: :txt, txt: text } }
       jd[:from] = from unless from.nil?
       jd[:ext] = ext unless ext.nil?
-      request :post, 'messages', json: jd
+      ChatMessage.new request :post, 'messages', json: jd
     end
 
     def image_to(target, target_type: :users, url:, filename:,
@@ -17,7 +18,7 @@ module Easemob
       jd[:from] = from unless from.nil?
       jd[:size] = image_size unless image_size.nil?
       jd[:ext] = ext unless ext.nil?
-      request :post, 'messages', json: jd
+      ChatMessage.new request :post, 'messages', json: jd
     end
 
     def audio_to(target, target_type: :users, url:, filename:, length:,
@@ -27,7 +28,7 @@ module Easemob
       jd[:msg][:secret] = secret unless secret.nil?
       jd[:from] = from unless from.nil?
       jd[:ext] = ext unless ext.nil?
-      request :post, 'messages', json: jd
+      ChatMessage.new request :post, 'messages', json: jd
     end
 
     def video_to(target, target_type: :users, url:, filename:, length:, file_length:, thumb:,
@@ -39,7 +40,7 @@ module Easemob
       jd[:msg][:thumb_secret] = thumb_secret unless thumb_secret.nil?
       jd[:from] = from unless from.nil?
       jd[:ext] = ext unless ext.nil?
-      request :post, 'messages', json: jd
+      ChatMessage.new request :post, 'messages', json: jd
     end
 
     def command_to(target, target_type: :users, action:,
@@ -48,7 +49,7 @@ module Easemob
              msg: { type: :cmd, action: action } }
       jd[:from] = from unless from.nil?
       jd[:ext] = ext unless ext.nil?
-      request :post, 'messages', json: jd
+      ChatMessage.new request :post, 'messages', json: jd
     end
   end
 end

data/lib/easemob/token.rb

@@ -5,7 +5,7 @@ module Easemob
         http.post "#{Easemob.head_url}/token", json: { grant_type: 'client_credentials', client_id: Easemob.client_id, client_secret: Easemob.client_secret }
       end
       raise "Failed to refresh easemob token: #{res}" unless res.code == 200
-      write_to_store(JSON.parse(res.to_s))
+      write_to_store(JSON.parse(res.body.to_s))
       read_from_store
     end
 

data/lib/easemob/users.rb

@@ -1,89 +1,90 @@
 module Easemob
+  autoload(:UserMessage, File.expand_path('message/user_message', __dir__))
   module Users
     def create_user(username, password, nickname: nil)
       valid_username!(username)
       jd = { username: username, password: password }
       jd[:nickname] = nickname unless nickname.nil?
-      request :post, 'users', json: jd
+      UserMessage.new request :post, 'users', json: jd
     end
 
     def create_users(users)
       users.map { |user| valid_username!(user['username'] || user[:username]) }
-      request :post, 'users', json: users
+      UserMessage.new request :post, 'users', json: users
     end
 
     def get_user(username)
-      request :get, "users/#{username}"
+      UserMessage.new request :get, "users/#{username}"
     end
 
     def query_users(limit = 50, cursor: nil)
       params = { limit: limit }
       params[:cursor] = cursor unless cursor.nil?
-      request :get, 'users', params: params
+      UserMessage.new request :get, 'users', params: params
     end
 
     def delete_user(username)
-      request :delete, "users/#{username}"
+      UserMessage.new request :delete, "users/#{username}"
     end
 
     def delete_users!(number = 100)
-      request :delete, 'users', params: { limit: number }
+      UserMessage.new request :delete, 'users', params: { limit: number }
     end
 
     def reset_user_password(username, newpassword:)
-      request :put, "users/#{username}/password", json: { newpassword: newpassword }
+      UserMessage.new request :put, "users/#{username}/password", json: { newpassword: newpassword }
     end
 
     def set_user_nickname(username, nickname:)
-      request :put, "users/#{username}", json: { nickname: nickname }
+      UserMessage.new request :put, "users/#{username}", json: { nickname: nickname }
     end
 
     def add_user_friend(owner_username, friend_username:)
-      request :post, "users/#{owner_username}/contacts/users/#{friend_username}"
+      UserMessage.new request :post, "users/#{owner_username}/contacts/users/#{friend_username}"
     end
 
     def remove_user_friend(owner_username, friend_username:)
-      request :delete, "users/#{owner_username}/contacts/users/#{friend_username}"
+      UserMessage.new request :delete, "users/#{owner_username}/contacts/users/#{friend_username}"
     end
 
     def query_user_friends(owner_username)
-      request :get, "users/#{owner_username}/contacts/users"
+      UserMessage.new request :get, "users/#{owner_username}/contacts/users"
     end
 
     def add_to_user_block(owner_username, to_block_usernames:)
-      request :post, "users/#{owner_username}/blocks/users", json: { usernames: [*to_block_usernames] }
+      UserMessage.new request :post, "users/#{owner_username}/blocks/users", json: { usernames: [*to_block_usernames] }
     end
 
     def remove_from_user_block(owner_username, blocked_username:)
-      request :delete, "users/#{owner_username}/blocks/users/#{blocked_username}"
+      UserMessage.new request :delete, "users/#{owner_username}/blocks/users/#{blocked_username}"
     end
 
     def query_user_blocks(owner_username)
-      request :get, "users/#{owner_username}/blocks/users"
+      UserMessage.new request :get, "users/#{owner_username}/blocks/users"
     end
 
     def get_user_status(username)
-      request :get, "users/#{username}/status"
+      UserMessage.new request :get, "users/#{username}/status"
     end
 
     def get_user_offline_msg_count(owner_username)
-      request :get, "users/#{owner_username}/offline_msg_count"
+      UserMessage.new request :get, "users/#{owner_username}/offline_msg_count"
     end
 
     def get_user_offline_msg_status(username, msg_id)
-      request :get, "users/#{username}/offline_msg_status/#{msg_id}"
+      UserMessage.new request :get, "users/#{username}/offline_msg_status/#{msg_id}"
     end
 
     def deactivate_user(username)
-      request :post, "users/#{username}/deactivate"
+      UserMessage.new request :post, "users/#{username}/deactivate"
     end
 
     def activate_user(username)
-      request :post, "users/#{username}/activate"
+      UserMessage.new request :post, "users/#{username}/activate"
     end
 
     def disconnect_user(username)
-      request :get, "users/#{username}/disconnect"
+      UserMessage.new request :get, "users/#{username}/disconnect"
     end
 
     private

data/lib/easemob/version.rb

@@ -1,3 +1,3 @@
 module Easemob
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easemob
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Eric Guo
@@ -30,7 +30,7 @@ cert_chain:
   R5k6Ma92sW8jupX4cqbSu9rntdVQkNRpoHIrfU0MZT0cKsg/D1zMteylxrO3KMsz
   SPQRv+nrI1J0zevFqb8010heoR8SDyUA0Mm3+Q==
   -----END CERTIFICATE-----
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -133,6 +133,11 @@ files:
 - lib/easemob/chatrooms.rb
 - lib/easemob/fileoperation.rb
 - lib/easemob/groups.rb
+- lib/easemob/message/base_message.rb
+- lib/easemob/message/chat_message.rb
+- lib/easemob/message/fileoperation_message.rb
+- lib/easemob/message/group_message.rb
+- lib/easemob/message/user_message.rb
 - lib/easemob/messages.rb
 - lib/easemob/token.rb
 - lib/easemob/users.rb
@@ -157,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: An unofficial Easemob IM(instant message) service integration gem

metadata.gz.sig

@@ -1,3 +1,3 @@
-�V�Ag*'��>���9f$���(�k\Ugj
-�	�GPUKM@���Y<�LZ�bχ�r"�j;���i9!]�N��F�*rɦ,���u����X	/�X(\ ��0�Wt��#[B��+���*;^�>_ހ����9��_�dt�h���ʯC󨂻`48<���
-�PLd�-^���B�����#��JE�
}Qjƭ/ſo^�z2&
+aL'��q.���'�ŝK��m*0�ħ��'P�H�'�T�7�whˀݗ��a�a������h|h���q9�Ơi3��j�#�<�QGԩL[��5��A8�[�u
+��T_�a=ls���4
+�#�eۇ��5�ʝyw�\��F��F�bkW?>z!��D��A�	�a�mэN���	-oa����c,�e�T16��OV�g�}y�E��Z�0�;0��������to†T���sb�ީ$�~�ޕfWW�����