yammer-client 0.1.6 → 0.1.7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.1.7
+====================================
+- Fixed a bug where by access token go cached and was cleared when config changed
+- Updated README
+
 0.1.4
 ====================================
 - Added support for invitations

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yammer-client (0.1.6)
+    yammer-client (0.1.7)
       addressable (~> 2.3.3)
       multi_json (~> 1.3)
       oj (~> 2.0.10)

data/README.md

@@ -158,21 +158,21 @@ yamr.current_user
 *post a update as the current user*
 
 ```ruby
-yamr.create_message(:body => 'status update')
+yamr.create_message('status update')
 #<Yammer::ApiResponse:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
 ```
 
 *send a private message to another Yammer user*
 
 ```ruby
-yamr.create_message(:body => 'private message', :direct_to_id => 24)
+yamr.create_message('private message', :direct_to_id => 24)
 #<Yammer::ApiResponse:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
 ```
 
 *send a message with an Open Graph Object as an attachment*
 
 ```ruby
-yamr.create_message(:body => 'here is my open graph object', og_url: "https://www.yammer.com/example/graph/31415926")
+yamr.create_message('here is my open graph object', :og_url => "https://www.yammer.com/example/graph/31415926")
 #<Yammer::ApiResponse:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
 ```
 

data/lib/yammer.rb

@@ -19,6 +19,10 @@ module Yammer
     include Configurable
     include ApiHandler
 
+    def to_s
+      "<#{self.name}: #{self.options.inspect}>"
+    end
+
   private
     def method_missing(method_name, *args, &block)
       return super unless api_handler.respond_to?(method_name)

data/lib/yammer/api_handler.rb

@@ -1,15 +1,13 @@
 module Yammer
   module ApiHandler
+
     def api_handler
-      @api_handler ||= establish_api_handler
+      establish_api_handler
     end
 
     def establish_api_handler(opts={})
       Yammer::Client.new(opts)
     end
 
-    def reset_api_handler!
-      @api_handler = nil
-    end
   end
 end

data/lib/yammer/client.rb

@@ -22,7 +22,7 @@ module Yammer
     include Yammer::Api::Subscription
     include Yammer::Api::OpenGraphObject
 
-    attr_reader :site_url, :headers, :connection_options
+    attr_reader :site_url, :default_headers, :connection_options
 
     attr_accessor :client_id, :client_secret, :access_token
 
@@ -75,10 +75,10 @@ module Yammer
     # @return [Yammer::ApiResponse]
     # @!visibility private
     def request(method, path, params={})
-      @headers['Authorization'] ||= "Bearer #{@access_token}"
+      headers = @default_headers.merge({'Authorization' => "Bearer #{@access_token}"})
       result = http_client.send_request(method, path, {
-        :params => params,
-        :headers => @headers
+        :params  => params,
+        :headers => headers
       })
       result
     end

data/lib/yammer/configurable.rb

@@ -7,7 +7,7 @@ module Yammer
     HTTP_ADAPTER = Yammer::HttpAdapter unless defined? HTTP_CONNECTION
 
     attr_accessor :client_id, :client_secret, :access_token, :site_url,
-    :connection_options, :headers, :http_adapter
+    :connection_options, :default_headers, :http_adapter
 
     # Return a hash with the default options
     # @return [Hash]
@@ -19,7 +19,7 @@ module Yammer
         :access_token       => ENV['YAMMER_ACCESS_TOKEN'],
         :http_adapter       => HTTP_ADAPTER,
         :connection_options => { :max_redirects => 5, :verify_ssl => true },
-        :headers            => {
+        :default_headers    => {
           'Accept'     => 'application/json',
           'User-Agent' => "Yammer Ruby Gem #{Yammer::Version}"
         }

data/lib/yammer/version.rb

@@ -2,7 +2,7 @@ module Yammer
   class Version
     MAJOR = 0 unless defined? Yammer::MAJOR
     MINOR = 1 unless defined? Yammer::MINOR
-    PATCH = 6 unless defined? Yammer::PATCH
+    PATCH = 7 unless defined? Yammer::PATCH
     PRE = nil unless defined? Yammer::PRE
 
     class << self

data/spec/client_spec.rb

@@ -9,7 +9,7 @@ describe Yammer::Client do
       :client_secret => 'Xn7kp7Ly0TCY4GtZWkmSsqGEPg10DmMADyjWkf2U',
       :access_token  => 'TolNOFka9Uls2DxahNi78A',
       :connection_options => { :max_redirects => 5, :use_ssl => true },
-      :headers       => {"Accept"=>"application/json", "User-Agent"=>"Yammer Ruby Gem #{Yammer::Version}"}
+      :default_headers    => {"Accept"=>"application/json", "User-Agent"=>"Yammer Ruby Gem #{Yammer::Version}"}
     }
 
     Yammer.configure do |config|
@@ -29,11 +29,11 @@ describe Yammer::Client do
 
     before :each do
       @default_conf = {
-        :site_url      => nil,
-        :client_id     => nil,
-        :client_secret => nil,
-        :access_token  => nil,
-        :headers       => {"Accept"=>"application/json", "User-Agent"=>"Yammer Ruby Gem #{Yammer::Version}"},
+        :site_url         => nil,
+        :client_id        => nil,
+        :client_secret    => nil,
+        :access_token     => nil,
+        :default_headers  => {"Accept"=>"application/json", "User-Agent"=>"Yammer Ruby Gem #{Yammer::Version}"},
         :connection_options => {}
       }
       Yammer.configure do |config|
@@ -61,7 +61,7 @@ describe Yammer::Client do
           :client_id          => 'PRbTcg9qjgKsp4jjpm1pw',
           :client_secret      => 'Xn7kp7Ly0TCY4GtZWkmSsqGEPg10DmMADyjWkf2U',
           :access_token       => 'TolNOFka9Uls2DxahNi78A',
-          :headers            => {"Accept"=>"application/json", "User-Agent"=>"Yammer Ruby Gem 0.1.1"},
+          :default_headers    => {"Accept"=>"application/json", "User-Agent"=>"Yammer Ruby Gem 0.1.1"},
           :connection_options => { :max_redirects => 5, :use_ssl => true }
         }
       end
@@ -155,7 +155,7 @@ describe Yammer::Client do
         path = '/users'
         params = {:first_name => 'john', :last_name => 'smith'}
         query  = Addressable::URI.form_encode(params)
-        headers = {'Content-Type' => 'application/x-www-form-urlencoded' }.merge(subject.headers)
+        headers = {'Content-Type' => 'application/x-www-form-urlencoded' }.merge(subject.default_headers)
 
         stub_request(:post, "https://www.yammer.com/users").with(
           :body => {
@@ -178,7 +178,7 @@ describe Yammer::Client do
         path = '/users/1'
         params = {:first_name => 'jane', :last_name => 'doe'}
         query  = Addressable::URI.form_encode(params)
-        headers = {'Content-Type' => 'application/x-www-form-urlencoded' }.merge(subject.headers)
+        headers = {'Content-Type' => 'application/x-www-form-urlencoded' }.merge(subject.default_headers)
 
         stub_request(:put, "https://www.yammer.com/users/1").with(
           :body => {

data/yammer.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name             = 'yammer-client'
   s.version          = Yammer::Version
 
-  s.date             = %q{2013-05-28}
-  s.summary          = "Yammer API Client - beta"
+  s.date             = %q{2013-06-13}
+  s.summary          = "Yammer API Client"
   s.description      = "A Ruby wrapper for accessing Yammer's REST API"
   s.authors          = ["Kevin Mutyaba"]
   s.email            = %q{tiabasnk@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yammer-client
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   TlNPdFE1OTMySERFb28wRjluWElNWkdRU0xxRVh6M2wKQitrWjkvNGRBdm1L
   a3IyTlBTb3hCUXRPN1J6MEhETkx0ak14a1hiUVVXTURzR25CNktrMVdVQmIv
   dzNrUTlBaApKZ0lIRjRjRwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -280,7 +280,7 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Yammer API Client - beta
+summary: Yammer API Client
 test_files:
 - spec/api/autocomplete_spec.rb
 - spec/api/group_membership_spec.rb