rocketchat 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b66e81f40f37674d888d4ecc579c419302e85003
-  data.tar.gz: '018fe90ff20e767ada7b4e55f6cec4089c2b1afe'
+  metadata.gz: 92064005eb022f8630c18a093696fc5058cde945
+  data.tar.gz: 8106bebe9e04e28e06889d283876e0e00194c651
 SHA512:
-  metadata.gz: 42d0210e35daa4efb6b48a2665158de8089c02d38be580a2313672e33c7e40d132522fd025c8b217997540da32c11c50e8c39411b312bbb6dcc4926ee649e944
-  data.tar.gz: 8a942dfa094139fb1b4e597fbc0aa5e4ef4c5a881b4fbe43d2f5327806d9b67516485ab1133994b9b8c9222ffe3ee88cc04d656cbdafb463441ba41941a76a12
+  metadata.gz: a2de3192406d8a89a6b7c0cf808be8af72ba7e5a27013f3e4850987bd3858649926beb4dfe037a45ec59d0990d7a757480cfe432a469dec3c27a0a2476d6400c
+  data.tar.gz: dcf80cf8c56457594c613a249affdddcf29f3a77459b548db3cae7c13d549eabde4d59c487e13d901dd3280690a95c9e065e029137f89c2131cc9aa9ffd9f463

data/lib/rocket_chat/error.rb

@@ -2,5 +2,6 @@ module RocketChat
   class Error < StandardError; end
   class HTTPError < Error; end
   class InvalidMethodError < HTTPError; end
+  class JsonParseError < Error; end
   class StatusError < Error; end
 end

data/lib/rocket_chat/gem_version.rb

@@ -1,3 +1,3 @@
 module RocketChat
-  VERSION = '0.1.10'.freeze
+  VERSION = '0.1.11'.freeze
 end

data/lib/rocket_chat/messages/group.rb

@@ -13,15 +13,12 @@ module RocketChat
       # @return [Boolean]
       # @raise [HTTPError, StatusError]
       #
-      def add_leader(room_id: nil, user_id: nil)
+      def add_leader(room_id: nil, name: nil, user_id: nil, username: nil)
         session.request_json(
           self.class.api_path('addLeader'),
           method: :post,
-          body: {
-            roomId: room_id,
-            userId: user_id
-          },
-          upstreamed_errors: ['error-room-not-found']
+          body: room_params(room_id, name)
+            .merge(user_params(user_id, username))
         )['success']
       end
 
@@ -32,15 +29,12 @@ module RocketChat
       # @return [Boolean]
       # @raise [HTTPError, StatusError]
       #
-      def remove_leader(room_id: nil, user_id: nil)
+      def remove_leader(room_id: nil, name: nil, user_id: nil, username: nil)
         session.request_json(
           self.class.api_path('removeLeader'),
           method: :post,
-          body: {
-            roomId: room_id,
-            userId: user_id
-          },
-          upstreamed_errors: ['error-room-not-found']
+          body: room_params(room_id, name)
+            .merge(user_params(user_id, username))
         )['success']
       end
 

data/lib/rocket_chat/messages/room.rb

@@ -67,15 +67,12 @@ module RocketChat
       # @return [Boolean]
       # @raise [HTTPError, StatusError]
       #
-      def add_owner(room_id: nil, user_id: nil)
+      def add_owner(room_id: nil, name: nil, user_id: nil, username: nil)
         session.request_json(
           self.class.api_path('addOwner'),
           method: :post,
-          body: {
-            roomId: room_id,
-            userId: user_id
-          },
-          upstreamed_errors: ['error-room-not-found']
+          body: room_params(room_id, name)
+            .merge(user_params(user_id, username))
         )['success']
       end
 
@@ -86,15 +83,44 @@ module RocketChat
       # @return [Boolean]
       # @raise [HTTPError, StatusError]
       #
-      def remove_owner(room_id: nil, user_id: nil)
+      def remove_owner(room_id: nil, name: nil, user_id: nil, username: nil)
         session.request_json(
           self.class.api_path('removeOwner'),
           method: :post,
-          body: {
-            roomId: room_id,
-            userId: user_id
-          },
-          upstreamed_errors: ['error-room-not-found']
+          body: room_params(room_id, name)
+            .merge(user_params(user_id, username))
+        )['success']
+      end
+
+      #
+      # *.add_moderator REST API
+      # @param [String] room_id Rocket.Chat room id
+      # @param [String] user_id Rocket.Chat user id
+      # @return [Boolean]
+      # @raise [HTTPError, StatusError]
+      #
+      def add_moderator(room_id: nil, name: nil, user_id: nil, username: nil)
+        session.request_json(
+          self.class.api_path('addModerator'),
+          method: :post,
+          body: room_params(room_id, name)
+            .merge(user_params(user_id, username))
+        )['success']
+      end
+
+      #
+      # *.remove_moderator REST API
+      # @param [String] room_id Rocket.Chat room id
+      # @param [String] user_id Rocket.Chat user id
+      # @return [Boolean]
+      # @raise [HTTPError, StatusError]
+      #
+      def remove_moderator(room_id: nil, name: nil, user_id: nil, username: nil)
+        session.request_json(
+          self.class.api_path('removeModerator'),
+          method: :post,
+          body: room_params(room_id, name)
+            .merge(user_params(user_id, username))
         )['success']
       end
 

data/lib/rocket_chat/request_helper.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'openssl'
+require 'net/http'
 
 module RocketChat
   #
@@ -28,7 +29,7 @@ module RocketChat
       response = request path, options
       check_response response, fail_unless_ok
 
-      response_json = JSON.parse(response.body)
+      response_json = parse_response(response.body)
       options[:debug].puts("Response: #{response_json.inspect}") if options[:debug]
       check_response_json response_json, upstreamed_errors
 
@@ -47,8 +48,14 @@ module RocketChat
 
     private
 
+    def parse_response(response)
+      JSON.parse(response)
+    rescue JSON::ParserError
+      raise RocketChat::JsonParseError, "RocketChat response parse error: #{response}"
+    end
+
     def check_response(response, fail_unless_ok)
-      return unless fail_unless_ok && !response.is_a?(Net::HTTPOK)
+      return if response.is_a?(Net::HTTPOK) || !(fail_unless_ok || response.is_a?(Net::HTTPServerError))
       raise RocketChat::HTTPError, "Invalid http response code: #{response.code}"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketchat
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - int512
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-30 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler