mattermost-ruby 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 840e068b319f9d5211b3264fb9c9611a5fef1d4e
-  data.tar.gz: ba85421a1c3b0dfc59b1a4f9c7ab8cb34c94355a
+  metadata.gz: 25e25af58c2cddfaec9f104a01d2e175630536b0
+  data.tar.gz: e630507758d67fc08881ca1d0ba1ef2dc3dcb44d
 SHA512:
-  metadata.gz: 99235fefb90bb3b9964d1f5ceb4969e0d06c915aea3f2e58394441ff201057f4784335b4cfe535c62974629317090eebcad9fb8e749db666ecb6b676c8663816
-  data.tar.gz: b47b2fe3cb4c41d6c647ab2458d9be5d80610c2c6f1793438793fc9dad0b9cb2944c17efb2f93142034e9f089909c873051120529bfe29c0ea914ab11caddf29
+  metadata.gz: bef58638a0e26002b9e4f836bc337b9d25d0eed7e3702d1508af2532cd24e6d37466338945013c1586cf0cc826bbd14e8eb2cf1b2b0cfe17f603573755c2bc92
+  data.tar.gz: 67a0da25a8eb63ca465353dca08e7dc1235a36346cc52224ba7b95d710c3b8fbeb3d34382484ff10126faebd155a5c941836a458808d26abf7d047e8432998dd

data/.gitignore

@@ -9,4 +9,5 @@
 /tmp/
 mattermost-ruby*.gem
 .DS_Store
-test.rb
+test.rb
+/.idea/

data/lib/mattermost.rb

@@ -1,4 +1,4 @@
-#require "mattermost/version"
+require_relative 'mattermost/version'
 
 require 'httparty'
 require 'pry'
@@ -6,6 +6,7 @@ require 'pry'
 require_relative 'mattermost/mattermost_object'
 require_relative 'mattermost/models/base'
 require_relative 'mattermost/team'
+require_relative 'mattermost/post'
 require_relative 'mattermost/user'
 require_relative 'mattermost/admin'
 require_relative 'mattermost/channel'
@@ -20,14 +21,16 @@ module Mattermost
 
   def self.connect(username, password, server, team_name, options = {})
     self.base_uri server
-    request = self.post('/users/login',
-                            :body => { :name => team_name, :username => username, :password => password}.to_json )
-    self.headers "Cookie" => "MMTOKEN=#{request.headers['token']}"
-    self.headers "X-Requested-With" => 'XMLHttpRequest'
-    @team = Team.new({:id => request.parsed_response['team_id'], :name => team_name})
     options[:httparty].each do |k,v|
       self.send(k, v)
     end
+    request = self.post('/users/login',
+                            :body => { :login_id => username, :password => password, :token => "" }.to_json )
+    self.headers "Cookie" => "MMAUTHTOKEN=#{request.headers['token']}"
+    self.headers "X-Requested-With" => 'XMLHttpRequest'
+    initial_load = self.get("/users/initial_load")
+    team = initial_load.parsed_response['teams'].select { |team| team['name'] == team_name }.first
+    @team = Team.new(team)
     unless options[:preload_user] == false
       Mattermost::User.all
     end

data/lib/mattermost/admin.rb

@@ -1,35 +1,46 @@
 module Mattermost
   class Admin < MattermostObject
 
-    def self.get_logs
+    # Mattermost puts this under users, but I feel it doesn't belong there
+    # since it says more about the logged in user and the system than
+    # a user collection itself.
+    def self.initial_load
+      Mattermost.get("/users/initial_load")
+    end
+
+    def self.logs
       Mattermost.get("/admin/logs")
     end
 
-    def self.get_all_audits
+    def self.audits
       Mattermost.get("/admin/audits")
     end
 
-    def self.get_config
+    def self.config
       Mattermost.get("/admin/config")
     end
 
     def self.save_config
+      raise NotImplementedError
       Mattermost.post("/admin/save_config")
     end
 
     def self.test_email
+      raise NotImplementedError
       Mattermost.post("/admin/test_email")
     end
 
-    def self.get_client_config
+    def self.client_config
       Mattermost.get("/admin/client_props")
     end
 
     def self.log_client
+      raise NotImplementedError
       Mattermost.post("/admin/log_client")
     end
 
-    def self.get_analytics(name, id = nil)
+    def self.analytics(name, id = nil)
+      raise NotImplementedError
       uri = "/admin/analytics"
       uri += "/#{id}" if id
       uri += "/#{name}"
@@ -37,30 +48,37 @@ module Mattermost
     end
 
     def self.save_compliance_report
+      raise NotImplementedError
       Mattermost.post("/admin/save_compliance_report")
     end
 
-    def self.get_compliance_reports
+    def self.compliance_reports
+      raise NotImplementedError
       Mattermost.get("/admin/compliance_reports")
     end
 
     def self.download_compliance_report(id)
+      raise NotImplementedError
       Mattermost.get("/admin/download_compliance_report/#{id}")
     end
 
     def self.upload_brand_image
+      raise NotImplementedError
       Mattermost.post("/admin/upload_brand_image")
     end
 
     def self.get_brand_image
+      raise NotImplementedError
       Mattermost.get("/admin/get_brand_image")
     end
 
     def self.admin_reset_mfa
+      raise NotImplementedError
       Mattermost.post("/admin/reset_mfa")
     end
 
     def self.admin_reset_password
+      raise NotImplementedError
       Mattermost.post("/admin/reset_password")
     end
 

data/lib/mattermost/channel.rb

@@ -5,7 +5,8 @@ module Mattermost
       ::Channel.new(attributes)
     end
 
-    # Returns all channels for the current team
+    # Returns channels for the current team _that the logged in user has joined_
+    # call Mattermost::Channel.more to get a list of all the channels (like, actually)
     #
     # @param force_refresh [boolean] to recache the channels
     def self.all(force_refresh = false)
@@ -13,12 +14,19 @@ module Mattermost
       @channels ||= all_channels
     end
 
-    # Returns "more" channels for the current team
+    # Returns all of the channels for the current team
+    # Unlike self.all which only returns the channels the user has joined
     def self.more
-      Mattermost.get("/channels/more")
+      channels = []
+      request = Mattermost.get("/teams/#{Mattermost.team.id}/channels/more")
+      request.parsed_response['channels'].each do |channel|
+        channels << self.new(channel)
+      end
+      return channels
     end
 
-    # Returns a hash of counts for each *team*
+    # Returns a hash of counts
+    # This is mostly useless because fetching a channel will return the counts for you.
     # {"counts"=>{"ps6kdfuk9p8mjx6pkr3krgq3by"=>58334, "yckjbepc4frbmmq9in6tap1dwa"=>32},
     #  "update_times"=>{"ps6kdfuk9p8mjx6pkr3krgq3by"=>1463180151709, "yckjbepc4frbmmq9in6tap1dwa"=>1457216806189}}
     def self.counts
@@ -33,11 +41,11 @@ module Mattermost
     protected
     def self.all_channels
       channels = []
-      request = Mattermost.get("/channels/")
+      request = Mattermost.get("/teams/#{Mattermost.team.id}/channels/")
       request.parsed_response['channels'].each do |channel|
         channels << self.new(channel)
       end
-      channels
+      return channels
     end
 
   end

data/lib/mattermost/mattermost_object.rb

@@ -4,6 +4,18 @@ module Mattermost
     def initialize
     end
 
+    # Return an object that matches a given attribute.
+    # Return nil if no matches
+    def self.find_by(opts = {})
+      obj = all.select { |obj| obj.send(opts.keys.first) == opts.values.first }.first
+      return obj 
+    end
+
+    # Return the user that has an id of @param id
+    def self.find(id)
+      find_by(:id => id)
+    end
+
     class << self
       def method_missing(method_id, *args) #:nodoc:
         o = self.new

data/lib/mattermost/models/channel.rb

@@ -14,6 +14,21 @@ class Channel < Base
     Mattermost.get("/channels/#{self.id}/")
   end
 
+  # Returns posts for the channel _before_ a given post.id 
+  # 
+  # @param before [string] to get posts before a given post id
+  def posts(before = nil)
+    uri = "/channels/#{self.id}/posts"
+    uri += "/#{before}" if before 
+    uri += "/0/60?_=#{Time.now.to_i}"
+    request = Mattermost.get("/channels/#{self.id}/posts/0/60?_=#{Time.now.to_i}")
+    response = {}
+    request.parsed_response['posts'].each do |_, post|
+      response[k] = Post.new(post)
+    end
+    response
+  end
+
   # Get the users in a channel
   def get_channel_extra_info(member_limit = nil)
     uri = "/channels/#{self.id}/extra_info"
@@ -48,6 +63,7 @@ class Channel < Base
     user_id = user.is_a? User ? user.id : user
     Mattermost.post("/channels/#{self.id}/add", :body => {:user_id => user_id})
   end
+  alias_method :add_user, :add_member 
 
   # Add a user to a channel
   # Send a user object or a user_id
@@ -55,6 +71,7 @@ class Channel < Base
     user_id = user.is_a? User ? user.id : user
     Mattermost.post("/channels/#{self.id}/remove", :body => {:user_id => user_id})
   end
+  alias_method :remove_user, :remove_member 
 
   def update_last_viewed_at
     Mattermost.post("/channels/#{self.id}/update_last_viewed_at")
@@ -68,27 +85,19 @@ class Channel < Base
   # Update the channel's header. I really hate that they have a specific
   # method for this.
   def update_header(header)
-    Mattermost.post("/channels/update_header", :body => {:channel_id => self.id, :channel_header => header})
+    Mattermost.post("/teams/#{Mattermost.team.id}/channels/#{self.id}/update_header", :body => {:channel_id => self.id, :channel_header => header}.to_json)
   end
 
   # Update the channel's purpose. I really hate that they have a specific
   # method for this.
   def update_purpose(purpose)
-    Mattermost.post("/channels/update_purpose", :body => {:channel_id => self.id, :channel_purpose => purpose})
+    Mattermost.post("/teams/#{Mattermost.team.id}/channels/#{self.id}/update_purpose", :body => {:channel_id => self.id, :channel_purpose => purpose}.to_json)
   end
 
   def self.default_attributes
     {:display_name => String, :team_id => String, :type => Integer, :purpose => String}
   end
 
-  def posts
-    request = Mattermost.get("/channels/#{self.id}/posts/0/60?_=#{Time.now.to_i}")
-    response = {}
-    request.parsed_response['posts'].each do |k, v|
-      response[k] = Post.new(v)
-    end
-    response
-  end
 
   protected
   def create_channel

data/lib/mattermost/models/post.rb

@@ -3,7 +3,9 @@ class Post < Base
 
   def initialize(attributes)
     super(attributes)
-    @user = Mattermost::User.find(attributes['user_id'])
+    if attributes['user_id']
+	  @user = Mattermost::User.find(attributes['user_id'])
+	end
   end
 
 end

data/lib/mattermost/models/team.rb

@@ -1,7 +1,7 @@
 class Team < Base
 
   def add_user(user)
-    Mattermost.post("/teams/#{Mattermost.team.id}/add_user_to_team", :body => { :user_id => user.id })
+    Mattermost.post("/teams/#{Mattermost.team.id}/add_user_to_team", :body => { :user_id => user.id }.to_json )
   end
 
 end

data/lib/mattermost/post.rb

@@ -0,0 +1,19 @@
+module Mattermost
+  class Post < MattermostObject
+
+    def self.new(attributes = {})
+      ::Post.new(attributes)
+    end
+
+    def self.search(terms)
+      request = Mattermost.post("/teams/#{Mattermost.team.id}/posts/search", :body => { :terms => terms }.to_json)
+      response = []
+      request.parsed_response['posts'].each do |_, post|
+      	response << self.new(post)
+      end
+      response 
+    end
+
+  end
+end
+

data/lib/mattermost/user.rb

@@ -10,22 +10,10 @@ module Mattermost
       @users ||= all_users
     end
 
-    # Return a user that matches a given attribute.
-    # Common pairs are :email => email, or :username => username
-    # Return nil if not no matches
-    def self.find_by(opts = {})
-      all.select { |user| user.send(opts.keys.first) == opts.values.first }.first
-    end
-
-    # Return the user that has an id of @param id
-    def self.find(id)
-      find_by(:id => id)
-    end
-
     # Return the status of users
     # Statuses are "offline", "away", or "online"
     def self.status(user_ids = [])
-      Mattermost.post("/users/status", :body => user_ids.to_json)
+      request = Mattermost.post("/users/status", :body => user_ids.to_json)
     end
 
     # Returns the user that was used for authentication on Mattermost.connect
@@ -34,10 +22,18 @@ module Mattermost
       self.new(request.parsed_response)
     end
 
+    # Create a user from the team's invite.
+    # Returns a user
+    def self.create_from_invite(email, password, username)
+      request = Mattermost.post("/users/create?d=&iid=#{Mattermost.team.invite_id}", 
+        :body => {:allow_marketing => true, :email => email, :password => password, :username => username}.to_json)
+      self.new(request.parsed_response)
+    end
+
     protected
     def self.all_users
       users = []
-      request = Mattermost.get("/users/profiles")
+      request = Mattermost.get("/users/profiles/#{Mattermost.team.id}")
       request.parsed_response.values.each do |user|
         users << self.new(user)
       end

data/lib/mattermost/version.rb

@@ -1,3 +1,3 @@
 module Mattermost
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mattermost-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Josh Brody
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ files:
 - lib/mattermost/models/post.rb
 - lib/mattermost/models/team.rb
 - lib/mattermost/models/user.rb
+- lib/mattermost/post.rb
 - lib/mattermost/team.rb
 - lib/mattermost/user.rb
 - lib/mattermost/version.rb
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An ActiveModel-inspired API client for Mattermost