laziness 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c21fdd45b9b2235fd96fd6c2e6328d891740f61
-  data.tar.gz: d42ae47015490c1546cec9c039413a8bc0a6674a
+  metadata.gz: 622956ad7a455f78936d697f1f21cd6cb62c820c
+  data.tar.gz: c4f4653e0dd6667d43a3ff45f8eab4063b4a1690
 SHA512:
-  metadata.gz: 8fd70990ed38c9fc9db9c41fad42a98b131b224e0c40eb758eb22843784973d54d568d43a1b4a46f6889e73542c359dd134e1e8f6f7c69e13145c7c671c90ac2
-  data.tar.gz: 8940eb5f16ba6feef11632fc0ee79e606b0896da432ec393ef12f7b08b37d10153cceb0c71ed4c6ce79fef75dc4cca84eb90d211c9450525706a88a89b519c88
+  metadata.gz: ecb218a57e2978c4019167a0bb90a72ec9824612035b8e198f29ad3ea000c2f52643c001937e1fabb28ee88d2402013e31fc6517bd560db1064cdb27b6e89d4e
+  data.tar.gz: 738574f928528f2b953d8da1e8c2bd6e0752038bb9ff732e0ed531283c3c8693041b2159d541f1864a454645401911fd28f1576c3796c070e8b0b4eb571f086c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    laziness (0.1.4)
+    laziness (0.1.5)
       hashie
       httparty
 
@@ -12,11 +12,11 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    hashie (3.4.1)
-    httparty (0.13.3)
+    hashie (3.4.2)
+    httparty (0.13.5)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    json (1.8.2)
+    json (1.8.3)
     multi_xml (0.5.5)
     rake (10.3.2)
     rspec (3.1.0)

data/README.md

@@ -96,6 +96,12 @@ client.groups.update_topic(group_id, topic) # updates the topic for the specific
 client.auth.test # get info about a specific oauth token
 ```
 
+### OAuth
+
+```
+client.oauth.access(client_id, client_secret, code, redirect_uri) # exchange api token for code
+```
+
 ### Presence
 
 ### Search
@@ -122,6 +128,6 @@ client.users.set_active # sets the current user (defined by the access_token) as
 ## RELEASING A NEW GEM
 
 1. Bump the VERSION in `lib/laziness/version.rb`
-1. Commit changes and push to GitHub
 1. run `bundle exec rake build`
+1. Commit changes and push to GitHub
 1. run `bundle exec rake release`

data/lib/laziness/api/auth.rb

@@ -2,7 +2,7 @@ module Slack
   module API
     class Auth < Base
       def test
-        response = request :get, access_token, 'auth.test'
+        response = request :get, 'auth.test'
         Slack::Auth.parse response
       end
     end

data/lib/laziness/api/base.rb

@@ -3,7 +3,7 @@ module Slack
     class Base
       attr_reader :access_token
 
-      def initialize(access_token)
+      def initialize(access_token=nil)
         @access_token = access_token
       end
 
@@ -18,9 +18,16 @@ module Slack
         nil
       end
 
-      def request(method, access_token, path, arguments={})
-        full_path = "#{base_path}#{path}?token=#{access_token}"
-        arguments.each_pair { |key, value| full_path = "#{full_path}&#{key}=#{ERB::Util.url_encode(value)}" }
+      def request(method, path, arguments={})
+        full_path = "#{base_path}#{path}"
+        full_path = "#{full_path}?token=#{access_token}" unless access_token.nil?
+        arguments.each_pair do |key, value|
+          unless value.nil?
+            seperator = full_path.include?("?") ? "&" : "?"
+            full_path = "#{full_path}#{seperator}#{key}=#{ERB::Util.url_encode(value)}"
+          end
+        end
+
         options = {
           headers: {
             "Accept"       => "application/json",

data/lib/laziness/api/channels.rb

@@ -2,26 +2,26 @@ module Slack
   module API
     class Channels < Base
       def all(exclude_archived=false)
-        response = request :get, access_token, 'channels.list', exclude_archived: exclude_archived ? 1 : 0
+        response = request :get, 'channels.list', exclude_archived: exclude_archived ? 1 : 0
         Slack::Channel.parse response, 'channels'
       end
 
       def archive(id)
-        with_nil_response { request :post, access_token, 'channels.archive', channel: id }
+        with_nil_response { request :post, 'channels.archive', channel: id }
       end
 
       def create(name)
-        response = request :post, access_token, 'channels.create', name: name
+        response = request :post, 'channels.create', name: name
         Slack::Channel.parse response, 'channel'
       end
 
       def find(id)
-        response = request :get, access_token, 'channels.info', channel: id
+        response = request :get, 'channels.info', channel: id
         Slack::Channel.parse response, 'channel'
       end
 
       def unarchive(id)
-        with_nil_response { request :post, access_token, 'channels.unarchive', channel: id }
+        with_nil_response { request :post, 'channels.unarchive', channel: id }
       end
     end
   end

data/lib/laziness/api/groups.rb

@@ -2,60 +2,60 @@ module Slack
   module API
     class Groups < Base
       def all(exclude_archived=false)
-        response = request :get, access_token, 'groups.list', exclude_archived: exclude_archived ? 1 : 0
+        response = request :get, 'groups.list', exclude_archived: exclude_archived ? 1 : 0
         Slack::Group.parse response, 'groups'
       end
 
       def archive(id)
-        with_nil_response { request :post, access_token, 'groups.archive', channel: id }
+        with_nil_response { request :post, 'groups.archive', channel: id }
       end
 
       def close(id)
-        with_nil_response { request :post, access_token, 'groups.close', channel: id }
+        with_nil_response { request :post, 'groups.close', channel: id }
       end
 
       def copy(id)
-        response = request :post, access_token, 'groups.createChild', channel: id
+        response = request :post, 'groups.createChild', channel: id
         Slack::Group.parse response, 'group'
       end
 
       def create(name)
-        response = request :post, access_token, 'groups.create', name: name
+        response = request :post, 'groups.create', name: name
         Slack::Group.parse response, 'group'
       end
 
       def find(id)
-        response = request :get, access_token, 'groups.info', channel: id
+        response = request :get, 'groups.info', channel: id
         Slack::Group.parse response, 'group'
       end
 
       def invite(id, user_id)
-        response = request :post, access_token, 'groups.invite', channel: id, user: user_id
+        response = request :post, 'groups.invite', channel: id, user: user_id
         Slack::Group.parse response, 'group'
       end
 
       def kick(id, user_id)
-        with_nil_response { request :post, access_token, 'groups.kick', channel: id, user: user_id }
+        with_nil_response { request :post, 'groups.kick', channel: id, user: user_id }
       end
 
       def leave(id)
-        with_nil_response { request :post, access_token, 'groups.leave', channel: id }
+        with_nil_response { request :post, 'groups.leave', channel: id }
       end
 
       def open(id)
-        with_nil_response { request :post, access_token, 'groups.open', channel: id }
+        with_nil_response { request :post, 'groups.open', channel: id }
       end
 
       def unarchive(id)
-        with_nil_response { request :post, access_token, 'groups.unarchive', channel: id }
+        with_nil_response { request :post, 'groups.unarchive', channel: id }
       end
 
       def update_purpose(id, purpose)
-        with_nil_response { request :post, access_token, 'groups.setPurpose', channel: id, purpose: purpose }
+        with_nil_response { request :post, 'groups.setPurpose', channel: id, purpose: purpose }
       end
 
       def update_topic(id, topic)
-        with_nil_response { request :post, access_token, 'groups.setTopic', channel: id, topic: topic }
+        with_nil_response { request :post, 'groups.setTopic', channel: id, topic: topic }
       end
     end
   end

data/lib/laziness/api/oauth.rb

@@ -0,0 +1,11 @@
+module Slack
+  module API
+    class OAuth < Base
+      def access(client_id, client_secret, code, redirect_uri=nil)
+        response = request :get, 'oauth.access', client_id: client_id,
+          client_secret: client_secret, code: code, redirect_uri: redirect_uri
+        Slack::Auth.parse response
+      end
+    end
+  end
+end

data/lib/laziness/api/users.rb

@@ -2,17 +2,17 @@ module Slack
   module API
     class Users < Base
       def all
-        response = request :get, access_token, 'users.list'
+        response = request :get, 'users.list'
         Slack::User.parse response, 'members'
       end
 
       def find(id)
-        response = request :get, access_token, 'users.info', user: id
+        response = request :get, 'users.info', user: id
         Slack::User.parse response, 'user'
       end
 
       def set_active
-        with_nil_response { request :post, access_token, 'users.setActive' }
+        with_nil_response { request :post, 'users.setActive' }
       end
     end
   end

data/lib/laziness/api.rb

@@ -4,4 +4,5 @@ require 'laziness/api/base'
 require 'laziness/api/auth'
 require 'laziness/api/channels'
 require 'laziness/api/groups'
+require 'laziness/api/oauth'
 require 'laziness/api/users'

data/lib/laziness/client.rb

@@ -2,7 +2,7 @@ module Slack
   class Client
     attr_reader :access_token
 
-    def initialize(access_token)
+    def initialize(access_token=nil)
       @access_token = access_token
     end
 
@@ -18,6 +18,10 @@ module Slack
       @groups ||= Slack::API::Groups.new(access_token)
     end
 
+    def oauth
+      @oauth ||= Slack::API::OAuth.new
+    end
+
     def users
       @users ||= Slack::API::Users.new(access_token)
     end

data/lib/laziness/oauth.rb

@@ -0,0 +1,4 @@
+module Slack
+  class OAuth < Base
+  end
+end

data/lib/laziness/version.rb

@@ -1,3 +1,3 @@
 module Slack
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/laziness.rb

@@ -6,6 +6,7 @@ require 'laziness/channel'
 require 'laziness/client'
 require 'laziness/errors'
 require 'laziness/group'
+require 'laziness/oauth'
 require 'laziness/user'
 
 module Slack

data/spec/laziness/api/oauth_spec.rb

@@ -0,0 +1,16 @@
+describe Slack::API::OAuth do
+  subject { Slack::API::OAuth.new }
+
+  describe '.access' do
+    let(:client_id) { "1234" }
+    let(:client_secret) { "5678" }
+    let(:code) { "9012" }
+
+    it 'exchanges a temporary oauth code for an API access token' do
+      stub_slack_request :get, "oauth.access?client_id=#{client_id}&client_secret=#{client_secret}&code=#{code}", 'oauth_access.json'
+
+      oauth = subject.access client_id, client_secret, code
+      expect(oauth.ok).to eq true
+    end
+  end
+end

data/spec/support/fixtures/oauth_access.json

@@ -0,0 +1,11 @@
+{
+  "ok": true,
+  "access_token": "123456",
+  "scope": "incoming-webhook",
+  "team_name": "tour",
+  "incoming_webhook": {
+    "url": "https:\/\/tour.slack.com\/",
+    "channel": "#general",
+    "configuration_url": "https:\/\/hooks.slack.com\/services\/T1234\/1234\/"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: laziness
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jamie Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -61,6 +61,7 @@ files:
 - lib/laziness/api/base.rb
 - lib/laziness/api/channels.rb
 - lib/laziness/api/groups.rb
+- lib/laziness/api/oauth.rb
 - lib/laziness/api/users.rb
 - lib/laziness/auth.rb
 - lib/laziness/base.rb
@@ -68,11 +69,13 @@ files:
 - lib/laziness/client.rb
 - lib/laziness/errors.rb
 - lib/laziness/group.rb
+- lib/laziness/oauth.rb
 - lib/laziness/user.rb
 - lib/laziness/version.rb
 - spec/laziness/api/auth_spec.rb
 - spec/laziness/api/channels_spec.rb
 - spec/laziness/api/groups_spec.rb
+- spec/laziness/api/oauth_spec.rb
 - spec/laziness/api/users_spec.rb
 - spec/laziness/client_spec.rb
 - spec/laziness/errors_spec.rb
@@ -82,6 +85,7 @@ files:
 - spec/support/fixtures/channels_list.json
 - spec/support/fixtures/groups_info.json
 - spec/support/fixtures/groups_list.json
+- spec/support/fixtures/oauth_access.json
 - spec/support/fixtures/successful_response.json
 - spec/support/fixtures/users_info.json
 - spec/support/fixtures/users_list.json
@@ -114,6 +118,7 @@ test_files:
 - spec/laziness/api/auth_spec.rb
 - spec/laziness/api/channels_spec.rb
 - spec/laziness/api/groups_spec.rb
+- spec/laziness/api/oauth_spec.rb
 - spec/laziness/api/users_spec.rb
 - spec/laziness/client_spec.rb
 - spec/laziness/errors_spec.rb
@@ -123,6 +128,7 @@ test_files:
 - spec/support/fixtures/channels_list.json
 - spec/support/fixtures/groups_info.json
 - spec/support/fixtures/groups_list.json
+- spec/support/fixtures/oauth_access.json
 - spec/support/fixtures/successful_response.json
 - spec/support/fixtures/users_info.json
 - spec/support/fixtures/users_list.json