slack-ruby 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e2d2c794344e0225257317b6520e25ec5b3027d
-  data.tar.gz: 4d63a311f0f5d246f08e48f2ebe7de55fcc86ef3
+  metadata.gz: e68fcd16be5769b5eae186f1cdf3e0dfba4cb71f
+  data.tar.gz: d1236f5db46fd7d9c899757d52adc3baaae540a3
 SHA512:
-  metadata.gz: 656caa9c0032003915f002e9c99db9628a4bd8bfb923206a28b473d717d9a82696395248a780da1c468f41bef7c9f15a4c917cbfa035f5ebe4cf72444d112590
-  data.tar.gz: d2738249859b0bb30dea6a4658e29bdab89bae01667bfe9eea8236b75657fe89a55e72f48bbf7bed8e14c481660a95f82726fa61a2d61fd4ce74c0cce2573321
+  metadata.gz: 640f155a2531637845966161bc71ff6f0d5c9f3c9bd4ebb2ebf841c8e472e481290e6214dcbfce4437cf8ce9f6d4878533d52deec647425b4d9e24d026043abe
+  data.tar.gz: 69d24276197c67f7d76f2729321632e3d6e17646bf362996825fb24d3dad012d78abff187cb4014fb27beac52e4949ec4bd9650b18fa2a51b29d39cbed4480ae

data/README.md

@@ -28,13 +28,17 @@ require "slack"
 # create RPC client object with OAuth token
 client = Slack::RPC::Client.new("xxxx-xxxxxxxxx-xxxx")
 
+# or you can set OAuth token after initialization
+client = Slack::RPC::Client.new()
+client.token = "yyyy-yyyyyyyyy-yyyy"
+
 # execute RPC command and retrieve response
 client.channels.archive(:channel => "C1234567890") do |response|
   # your own code
 end
 
 # or you can get response as returned object
-response = client.channels.unarchive(:channel => "C1234567890")
+response = client.channels.archive(:channel => "C1234567890")
 # your own code
 ```
 

data/lib/slack/rpc/client.rb

@@ -13,23 +13,39 @@ module Slack
 			# Creates a new instance of `Slack::RPC::Client` class
 			#
 			def initialize(token = nil)
-				conn = Connection.new(token)
-				define_command(conn, "api",      %w{test})
-				define_command(conn, "auth",     %w{test})
-				define_command(conn, "channels", %w{archive create history info invite join kick leave list mark rename setPurpose setTopic unarchive})
-				define_command(conn, "chat",     %w{delete postMessage update})
-				define_command(conn, "emoji",    %w{list})
-				define_command(conn, "files",    %w{info list upload})
-				define_command(conn, "groups",   %w{archive close create createChild history invite kick leave list mark open rename setPurpose setTopic unarchive})
-				define_command(conn, "im",       %w{close history list mark open})
-				define_command(conn, "oauth",    %w{access})
-				define_command(conn, "rtm",      %w{start})
-				define_command(conn, "search",   %w{all files messages})
-				define_command(conn, "stars",    %w{list})
-				define_command(conn, "users",    %w{getPresence info list setActive setPresence})
+				@conn = Connection.new(token)
+				define_command(@conn, "api",      %w{test})
+				define_command(@conn, "auth",     %w{test})
+				define_command(@conn, "channels", %w{archive create history info invite join kick leave list mark rename setPurpose setTopic unarchive})
+				define_command(@conn, "chat",     %w{delete postMessage update})
+				define_command(@conn, "emoji",    %w{list})
+				define_command(@conn, "files",    %w{info list upload})
+				define_command(@conn, "groups",   %w{archive close create createChild history invite kick leave list mark open rename setPurpose setTopic unarchive})
+				define_command(@conn, "im",       %w{close history list mark open})
+				define_command(@conn, "oauth",    %w{access})
+				define_command(@conn, "rtm",      %w{start})
+				define_command(@conn, "search",   %w{all files messages})
+				define_command(@conn, "stars",    %w{list})
+				define_command(@conn, "users",    %w{getPresence info list setActive setPresence})
 			end
 
-			# ### Slack::RPC::Client::define_command(conn, name, sub_commands)
+			# ### Slack::RPC::Client.token()
+			# get current token
+			#
+			def token
+				@conn.token
+			end
+
+			# ### Slack::RPC::Client.token=(token)
+			# set new token
+			#
+			def token=(token)
+				@conn.token = token
+			end
+
+		private
+
+			# ### Slack::RPC::Client.define_command(conn, name, sub_commands)
 			# Create `Slack::RPC::Command` object and store it as instance variable and expose it
 			#
 			def define_command(conn, name, sub_commands)

data/lib/slack/rpc/connection.rb

@@ -10,6 +10,8 @@ module Slack
 		#
 		class Connection
 
+			attr_accessor :token
+
 			# ### Slack::RPC::Connection.BASE_URL
 			# A base url to invoke Slack RPC-Style command
 			#
@@ -44,6 +46,8 @@ module Slack
 				end
 			end
 
+		private
+
 			# ### Slack::RPC::Connection.connection
 			# retrieve Faraday Connection object
 			#

data/lib/slack/version.rb

@@ -1,3 +1,3 @@
 module Slack
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/slack/rpc/client_spec.rb

@@ -2,8 +2,12 @@ require "spec_helper"
 
 describe Slack::RPC::Client do
 
+	before do
+		@base_url = "https://slack.com/api/api.test"
+	end
+
 	it "should have requested with Accept header" do
-		stub = stub_request(:get, "https://slack.com/api/api.test")
+		stub = stub_request(:get, @base_url)
 		client = Slack::RPC::Client.new()
 		client.api.test()
 		expect(stub.
@@ -11,7 +15,7 @@ describe Slack::RPC::Client do
 	end
 
 	it "should have requested with User-Agent header" do
-		stub = stub_request(:get, "https://slack.com/api/api.test")
+		stub = stub_request(:get, @base_url)
 		client = Slack::RPC::Client.new()
 		client.api.test()
 		expect(stub.
@@ -19,15 +23,32 @@ describe Slack::RPC::Client do
 	end
 
 	it "should have requested with URL-encoded query parameter" do
-		stub = stub_request(:get, "https://slack.com/api/api.test?foo=this+is+test")
+		stub = stub_request(:get, @base_url).with(:query => {"foo" => "this is test & spec"})
 		client = Slack::RPC::Client.new()
-		client.api.test(:foo => "this is test")
+		client.api.test(:foo => "this is test & spec")
 		expect(stub).to have_been_made
 	end
 
+	it "can set token at initialization" do
+		client = Slack::RPC::Client.new("0123456789")
+		expect(client.token).to eq("0123456789")
+	end
+
+	it "can set token after initialization" do
+		client = Slack::RPC::Client.new()
+		expect(client.token).to eq(nil)
+		client.token = "0123456789"
+		expect(client.token).to eq("0123456789")
+	end
+
+	it "can get token" do
+		client = Slack::RPC::Client.new("0123456789")
+		expect(client.token).to eq("0123456789")
+	end
+
 	context "with token" do
 		it "should have requested with token" do
-			stub = stub_request(:get, "https://slack.com/api/api.test?token=0123456789")
+			stub = stub_request(:get, @base_url).with(:query => {"token" => "0123456789"})
 			client = Slack::RPC::Client.new("0123456789")
 			client.api.test()
 			expect(stub).to have_been_made
@@ -36,7 +57,7 @@ describe Slack::RPC::Client do
 
 	context "without token" do
 		it "should have requested without token" do
-			stub = stub_request(:get, "https://slack.com/api/api.test")
+			stub = stub_request(:get, @base_url)
 			client = Slack::RPC::Client.new()
 			client.api.test()
 			expect(stub).to have_been_made

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - morou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday