async-slack 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d035d16593dedbe6ab28e6dd116bfe267e41f05d041e8412536ebb82e4e70316
-  data.tar.gz: c900250d7a9f6f27c46f31e71d3702d05c65a511263e850e0c5898d50c7118cf
+  metadata.gz: e8143c9be22d6019597a9580450dcfc2300621d1583b98532a6ade4468b6f071
+  data.tar.gz: c1f6196fdd510cdd38afa55db8a62f6e8815218d500946ea5aed1280760dc06a
 SHA512:
-  metadata.gz: 3ffc0723f635092f32c5fdb9c673ca9209994873cc34320a0b1fe39d5f986c84e0958f7ef4da21f81176b7d386e471f6e708d6dff3e9550e2fe62cf98092e06d
-  data.tar.gz: ba81fe74a4124fc2127550ec3f06910fdb3908f3898e7f9bb7ee8251a73ec43ddac3087eb4a83606766a7cea8826be85d73cae104766d92f26a9313edcc468e8
+  metadata.gz: 3ceab1b01a277eaa787a6f2ce2b7885525627b5ee1022710d9120914e2d30f7b389c79a25b3bf24412ad5f1ca2306ff06e69b987b6e23cd1913f3bed965447c5
+  data.tar.gz: 13131c502414079d4f5f255eb3add17df723b181fa57183d092e509ee201b3c6b29c4c9e233b0a7a58167a25354f189c37a9b0ede4b0c170b0d1240507160b1c

data/async-slack.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency "async-rest"
+	spec.add_dependency "async-rest", "~> 0.12"
 	spec.add_dependency "async-websocket", "~> 0.13"
 	
 	spec.add_development_dependency "async-rspec"

data/lib/async/slack/error.rb

@@ -0,0 +1,33 @@
+# frozen_string_literals: true
+#
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'representation'
+
+module Async
+	module Slack
+		class Error < StandardError
+		end
+		
+		class ConnectionError < Error
+		end
+	end
+end

data/lib/async/slack/real_time.rb

@@ -24,6 +24,7 @@ require "async/websocket/client"
 require "async/websocket/response"
 
 require_relative 'representation'
+require_relative 'error'
 
 module Async
 	module Slack
@@ -32,12 +33,15 @@ module Async
 				response = self.post
 				
 				parameters = response.read
-				url = parameters[:url]
 				
-				endpoint = Async::HTTP::Endpoint.parse(url)
-				
-				Async::WebSocket::Client.connect(endpoint, **options) do |connection|
-					self.start(connection, &block)
+				if url = parameters[:url]
+					endpoint = Async::HTTP::Endpoint.parse(url)
+					
+					Async::WebSocket::Client.connect(endpoint, **options) do |connection|
+						self.start(connection, &block)
+					end
+				else
+					raise ConnectionError, parameters
 				end
 			end
 			

data/lib/async/slack/representation.rb

@@ -21,47 +21,29 @@
 # THE SOFTWARE.
 
 require 'async/rest/representation'
-require 'async/rest/wrapper/json'
-require 'async/rest/wrapper/url_encoded'
+require 'async/rest/wrapper/form'
 
 module Async
 	module Slack
-		class Wrapper < Async::REST::Wrapper::JSON
-			def prepare_request(payload, headers)
-				super(nil, headers)
-				
-				if payload
-					headers['content-type'] = Async::REST::Wrapper::URLEncoded::APPLICATION_FORM_URLENCODED
-					
-					::Protocol::HTTP::Body::Buffered.new([
-						::Protocol::HTTP::URL.encode(payload)
-					])
-				end
-			end
-			
+		class Wrapper < Async::REST::Wrapper::Form
 			class Parser < HTTP::Body::Wrapper
 				def join
-					body = ::JSON.parse(super, symbolize_names: true)
+					value = ::JSON.parse(super, symbolize_names: true)
 					
-					if error = body[:error]
-						raise REST::Error, error
+					if error = value[:error]
+						raise Error, error
 					end
 					
-					return body
+					return value
 				end
 			end
 			
-			def wrap_response(response)
-				if body = response.body
-					response.body = Parser.new(body)
-				end
+			def parser_for(response)
+				Parser
 			end
 		end
 		
-		class Representation < Async::REST::Representation
-			def initialize(*args, **options)
-				super(*args, wrapper: Wrapper.new, **options)
-			end
+		class Representation < Async::REST::Representation[Wrapper]
 		end
 	end
 end

data/lib/async/slack/rspec/client.rb

@@ -37,12 +37,6 @@ module Async
 				# You must specify these in order for the tests to run.
 				let(:token) {ENV['SLACK_TOKEN']}
 				let(:channel) {'#testing'}
-				
-				let(:connection) {@connection = Async::Slack.connect(token: token)}
-				
-				after do
-					@connection&.close
-				end
 			end
 		end
 	end

data/lib/async/slack/search.rb

@@ -42,7 +42,7 @@ module Async
 					end
 					
 					# Was this the last page?
-					break if records.count < count
+					break if records.size < count
 					
 					page += 1
 				end
@@ -69,6 +69,7 @@ module Async
 			end
 			
 			def records
+				binding.irb
 				self.value[:messages][:matches]
 			end
 

data/lib/async/slack/version.rb

@@ -1,6 +1,6 @@
 
 module Async
 	module Slack
-		VERSION = "0.2.1"
+		VERSION = "0.3.0"
 	end
 end

data/spec/async/slack/real_time_spec.rb

@@ -30,6 +30,6 @@ RSpec.describe Async::Slack::RealTime do
 			client.real_time.connect do |connection|
 				expect(connection.read).to be == {:type=>"hello"}
 			end
-		end
+		end.wait
 	end
 end

data/spec/async/slack_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Async::Slack::Client do
 				message = client.chat.send_message(channel: channel, text: "The time is #{Time.now}")
 				message.value = nil
 			end
-		end
+		end.wait
 	end
 	
 	it "can search for messages" do
@@ -37,6 +37,6 @@ RSpec.describe Async::Slack::Client do
 			messages = client.search.messages(query: "Hello World").to_a
 			
 			expect(messages).to_not be_empty
-		end
+		end.wait
 	end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: async-slack
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-22 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - lib/async/slack.rb
 - lib/async/slack/chat.rb
 - lib/async/slack/client.rb
+- lib/async/slack/error.rb
 - lib/async/slack/real_time.rb
 - lib/async/slack/representation.rb
 - lib/async/slack/rspec/client.rb
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Build Slack bots and use real time messaging.