rocketchat 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be0e052345a62ea82a06daeaa3c3ec9d109ef5f
-  data.tar.gz: c7ccbdd37e1705558d97c3f010b86755d012f97e
+  metadata.gz: a3c6a81c9b24af32e67ddee2d35a461271507a73
+  data.tar.gz: 2adb561c2bbe7474cfdf961dcc8b576bb02f549a
 SHA512:
-  metadata.gz: b3f717e2a4455ae459ccba9599074c735f1dd54dd3931135fef6e06ef40f09d50a3c50d707d3eeea58f59c868875deae7569f39ac773943d9d2c021d243bb177
-  data.tar.gz: 845f9454268a887c7d764ce655a0b89e9c5fa89f50b61e0ca569121f380f215e04585c3b7dcd25521addebff4dc9eadd91e971fdf05f581d78874f8c498272d5
+  metadata.gz: 4719b5dce2ba7c22951e6a1848eeb999f3b89ce34eb056f1265b4b21bb688172cf842774f6800b0fef7628842963c035743f8e44b84bc9087c045925d758de38
+  data.tar.gz: 066d66b376d3e6529874ea1f397319e433c5b7e1c65206d5b0326456a99834cf6bd7daeefff7fe6b96d19f72fbd83366f534ae1620e9b3417f6031ad4237ace7

data/.rubocop.yml

@@ -6,4 +6,4 @@ Metrics/LineLength:
   Max: 120
 
 Metrics/MethodLength:
-  Max: 12
+  Max: 15

data/README.md

@@ -1,13 +1,13 @@
 [![Travis Build Status](http://img.shields.io/travis/abrom/rocketchat-ruby.svg?style=flat)](https://travis-ci.org/abrom/rocketchat-ruby)
 [![Code Climate Score](http://img.shields.io/codeclimate/github/abrom/rocketchat-ruby.svg?style=flat)](https://codeclimate.com/github/abrom/rocketchat-ruby)
-[![Gem Version](http://img.shields.io/gem/v/rocketchat-ruby.svg?style=flat)](#)
+[![Gem Version](http://img.shields.io/gem/v/rocketchat.svg?style=flat)](#)
 
 # Rocket.Chat REST API for Ruby
 
 This is a gem wrapping the v1 REST API for [Rocket.Chat](https://rocket.chat/).
 
-The gem is based on a fork of int2xx9/ruby-rocketchat however that gem implemented v0.1
-of the Rocket.Chat API and it was not forward compatible. Thanks to @int2xx9 for the
+The gem is based on a fork of http://github.com/int2xx9/ruby-rocketchat however that gem implemented v0.1
+of the Rocket.Chat API and it was not forward compatible. Thanks to [@int2xx9](http://github.com/int2xx9) for the
 framework on which this gem was based 
 
 ## Installation
@@ -35,6 +35,9 @@ This gem supports the following Rocket.Chat APIs (Tested against Rocket.Chat v0.
 * /api/v1/logout
 * /api/v1/me
 
+### Users
+* /api/v1/users.create
+
 
 ## Usage
 

data/lib/rocket_chat/gem_version.rb

@@ -1,3 +1,3 @@
 module RocketChat
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

data/lib/rocket_chat/messages/user.rb

@@ -0,0 +1,78 @@
+module RocketChat
+  module Messages
+    #
+    # Rocket.Chat User messages
+    #
+    class User
+      #
+      # @param [Session] session Session
+      #
+      def initialize(session)
+        @session = session
+      end
+
+      #
+      # users.create REST API
+      # @param [String] username Username
+      # @param [String] email Email
+      # @param [String] name Name
+      # @param [String] password Password
+      # @param [Hash] options Additional options
+      # @return [User]
+      # @raise [HTTPError, StatusError]
+      #
+      def create(username, email, name, password, options = {})
+        response = session.request_json(
+          '/api/v1/users.create',
+          method: :post,
+          body: {
+            username: username,
+            email: email,
+            name: name,
+            password: password
+          }.merge(user_option_hash(options))
+        )
+        RocketChat::User.new response['user']
+      end
+
+      #
+      # users.update REST API
+      # @param [String] id Rocket.Chat user id
+      # @param [String] new_email Email
+      # @param [String] new_name Name
+      # @return [User]
+      # @raise [HTTPError, StatusError]
+      #
+      def update(id, new_email, new_name, options = {})
+        response = session.request_json(
+          '/api/v1/users.update',
+          method: :post,
+          body: {
+            userId: id,
+            data: {
+              email: new_email,
+              name: new_name
+            }.merge(user_option_hash(options))
+          }
+        )
+        RocketChat::User.new response['user']
+      end
+
+      private
+
+      attr_reader :session
+
+      def user_option_hash(options)
+        options = Util.slice_hash(
+          options, :active, :roles, :join_default_channels, :require_password_change,
+          :send_welcome_email, :verified, :custom_fields, :username, :password
+        )
+        return {} if options.empty?
+
+        new_hash = {}
+        options.each { |key, value| new_hash[Util.camelize(key)] = value }
+        new_hash
+      end
+    end
+  end
+end

data/lib/rocket_chat/request_helper.rb

@@ -22,17 +22,17 @@ module RocketChat
 
     def request_json(path, options = {})
       fail_unless_ok = options.delete :fail_unless_ok
-      skip_status_check = options.delete :skip_status_check
 
       response = request path, options
-
       if fail_unless_ok && !response.is_a?(Net::HTTPOK)
         raise RocketChat::HTTPError, "Invalid http response code: #{response.code}"
       end
 
       response_json = JSON.parse(response.body)
-      unless skip_status_check || response_json['status'] == 'success'
-        raise RocketChat::StatusError, response_json['message']
+      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
 
       response_json
@@ -84,16 +84,23 @@ module RocketChat
       req = Net::HTTP.const_get(options[:method].to_s.capitalize).new(path, headers)
 
       body = options[:body]
-      req.body = url_encode(body) unless body.nil?
+      add_body(req, body) unless body.nil?
 
       req
     end
 
+    def add_body(request, body)
+      if body.is_a? Hash
+        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)
-        body.map do |key, value|
-          "#{URI.escape(key.to_s)}=#{URI.escape(value.to_s)}"
-        end.join('&')
+        URI.encode_www_form body
       else
         body.to_s
       end

data/lib/rocket_chat/session.rb

@@ -17,13 +17,17 @@ module RocketChat
       @token = token.dup.freeze
     end
 
+    def request_json(path, options = {})
+      server.request_json path, options.merge(token: token)
+    end
+
     #
     # logout REST API
     # @return [NilClass]
     # @raise [HTTPError, StatusError]
     #
     def logout
-      server.request_json('/api/v1/logout', method: :post, token: token)
+      request_json('/api/v1/logout', method: :post)
       nil
     end
 
@@ -33,9 +37,15 @@ module RocketChat
     # @raise [HTTPError, StatusError]
     #
     def me
-      response = server.request_json('/api/v1/me', method: :get, token: token, skip_status_check: true)
-      raise RocketChat::StatusError, 'Failed to fetch profile' unless response['success']
-      User.new response
+      User.new request_json('/api/v1/me', method: :get)
+    end
+
+    #
+    # User messages proxy
+    # @return [Messages::User]
+    #
+    def users
+      @users ||= RocketChat::Messages::User.new(self)
     end
   end
 end

data/lib/rocket_chat/util.rb

@@ -9,12 +9,37 @@ module RocketChat
     # @return Stringified hash
     #
     def stringify_hash_keys(hash)
-      newhash = {}
+      new_hash = {}
+      hash.each { |key, value| new_hash[key.to_s] = value }
+      new_hash
+    end
+    module_function :stringify_hash_keys
+
+    #
+    # Slice keys from hash
+    # @param [Hash] hash A hash to slice key/value pairs from
+    # @param [Array] *keys The keys to be sliced
+    # @return Hash filtered by keys
+    #
+    def slice_hash(hash, *keys)
+      return {} if keys.length.zero?
+
+      new_hash = {}
       hash.each do |key, value|
-        newhash[key.to_s] = value
+        new_hash[key] = value if keys.include? key
       end
-      newhash
+      new_hash
     end
-    module_function :stringify_hash_keys
+    module_function :slice_hash
+
+    #
+    # Camelize a string or symbol
+    # @param [String/Symbol] string A string or symbol
+    # @return a camelized string
+    #
+    def camelize(string)
+      string.to_s.gsub(/_([a-z])/) { $1.upcase }
+    end
+    module_function :camelize
   end
 end

data/lib/rocketchat.rb

@@ -6,6 +6,8 @@ require 'rocket_chat/error'
 require 'rocket_chat/util'
 require 'rocket_chat/request_helper'
 
+require 'rocket_chat/messages/user'
+
 require 'rocket_chat/server'
 require 'rocket_chat/session'
 require 'rocket_chat/info'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketchat
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - int512
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,7 @@ files:
 - lib/rocket_chat/error.rb
 - lib/rocket_chat/gem_version.rb
 - lib/rocket_chat/info.rb
+- lib/rocket_chat/messages/user.rb
 - lib/rocket_chat/request_helper.rb
 - lib/rocket_chat/server.rb
 - lib/rocket_chat/session.rb