yam 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a8e86aac55bc10f4b6a051ce670170837cbd326
-  data.tar.gz: d4237220164fe41b9e4083f89fd7fdf705703a9f
+  metadata.gz: aa809413d7a9291efe4669d094af8662f6fc9892
+  data.tar.gz: c9fb753cce0165376014d48147e853ea409775c6
 SHA512:
-  metadata.gz: e15c1470fc0516e3e50fba16c137f4ebaf674bb8c93f3570754818074dc00d3fb57e372cf811d8fba3f3086f083d18afb7fde8e8939e201b8898c108766d10a7
-  data.tar.gz: df7a2dac8028741a3f8103da2d59008bf754f1786936482a68e3cf971b5cbb2ecbbc98ce39ccc491319d9b25d8ec65a5b723ba6aa68ead0d2ed7945bcb613a44
+  metadata.gz: 4086614c5f23ada408f3d80e8cbf754879bcf5bad3c0e0063b38b78fc372eeb07448006135faaddda4bbf8ab86030cade2ae3029f4116269c6c66602303cbdcb
+  data.tar.gz: 8b4c69ad3ee8b4f399e1abe86a9eadd455a5b11874b082df3b096b7fd3ab618c42ccf68954b4aef1fd1dd0d5106be34186f37ecad2a57a3513432a15976651be

data/README.md

@@ -53,7 +53,7 @@ Setup a Yammer client application as described on the [Yammer Developer site](ht
 
 
 ```ruby
-  GET https://www.yammer.com/dialog/oauth?client_id=[:client_id]&response_type=code
+  GET https://www.yammer.com/oauth2/authorize?client_id=[:client_id]&response_type=code
 ```
 
 2. Have your users follow the URL you constructed above to allow your application to access their data 
@@ -89,9 +89,9 @@ This gem comes bundled with an OAuth2 wrapper that makes provides convenience me
 
 ```ruby
 
-require 'yammer-oauth2/client'
+require 'yammer'
 
-yammer_client = Yammmer::OAuth2Client.new('PRbTcg9qjgKsp4jjpm1pw', 'Xn7kp7Ly0TCY4GtZWkmSsqGEPg10DmMADyjWkf2U')
+yammer_client = Yammer::OAuth2Client.new('PRbTcg9qjgKsp4jjpm1pw', 'Xn7kp7Ly0TCY4GtZWkmSsqGEPg10DmMADyjWkf2U')
 
 ```
 
@@ -105,7 +105,7 @@ file. The supported grants include Authorization Code and Implicit. They are ava
 
 # generate authorization url
 auth_url = yammer_client.webserver_authorization_url
-# => https://www.yammer.com/dialog/oauth/authorize?client_id=PRbTcg9qjgKsp4jjpm1pw&response_type=code
+# => https://www.yammer.com/oauth2/authorize?client_id=PRbTcg9qjgKsp4jjpm1pw&response_type=code
 
 # exchange authorization code for access token. we will get back a Net::HTTPResponse
 response = yammer_client.access_token_from_authorization_code('11a0b0b64db56c30e2ef', { :redirect_uri => 'https://localhost/callback'})
@@ -124,8 +124,8 @@ response.body
 
 #### Implicit Grant (Client-side authorization)
 ```ruby
-authorization_url = yammer_client.clientside_authorization_url(:redirect_uri => 'http://localhost/oauth2/callback')
-# => "https://www.yammer.com/dialog/oauth/?client_id=PRbTcg9qjgKsp4jjpm1pw&redirect_uri=http%3A%2F%2Flocalhost%2Foauth%2Fcallback&response_type=token"
+authorization_url = yammer_client.webclient_authorization_url(:redirect_uri => 'http://localhost/oauth2/callback')
+# => "https://www.yammer.com/oauth2/authorize/?client_id=PRbTcg9qjgKsp4jjpm1pw&redirect_uri=http%3A%2F%2Flocalhost%2Foauth%2Fcallback&response_type=token"
 ```
 
 ## Configuring yammer-client

data/lib/yammer/oauth2_client.rb

@@ -18,8 +18,8 @@ module Yammer
   class OAuth2Client < OAuth2Client::Client
 
     SITE_URL       = 'https://www.yammer.com'
-    TOKEN_PATH     = '/oauth2/token'
-    AUTHORIZE_PATH = '/dialog/oauth'
+    TOKEN_PATH     = '/oauth2/access_token'
+    AUTHORIZE_PATH = '/oauth2/authorize'
 
     def initialize(client_id, client_secret, opts={})
       site_url = opts.delete(:site_url) || SITE_URL
@@ -37,11 +37,11 @@ module Yammer
     #
     # @opts [Hash] additional parameters to be include in URL eg. scope, state, etc
     #
-    # client = YammerClient.new(config)
-    # client.clientside_authorization_url({
+    # >> client = Yammer::OAuth2Client.new('ETSIGVSxmgZitijWZr0G6w', '4bJZY38TCBB9q8IpkeualA2lZsPhOSclkkSKw3RXuE')
+    # >> client.webclient_authorization_url({
     #      :redirect_uri => 'https://localhost/oauth/cb',
     #    })
-    # >> https://www.yammer.com/dialog/oauth/?client_id={client_id}&
+    # >> https://www.yammer.com/oauth2/authorize/?client_id={client_id}&
     #    redirect_uri=http%3A%2F%2Flocalhost%2Foauth%2Fcb&response_type=token
     #
     def webclient_authorization_url(opts={})
@@ -55,11 +55,11 @@ module Yammer
     #
     # @opts [Hash] additional parameters to be include in URL eg. scope, state, etc
     #
-    # >> client = YammerClient.new(config)
+    # >> client = Yammer::OAuth2Client.new('ETSIGVSxmgZitijWZr0G6w', '4bJZY38TCBB9q8IpkeualA2lZsPhOSclkkSKw3RXuE')
     # >> client.webserver_authorization_url({
     #      :redirect_uri => 'https://localhost/oauth/cb',
     #    })
-    # >> https://www.yammer.com/dialog/oauth/?client_id={client_id}&
+    # >> https://www.yammer.com/oauth2/authorize/?client_id={client_id}&
     #    redirect_uri=http%3A%2F%2Flocalhost%2Foauth%2Fcb&response_type=code
     #
     def webserver_authorization_url(opts={})
@@ -75,9 +75,8 @@ module Yammer
     # @opts [Hash] may include redirect uri and other query parameters
     #
     # >> client = YammerClient.new(config)
-    # >> client.exchange_auth_code_for_token({
+    # >> client.access_token_from_authorization_code('G3Y6jU3a', {
     #      :redirect_uri => 'https://localhost:3000/oauth/v2/callback',
-    #      :code => 'G3Y6jU3a',
     #    })
     #
     # POST /oauth2/access_token HTTP/1.1
@@ -95,6 +94,12 @@ module Yammer
     #
     # @opts [Hash] parameters that will be added to URL query string
     #
+    # >> client = Yammer::OAuth2Client.new('ETSIGVSxmgZitijWZr0G6w', '4bJZY38TCBB9q8IpkeualA2lZsPhOSclkkSKw3RXuE')
+    # >> client.access_token_from_client_credentials({
+    #      :client_id     => "ZitijWZr0",
+    #      :client_secret => "F8TCBB9q8IpkeualA2lZsPhOSc"
+    # })
+    #      
     # POST /oauth2/access_token HTTP/1.1
     # Host: www.yammer.com
     # Content-Type: application/x-www-form-urlencoded
@@ -109,6 +114,14 @@ module Yammer
     #
     # @opts [Hash] parameters that will be added to URL query string
     #
+    # >> client = Yammer::OAuth2Client.new('ETSIGVSxmgZitijWZr0G6w', '4bJZY38TCBB9q8IpkeualA2lZsPhOSclkkSKw3RXuE')
+    # >> client.access_token_from_client_credentials({
+    #      :client_id     => "ZitijWZr0",
+    #      :client_secret => "F8TCBB9q8IpkeualA2lZsPhOSc",
+    #      :email => "user@domain.com",
+    #      :password => "abc123"
+    # })
+    #
     # POST /oauth2/access_token HTTP/1.1
     # Host: www.yammer.com
     # Content-Type: application/x-www-form-urlencoded
@@ -119,4 +132,4 @@ module Yammer
       self.password.get_token(username, password, opts)
     end
   end
-end
+end

data/lib/yammer/version.rb

@@ -15,7 +15,7 @@
 module Yammer
   class Version
     MAJOR = 2 unless defined? Yammer::MAJOR
-    MINOR = 2 unless defined? Yammer::MINOR
+    MINOR = 3 unless defined? Yammer::MINOR
     PATCH = 0 unless defined? Yammer::PATCH
     PRE = nil unless defined? Yammer::PRE
 

data/spec/oauth2_client_spec.rb

@@ -48,7 +48,7 @@ describe Yammer::OAuth2Client do
       )
 
       parsed_url = Addressable::URI.parse(auth_url)
-      expect(parsed_url.path).to eq '/dialog/oauth'
+      expect(parsed_url.path).to eq '/oauth2/authorize'
       expect(parsed_url.query_values).to eq params
       expect(parsed_url.scheme).to eq 'https'
       expect(parsed_url.host).to eq 'www.yammer.com'
@@ -58,7 +58,7 @@ describe Yammer::OAuth2Client do
   describe "#access_token_from_authorization_code" do
     it "makes a POST request to exchange authorization code for access token" do
 
-      stub_request(:post, "https://www.yammer.com/oauth2/token").with(
+      stub_request(:post, "https://www.yammer.com/oauth2/access_token").with(
         :body => {
           :grant_type    => 'authorization_code',
           :code          => 'MmOGL795LbIZuJJVnL49Cc',
@@ -84,7 +84,7 @@ describe Yammer::OAuth2Client do
   describe "#access_token_from_client_credentials" do
     it "makes a POST request to exchange client credentiaks for access token" do
 
-      stub_request(:post, "https://www.yammer.com/oauth2/token").with(
+      stub_request(:post, "https://www.yammer.com/oauth2/access_token").with(
         :body => {
           :grant_type    => 'client_credentials',
           :client_id     => 'PRbTcg9qjgKsp4jjpm1pw',
@@ -103,7 +103,7 @@ describe Yammer::OAuth2Client do
   describe "#access_token_from_resource_owner_credentials" do
     it "makes a POST request to exchange client credentiaks for access token" do
 
-      stub_request(:post, "https://www.yammer.com/oauth2/token").with(
+      stub_request(:post, "https://www.yammer.com/oauth2/access_token").with(
         :body => {
           :grant_type    => 'password',
           :username      => 'thekev',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yam
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Kevin Mutyaba
@@ -29,7 +29,7 @@ cert_chain:
   B+kZ9/4dAvmKkr2NPSoxBQtO7Rz0HDNLtjMxkXbQUWMDsGnB6Kk1WUBb/w3kQ9Ah
   JgIHF4cG
   -----END CERTIFICATE-----
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj