huanxin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6830d7a4854d536f51f7688f1fbfb97f2a18211d
-  data.tar.gz: 0e05fc2065187813660ea05a40c309f80c7c5591
+  metadata.gz: a0d15740b0f4352db78aaefa49071b7713437e00
+  data.tar.gz: 42da239e90dbabecce0cc885eeb04bc18e9d712d
 SHA512:
-  metadata.gz: 0dcae61318d872ccd0ddbb9ddde8834a26490ced86520f137e66e7f99463290fb4e01fee5f203e41697125d8ea4d65af674ca918d779dad21d010ed6f6651fc0
-  data.tar.gz: 32b6ce92226c53815e5635e6bd12c44278467d13afe575845a0935d7d66c987cde1e225c19d4cf5cf4b4943703d43a9599f8051acdcebb83d3a60cb4265b7af2
+  metadata.gz: 1298745ba980bef97f88a09976d7ee007445a74a8da97171db0bcff9c098f3e25fab99e4c8f479c7796039c7adbf26fba6e5aea8e846427eac36fd07e6140692
+  data.tar.gz: 3b2dcb6add58ef78df9327a837ca0adc429e4ad3a6be4db994252a77d1a88985fb10957ac3996f916b5defaa02859be080c3d6c6c854ed32811331f8d2189cb0

data/Gemfile.lock

@@ -6,40 +6,45 @@ PATH
 GEM
   remote: http://ruby.taobao.org/
   specs:
-    activesupport (4.2.3)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     diff-lcs (1.2.5)
     httparty (0.13.5)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.7.0)
+    minitest (4.7.5)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     rake (10.4.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    tzinfo (0.3.44)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
+  activesupport (~> 4.0.1)
   bundler (~> 1.8)
   httparty (~> 0.13.3)
   huanxin!
   rake (~> 10.0)
-  rspec (~> 2.6)
+  rspec (~> 3.0)

data/huanxin.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 2.6" 
+  spec.add_development_dependency "rspec", "~> 3.0" 
   spec.add_development_dependency "httparty", "~> 0.13.3"
-  spec.add_development_dependency "activesupport"
+  spec.add_development_dependency "activesupport" ,"~> 4.0.1"
 end

data/lib/huanxin.rb

@@ -1,6 +1,8 @@
 require "huanxin/version"
 require "huanxin/base"
 require "huanxin/client"
+#require "huanxin/user_messsage"
+#require "huanxin/user_group"
 
 module Huanxin
   # Your code goes here...

data/lib/huanxin/base.rb

@@ -11,7 +11,9 @@ module Huanxin
   end 
 
   class Base  
-    RAND_WORDS  = [('a'..'z'), ('A'..'Z'), (0..9), ['_']].map { |i| i.to_a }.flatten
+    RAND_WORDS  = [('a'..'z'), (0..9), ['_','-']].map { |i| i.to_a }.flatten
+    #RAND_WORDS  = [('a'..'z'), ('A'..'Z'), (0..9), ['_']].map { |i| i.to_a }.flatten
+    #由于环信聊天接口会强制转换用户名成小写，所以最好不要包括大写字符，已经和他们沟通，他们不会修改.
     #cache_client 所有实现了 ActiveSupport::Cache::Store 的对象实例
     #如果是在rails里面使用，可以直接传递 Rails.cache 
     #
@@ -21,8 +23,8 @@ module Huanxin
       @client_id       = Huanxin.config[:client_id]
       @client_secret   = Huanxin.config[:client_secret]
       @base_url        = Huanxin.config[:host]         || 'https://a1.easemob.com'
-      @username_len    = Huanxin.config[:username_len] || 8
-      @password_len    = Huanxin.config[:password_len] || 10
+      @username_len    = Huanxin.config[:username_len] || 10
+      @password_len    = Huanxin.config[:password_len] || 12
 
       @org_name        = org_name
       @app_name        = app_name

data/lib/huanxin/chat_room.rb

@@ -0,0 +1,64 @@
+module Huanxin 
+
+  module ChatRoom 
+    #创建一个聊天室
+    def create_chat_room(name, desc, owner, maxusers = 200, members = nil) 
+      token =    self.auth_token()
+      body  =    {name: name, description: desc, owner: owner, maxusers: maxusers}
+      body.merge!({members: members}) unless members.nil?
+
+      result = HTTParty.post("#{@head_url}/chatrooms", 
+          :body => body.to_json,
+          :headers => { 'Content-Type' => 'application/json', 'Authorization'=>"Bearer #{token}" } )
+
+      if result.response.code.to_i == 200
+        return result["data"]["id"] 
+      else
+        nil
+      end 
+    end 
+    #修改聊天室
+    def modify_chat_room(room_id, name, desc, maxusers) 
+      token =    self.auth_token()
+      body  =    {name: name, description: desc,  maxusers: maxusers}
+
+      result = HTTParty.put("#{@head_url}/chatrooms/#{room_id}", 
+          :body => body.to_json,
+          :headers => { 'Content-Type' => 'application/json', 'Authorization'=>"Bearer #{token}" } )
+
+      if result.response.code.to_i == 200
+        return result["data"] 
+      else
+        nil
+      end 
+    end
+    #获取聊天室基本信息 
+    def get_chat_room_info(room_id) 
+      token =    self.auth_token()
+
+      result = HTTParty.get("#{@head_url}/chatrooms/#{room_id}", 
+          :headers => { 'Content-Type' => 'application/json', 'Authorization'=>"Bearer #{token}" } )
+
+      if result.response.code.to_i == 200
+        return result["data"] 
+      else
+        nil
+      end 
+    end 
+    #删除一个聊天室 
+    #
+    def delete_chat_room(room_id)
+      token =    self.auth_token()
+
+      result = HTTParty.delete("#{@head_url}/chatrooms/#{room_id}", 
+          :headers => { 'Content-Type' => 'application/json', 'Authorization'=>"Bearer #{token}" } )
+
+      if result.response.code.to_i == 200
+        return [result["data"]["id"], result["data"]["success"]]
+      else
+        nil
+      end 
+    end
+  end 
+
+end

data/lib/huanxin/client.rb

@@ -1,12 +1,18 @@
 require 'httparty'
+require 'huanxin/group' 
+require 'huanxin/chat_room' 
 
 module Huanxin 
 
   class Client < Huanxin::Base
 
+    include Huanxin::Group     
+    include Huanxin::ChatRoom  
+
     def initialize(cache_client, org_name, app_name)
       super(cache_client, org_name, app_name)
-    end
+    end 
+
     #注册用户到环信
     def register(user_id, nickname = nil)
       self.register_by_name_pwd(self.generate_username(user_id), self.generate_password(), nickname)

data/lib/huanxin/group.rb

@@ -0,0 +1,67 @@
+module Huanxin 
+  module Group 
+
+    #创建一个群组
+    def create_group(name, desc, owner, is_public = true, maxusers = 200, is_approval = false, members = nil) 
+      token =    self.auth_token()
+      body  =    {groupname: name, desc: desc, public: is_public,  owner: owner, maxusers: maxusers, approval: is_approval}
+      body.merge!({members: members}) unless members.nil?
+
+      result = HTTParty.post("#{@head_url}/chatgroups", 
+          :body => body.to_json,
+          :headers => { 'Content-Type' => 'application/json', 'Authorization'=>"Bearer #{token}" } )
+
+
+      if result.response.code.to_i == 200
+        return result["data"]["groupid"] 
+      else
+        nil
+      end 
+    end 
+    #修改群组信息
+    def modify_group(group_id, name, desc, maxusers = nil) 
+      token =    self.auth_token()
+      body  =    {groupname: name, description: desc}
+      body.merge!({maxusers: maxusers}) unless maxusers.nil?
+
+      result = HTTParty.put("#{@head_url}/chatgroups/#{group_id}", 
+          :body => body.to_json,
+          :headers => { 'Content-Type' => 'application/json', 'Authorization'=>"Bearer #{token}" } )
+
+
+      if result.response.code.to_i == 200
+        return result["data"]  #maxusers, groupname, description
+      else
+        nil
+      end 
+    end
+    #获取群组基本信息 
+    def get_group_info(group_id) 
+      token =    self.auth_token()
+
+      result = HTTParty.get("#{@head_url}/chatgroups/#{group_id}", 
+          :headers => { 'Content-Type' => 'application/json', 'Authorization'=>"Bearer #{token}" } )
+
+      if result.response.code.to_i == 200
+        return result["data"][0] 
+      else
+        nil
+      end 
+    end 
+    #删除一个群组 
+    #
+    def delete_group(group_id)
+      token =    self.auth_token()
+
+      result = HTTParty.delete("#{@head_url}/chatgroups/#{group_id}", 
+          :headers => { 'Content-Type' => 'application/json', 'Authorization'=>"Bearer #{token}" } )
+
+      if result.response.code.to_i == 200
+        return [result["data"]["groupid"], result["data"]["success"]]
+      else
+        nil
+      end 
+    end
+
+  end 
+end

data/lib/huanxin/version.rb

@@ -1,3 +1,3 @@
 module Huanxin
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huanxin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Robot Jiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.1
 description: "环信 Rest API 的 Ruby Client "
 email:
 - robot.z.jiang@gmail.com
@@ -100,7 +100,9 @@ files:
 - huanxin.gemspec
 - lib/huanxin.rb
 - lib/huanxin/base.rb
+- lib/huanxin/chat_room.rb
 - lib/huanxin/client.rb
+- lib/huanxin/group.rb
 - lib/huanxin/version.rb
 homepage: https://github.com/RobotJiang/ruby-for-huanxin
 licenses: