mattermost-api4-ruby 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f9d0ac73088c4af888d5d3ee7320c31b77e1402
-  data.tar.gz: 9250e3cc7bb29b56025db305e92e86ef43dc41dd
+  metadata.gz: 4d2172dab7043981ddc6e9f23a1252c603b708b9
+  data.tar.gz: 977042fdc8a7bdc73582f35033fc44cde43129f4
 SHA512:
-  metadata.gz: 2c2ebbc56ca76fd5221e56f84ad6fe58664c04592dc1779f152a9a24a901f9c930e4e5f2bad67b18817e366ce725b2d2468912630c6ffca09c5643eb41ced02f
-  data.tar.gz: 8eef9ede276e9ecbaf343ae8215ece695dbab6e0e5520098ebc54c897bc29f4d3aeb5818dadfa92dc796d8c256c2ccc1b218959156ff3e1f41c6a1e15ba8f7ed
+  metadata.gz: 0b5df1bb0875c5cbbd43289c090c2a5446209d2ba03182f7e8bfa8ea6ed3ed157cb8355c1acdcf8790369aebddf7fe2574c4d175b7b0666f239b2b6c552eb821
+  data.tar.gz: e77fadbea409b42f6d9a1b2c30e926fdad9424725cefe27fa87c2bc5dcab45abf7304528c702ecdb65f324640ededded48dd37630fb98ec3a2b759f81b6f4929

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Change Log
 
-## [v0.0.7](https://github.com/maruTA-bis5/mattermost-api4-ruby/tree/v0.0.7) (2018-01-24)
+## [v0.0.8](https://github.com/maruTA-bis5/mattermost-api4-ruby/tree/v0.0.8) (2018-01-31)
+[Full Changelog](https://github.com/maruTA-bis5/mattermost-api4-ruby/compare/v0.0.7...v0.0.8)
+
+**Implemented enhancements:**
+
+- Use Faraday as internal HTTP client [\#6](https://github.com/maruTA-bis5/mattermost-api4-ruby/issues/6)
+
+**Fixed bugs:**
+
+- Client\#logout did not call logout api [\#13](https://github.com/maruTA-bis5/mattermost-api4-ruby/issues/13)
+
+## [v0.0.7](https://github.com/maruTA-bis5/mattermost-api4-ruby/tree/v0.0.7) (2018-01-23)
 [Full Changelog](https://github.com/maruTA-bis5/mattermost-api4-ruby/compare/v0.0.6...v0.0.7)
 
 **Fixed bugs:**

data/lib/mattermost/client.rb

@@ -1,4 +1,3 @@
-require 'httparty'
 require_relative 'endpoint'
 require_relative 'request'
 require_relative 'websocket_client'
@@ -6,15 +5,21 @@ require_relative 'websocket_client'
 module Mattermost
 
 	class Client
-		include HTTParty
+		extend Gem::Deprecate
 		include Mattermost::Endpoint
 		include Mattermost::Request
 
-		attr_accessor :server, :token
+		attr_accessor :server, :token, :headers
+
+		# *DEPRECATED* I'll remove this method soon
+		def base_uri
+			"#{server}/api/v4"
+		end
+		deprecate :base_uri, :none, 2018, 1
 
 		def initialize(server)
 			self.server = server
-			self.class.base_uri "#{server}/api/v4"
+			self.headers = {:Accept => "application/json"}
 		end
 
 		def login(username, password)
@@ -24,6 +29,7 @@ module Mattermost
 		end
 
 		def logout
+			post("/users/logout")
 			self.token = nil
 			update_token
 		end
@@ -39,7 +45,7 @@ module Mattermost
 
 		def connect_websocket
 			# TODO raise exception then connected? == false
-			@ws_client = WebSocketClient.new "#{base_uri}/websocket", token, {:headers => self.class.headers}
+			@ws_client = WebSocketClient.new "#{base_uri}/websocket", token, {:headers => self.headers}
 			yield @ws_client if block_given?
 			@ws_client
 		end
@@ -48,30 +54,11 @@ module Mattermost
 			@ws_client
 		end
 
-		def get(path, options = {}, &block)
-			self.class.get(path, options, &block)
-		end
-
-		def post(path, options = {}, &block)
-			self.class.post(path, options, &block)
-		end
-
-		def put(path, options = {}, &block)
-			self.class.put(path, options, &block)
-		end
-
-		def delete(path, options = {}, &block)
-			self.class.delete(path, options, &block)
-		end
-
-		def base_uri
-			self.class.base_uri
-		end
-
 		private
 
 		def update_token
-			self.class.headers :Authorization => "Bearer #{token}"
+			headers[:Authorization] = "Bearer #{token}"
 		end
+
 	end
 end

data/lib/mattermost/request.rb

@@ -1,7 +1,52 @@
-require 'httparty'
+require 'faraday'
+require 'faraday_middleware'
 
 module Mattermost
 	module Request
-		include HTTParty
+
+		def get(path, options = {}, &block)
+			puts "get #{path}, #{options}"
+			connection.send(:get) do |request|
+				request.url api(path), options
+			end
+		end
+
+		def post(path, options = {}, &block)
+			connection.send(:post) do |request|
+				request.path = api(path)
+				request.body = options[:body] if options.key? :body
+			end
+		end
+
+		def put(path, options = {}, &block)
+			connection.send(:put) do |request|
+				request.path = api(path)
+				request.body = options[:body] if options.key? :body
+			end
+		end
+
+		def delete(path, options = {}, &block)
+			connection.send(:delete) do |request|
+				request.path = api(path)
+				request.body = options[:body] if options.key? :body
+			end
+		end
+
+		private
+
+		def connection
+			Faraday::Connection.new({
+				:headers => self.headers,
+				:url => server
+			}) do |connection|
+				connection.response :json
+				connection.adapter :httpclient
+			end
+		end
+
+		def api(path)
+			"/api/v4#{path}"
+		end
+
 	end
 end

data/mattermost-api4-ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "mattermost-api4-ruby"
-  spec.version       = "0.0.7"
+  spec.version       = "0.0.8"
   spec.authors       = ["Takayuki Maruyama"]
   spec.email         = ["bis5.wsys@gmail.com"]
 
@@ -22,7 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "github_changelog_generator"
 
-  spec.add_dependency "httparty", "~> 0.15"
+  spec.add_dependency "faraday", "~> 0.14"
+  spec.add_dependency "faraday_middleware", "~> 0.12"
+  spec.add_dependency "httpclient", ">= 2.2"
   spec.add_dependency "faye-websocket", "~> 0.10"
   spec.add_dependency "event_emitter", "~> 0.2"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mattermost-api4-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Takayuki Maruyama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,19 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement