rocketchat 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd58bd7162f1bf9a4b5d6c5a7cf889c670fc3307
-  data.tar.gz: 39d2f4288d3d42642ec58003e377734c2a5989b9
+  metadata.gz: 846bb0b7c4040d10264d89534bfd3d11b173a575
+  data.tar.gz: afa6fcb282d0c3f0af6720fff6a92b5fe1b4b043
 SHA512:
-  metadata.gz: 25017410a5502a557e9a59887298bf9824b8d6173ab2852ec3c4da05abea15143fc49eff19382abc0f3706c9a6f175474d0c8065d9cc91a827ef3dc63eaf6fba
-  data.tar.gz: af8b16ad88a70dbb2ec700a63bbdf206307eb5c4637fb4f6abb2c3d2f15e77aaa79422f32cc9cf6a650afcb0f3034234f90f9213456a91dcc2c38a9c661f02ba
+  metadata.gz: 7d295d4ff6a5712cb9c547a58c968c40c8d02e57dc28fdc970a84b8960f264a991c1982346ad41b67251e990bed5127f3592fabce8b12c08f9e13e5f49c14428
+  data.tar.gz: 35da2385925f779f50f01c248587ec36bff6d19be6edd7b4b52ee9933538003796732ac89c75fa07bf22208415f3340075fc4231f6a9861a95d489d537070cf7

data/.gitignore

@@ -1,2 +1,4 @@
 Gemfile.lock
 *.gem
+.bundle
+vendor/bundle

data/.rubocop.yml

@@ -7,3 +7,5 @@ Metrics/LineLength:
 
 Metrics/MethodLength:
   Max: 15
+  Exclude:
+    - "**/*_spec.rb"

data/.travis.yml

@@ -8,3 +8,11 @@ rvm:
 
 before_install:
   - gem update bundler
+
+install:
+  - bundle install --jobs=3 --retry=3
+  - gem install rubocop
+
+script:
+  - rubocop
+  - bundle exec rake

data/README.md

@@ -25,7 +25,7 @@ And then execute:
 
 ## Supported API calls
 
-This gem supports the following Rocket.Chat APIs (Tested against Rocket.Chat v0.5.4)
+This gem supports the following Rocket.Chat APIs (Tested against Rocket.Chat v0.54)
 
 #### Miscellaneous information
 * /api/v1/info
@@ -37,6 +37,9 @@ This gem supports the following Rocket.Chat APIs (Tested against Rocket.Chat v0.
 
 ### Users
 * /api/v1/users.create
+* /api/v1/users.delete
+* /api/v1/users.info
+* /api/v1/users.setAvatar
 * /api/v1/users.update
 
 
@@ -100,6 +103,34 @@ Optional parameters for update are:
 :username, :email, :password, :name, :active, :roles, :join_default_channels, :require_password_change, :send_welcome_email, :verified, :custom_fields
 
 
+To get user info:
+
+```ruby
+require 'rocketchat'
+
+rocket_server = RocketChat::Server.new('http://your.server.address/')
+session = rocket_server.login('username', 'password')
+session.users.info(username: 'some_username')
+```
+
+Either user_id (RocketChat's ID) or username can be used.
+
+Deleting a user can be done with the same options.
+
+
+To set a user's avatar:
+
+```ruby
+require 'rocketchat'
+
+rocket_server = RocketChat::Server.new('http://your.server.address/')
+session = rocket_server.login('username', 'password')
+session.users.set_avatar('http://image_url')
+```
+
+There is an optional parameter user_id, that works if the setting user is allowed to set other's avatar.
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/abrom/rocketchat-ruby.

data/lib/rocket_chat/gem_version.rb

@@ -1,3 +1,3 @@
 module RocketChat
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/lib/rocket_chat/messages/user.rb

@@ -54,6 +54,56 @@ module RocketChat
         RocketChat::User.new response['user']
       end
 
+      #
+      # users.delete REST API
+      # @param [String] user_id Rocket.Chat user id
+      # @param [String] username Username
+      # @return [Boolean]
+      # @raise [HTTPError, StatusError]
+      #
+      def delete(user_id: nil, username: nil)
+        session.request_json(
+          '/api/v1/users.delete',
+          method: :post,
+          body: user_id ? { userId: user_id } : { username: username },
+          upstreamed_errors: ['error-invalid-user']
+        )['success']
+      end
+
+      #
+      # users.info REST API
+      # @param [String] user_id Rocket.Chat user id
+      # @param [String] username Username
+      # @return [User]
+      # @raise [HTTPError, StatusError]
+      #
+      def info(user_id: nil, username: nil)
+        response = session.request_json(
+          '/api/v1/users.info',
+          body: user_id ? { userId: user_id } : { username: username },
+          upstreamed_errors: ['error-invalid-user']
+        )
+
+        RocketChat::User.new response['user'] if response['success']
+      end
+
+      #
+      # users.setAvatar REST API
+      # @param [String] avatar_url URL to use for avatar
+      # @param [String] user_id user to update (optional)
+      # @return [Boolean]
+      # @raise [HTTPError, StatusError]
+      #
+      def set_avatar(avatar_url, user_id: nil)
+        body = { avatarUrl: avatar_url }
+        body[:userId] = user_id if user_id
+        session.request_json(
+          '/api/v1/users.setAvatar',
+          method: :post,
+          body: body
+        )['success']
+      end
+
       private
 
       attr_reader :session
@@ -61,7 +111,7 @@ module RocketChat
       def user_option_hash(options, include_personal_fields = false)
         args = [options, :active, :roles, :join_default_channels, :require_password_change,
                 :send_welcome_email, :verified, :custom_fields]
-        args += [:username, :email, :name, :password] if include_personal_fields
+        args += %i[username email name password] if include_personal_fields
 
         options = Util.slice_hash(*args)
         return {} if options.empty?

data/lib/rocket_chat/request_helper.rb

@@ -22,18 +22,13 @@ module RocketChat
 
     def request_json(path, options = {})
       fail_unless_ok = options.delete :fail_unless_ok
+      upstreamed_errors = Array(options.delete(:upstreamed_errors))
 
       response = request path, options
-      if fail_unless_ok && !response.is_a?(Net::HTTPOK)
-        raise RocketChat::HTTPError, "Invalid http response code: #{response.code}"
-      end
+      check_response response, fail_unless_ok
 
       response_json = JSON.parse(response.body)
-      if response_json.has_key? 'success'
-        raise RocketChat::StatusError, response_json['error'] unless response_json['success']
-      else
-        raise RocketChat::StatusError, response_json['message'] unless response_json['status'] == 'success'
-      end
+      check_response_json response_json, upstreamed_errors
 
       response_json
     end
@@ -50,6 +45,21 @@ module RocketChat
 
     private
 
+    def check_response(response, fail_unless_ok)
+      return unless fail_unless_ok && !response.is_a?(Net::HTTPOK)
+      raise RocketChat::HTTPError, "Invalid http response code: #{response.code}"
+    end
+
+    def check_response_json(response_json, upstreamed_errors)
+      if response_json.key? 'success'
+        unless response_json['success'] || upstreamed_errors.include?(response_json['errorType'])
+          raise RocketChat::StatusError, response_json['error']
+        end
+      elsif response_json['status'] != 'success'
+        raise RocketChat::StatusError, response_json['message']
+      end
+    end
+
     def get_headers(options)
       headers = options[:headers]
 
@@ -80,11 +90,16 @@ module RocketChat
 
     def create_request(path, options)
       headers = get_headers(options)
-
-      req = Net::HTTP.const_get(options[:method].to_s.capitalize).new(path, headers)
-
       body = options[:body]
-      add_body(req, body) unless body.nil?
+
+      if options[:method] == :post
+        req = Net::HTTP::Post.new(path, headers)
+        add_body(req, body) if body
+      else
+        uri = path
+        uri += '?' + URI.encode_www_form(body) if body
+        req = Net::HTTP::Get.new(uri, headers)
+      end
 
       req
     end
@@ -94,15 +109,7 @@ module RocketChat
         request.body = body.to_json
         request.content_type = 'application/json'
       else
-        request.body = url_encode(body)
-      end
-    end
-
-    def url_encode(body)
-      if body.is_a?(Hash)
-        URI.encode_www_form body
-      else
-        body.to_s
+        request.body = body.to_s
       end
     end
   end

data/lib/rocket_chat/util.rb

@@ -38,7 +38,7 @@ module RocketChat
     # @return a camelized string
     #
     def camelize(string)
-      string.to_s.gsub(/_([a-z])/) { $1.upcase }
+      string.to_s.gsub(/_([a-z])/) { Regexp.last_match(1).upcase }
     end
     module_function :camelize
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketchat
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - int512
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler