yammer-oauth2 0.1.1 → 0.2.0

data/.gitignore

@@ -11,6 +11,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock
 
 # YARD artifacts
 .yardoc

data/.travis.yml

@@ -3,5 +3,7 @@ rvm:
   - "1.8.7"
   - "1.9.2"
   - "1.9.3"
-# uncomment this line if your project needs to run something other than `rake`:
-# # script: bundle exec rspec spec
+
+branches:
+  only:
+    - master

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.1.3
+------
+Changed argument order. This change will break things.
+
 0.1.0
 -----
 * [Initial release](https://github.com/tiabas/yammer-oauth2/commit/036104d420fb34b64115e58f928a1bfbbfa8bde4)

data/Gemfile

@@ -7,7 +7,7 @@ group :test do
   gem 'rspec', '>= 2.11'
   gem 'simplecov', :require => false
   gem 'coveralls', :require => false
-  gem 'webmock'
+  gem 'webmock', '~> 1.10.1'
 end
 
 gemspec

data/README.md

@@ -70,7 +70,7 @@ response.body
 
 ### Implicit Grant
 ```ruby
-auth_url = client.implicit.authorization_path(:redirect_uri => 'http://localhost/oauth2/callback')
+auth_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"
 ```
 

data/lib/yammer-oauth2/client.rb

@@ -3,11 +3,17 @@ require 'oauth2'
 module YammerOAuth2
   class Client < OAuth2::Client
 
-    def initialize(*args)
-      super
+    DEFAULT_URL = 'https://www.yammer.com'
+
+    def initialize(client_id, client_secret, opts={})
+      site_url = opts.delete(:site_url) || DEFAULT_URL
+      super(site_url, client_id, client_secret, opts)
       @token_path     = '/oauth2/token'
       @authorize_path = '/dialog/oauth/authorize'
+      yield self if block_given?
+      self
     end
+
     # Generates the Yammer URL that the user will be redirected to in order to
     # authorize your application
     #

data/lib/yammer-oauth2/version.rb

@@ -1,8 +1,8 @@
 module YammerOAuth2
   class Version
     MAJOR = 0 unless defined? MAJOR
-    MINOR = 1 unless defined? MINOR
-    PATCH = 1 unless defined? PATCH
+    MINOR = 2 unless defined? MINOR
+    PATCH = 0 unless defined? PATCH
 
     def self.to_s
       [MAJOR, MINOR, PATCH].compact.join('.')

data/spec/client_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('../spec_helper', __FILE__)
 describe YammerOAuth2::Client do
 
   subject do
-    YammerOAuth2::Client.new('https://www.yammer.com', 'PRbTcg9qjgKsp4jjpm1pw', 'a2nQpcUm2Dgq1chWdAvbXGTk', {
+    YammerOAuth2::Client.new('PRbTcg9qjgKsp4jjpm1pw', 'a2nQpcUm2Dgq1chWdAvbXGTk', {
       :connection_options => {
         :headers => {
           'User-Agent' => "Yammer OAuth2 Gem #{YammerOAuth2::Version}",

data/yammer-oauth2.gemspec

@@ -3,11 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'yammer-oauth2/version'
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'oauth2-client', '~> 1.1.2'
-  spec.add_development_dependency 'bundler', '~> 1.0'
-
   spec.authors          = ["Kevin Mutyaba"]
-  spec.date             = %q{2013-03-03}
+  spec.date             = %q{2013-04-22}
   spec.description      = "A Yammer OAuth2 wrapper"
   spec.email            = %q{tiabasnk@gmail.com}
   spec.files            = `git ls-files`.split("\n")
@@ -20,5 +17,8 @@ Gem::Specification.new do |spec|
   spec.version          = YammerOAuth2::Version
 
   spec.cert_chain       = ['certs/tiabas-public.pem']
-  spec.signing_key      = File.expand_path("~/.gem/certs/private_key.pem")
+  spec.signing_key      = File.expand_path("~/.gem/certs/private_key.pem") if $0 =~ /gem\z/
+
+  spec.add_dependency 'oauth2-client', '~> 1.1.2'
+  spec.add_development_dependency 'bundler', '~> 1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yammer-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,7 @@ cert_chain:
   OGZyVURBOQpqNmZBVGcvNGZxcGdJTFBWcUZJR1pPTUpERmNKeS9vZWh3d3hM
   dTVYTXg4OFdGRDlqVDF2Umo3N0Q3aVBMYlhkCnJmR3MvcUNKS2dpZlhkLzFh
   bTVobEFINWpYVT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2-client
@@ -82,7 +82,6 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
@@ -119,3 +118,4 @@ signing_key:
 specification_version: 3
 summary: OAuth2 client wrapper for Yammer
 test_files: []
+has_rdoc: 

data/Gemfile.lock

@@ -1,58 +0,0 @@
-PATH
-  remote: .
-  specs:
-    yammer-oauth2 (0.1.0)
-      oauth2-client (~> 1.1.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.3)
-    bcrypt-ruby (3.0.1)
-    colorize (0.5.8)
-    coveralls (0.6.0)
-      colorize
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    crack (0.3.2)
-    diff-lcs (1.2.1)
-    json (1.7.7)
-    mime-types (1.21)
-    multi_json (1.6.1)
-    oauth2-client (1.1.2)
-      addressable
-      bcrypt-ruby (~> 3.0.0)
-    rake (10.0.3)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    thor (0.17.0)
-    webmock (1.10.1)
-      addressable (>= 2.2.7)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0)
-  coveralls
-  json
-  rake
-  rspec (>= 2.11)
-  simplecov
-  webmock
-  yammer-oauth2!