yammer-client 0.1.2 → 0.1.3

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - "1.8.7"
   - "1.9.2"
   - "1.9.3"
+  - "2.0.0"
 
 branches:
   only:

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+0.1.3
+====================================
+- Added Support for pending attachments
+- More tests coverage
+- Cleaned up Client class
+- Switched to RestClient for HTTP requests
+- Made changes to model base to get more stability
+
+0.1.2
+====================================
+
+- Made object model more stable
+- Updated README
+- Cleaned up tests
+
+0.1.1
+====================================
+- Support for more endpoints
+
+0.1.0
+====================================
+Initial commit

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem 'json', :platforms => :ruby_18
+  # gem 'json', :platforms => :ruby_18
   gem 'rspec', '>= 2.11'
   gem 'simplecov', :require => false
   gem 'coveralls', :require => false

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    yammer-client (0.1.2)
+    yammer-client (0.1.3)
       addressable (~> 2.3.3)
       multi_json (~> 1.3)
       oauth2-client (~> 1.1.2)
       oj (~> 2.0.10)
+      rest-client (~> 1.6.7)
 
 GEM
   remote: https://rubygems.org/
@@ -21,14 +22,13 @@ GEM
       thor
     crack (0.3.2)
     diff-lcs (1.2.1)
-    json (1.7.5)
     mime-types (1.21)
     multi_json (1.6.1)
     oauth2-client (1.1.2)
       addressable
       bcrypt-ruby (~> 3.0.0)
     oj (2.0.10)
-    rake (10.0.3)
+    rake (10.0.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.13.0)
@@ -53,7 +53,6 @@ PLATFORMS
 
 DEPENDENCIES
   coveralls
-  json
   rake
   rspec (>= 2.11)
   simplecov

data/README.md

@@ -89,7 +89,7 @@ To view the current state of the client use the `options` method
 require 'yammer'
 
 Yammer.options
-#> {:site_url=>"https://www.yammer.com", :client_id=>nil, :client_secret=>nil, :access_token=>nil, :http_adapter=>Yammer::HttpConnection, :connection_options=>{:max_redirects=>5, :use_ssl=>true}} 
+#> {:site_url=>"https://www.yammer.com", :client_id=>nil, :client_secret=>nil, :access_token=>nil, :http_adapter=>Yammer::Connection, :connection_options=>{:max_redirects=>5, :use_ssl=>true}} 
 ```
 
 You may change this configuration by using the `configure` method
@@ -107,7 +107,7 @@ At this point, your new settings will take effect
 
 ```ruby
 Yammer.options
-#> {:site_url=>"https://www.yammer.com", :client_id=>'[client_id]', :client_secret=>'[client_secret]', :access_token=>'[access_token]', :http_adapter=>Yammer::HttpConnection, :connection_options=>{ :max_redirects=>5, :use_ssl=>true }} 
+#> {:site_url=>"https://www.yammer.com", :client_id=>'[client_id]', :client_secret=>'[client_secret]', :access_token=>'[access_token]', :http_adapter=>Yammer::Connection, :connection_options=>{ :max_redirects=>5, :use_ssl=>true }} 
 ```
 
 ## Usage
@@ -135,21 +135,21 @@ yamr = Yammer::Client.new(
 
 ```ruby
 yamr.get_user_by_email('user@example.com')
-#<Yammer::Response:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
+#<Yammer::ApiResponse:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
 ```
 
 *find a user by user id*
 
 ```ruby
 yamr.get_user('1588')
-#<Yammer::Response:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
+#<Yammer::ApiResponse:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
 ```
 
 *get the current user*
 
 ```ruby
 yamr.current_user
-#<Yammer::Response:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
+#<Yammer::ApiResponse:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
 ```
 
 
@@ -159,21 +159,21 @@ yamr.current_user
 
 ```ruby
 yamr.create_message(:body => 'status update')
-#<Yammer::Response:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
+#<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)
-#<Yammer::Response:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
+#<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")
-#<Yammer::Response:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
+#<Yammer::ApiResponse:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
 ```
 
 
@@ -183,7 +183,7 @@ yamr.create_message(:body => 'here is my open graph object', og_url: "https://ww
 
 ```ruby
 yamr.search(:search => 'thekev', :model_types => 'users;groups')
-#<Yammer::Response:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
+#<Yammer::ApiResponse:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
 ```
 
 **Thread**
@@ -192,7 +192,7 @@ yamr.search(:search => 'thekev', :model_types => 'users;groups')
 
 ```ruby
 yamr.get_thread(42)
-#<Yammer::Response:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
+#<Yammer::ApiResponse:0x007fb949434ec8 @headers=#<Net::HTTPOK 200 OK readbody=true>, @body="[JSON Response]", @code=200>
 ```
 
 
@@ -259,6 +259,7 @@ version:
 * Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
+* Ruby 2.0.0
 
 This library may inadvertently work (or seem to work) on other Ruby
 implementations, however support will only be provided for the versions listed

data/file.txt

@@ -0,0 +1 @@
+will code for food and money

data/lib/yammer.rb

@@ -1,9 +1,11 @@
 require 'yammer/version'
 require 'yammer/error'
-require 'yammer/http_connection'
 require 'yammer/configurable'
-require 'yammer/response'
+require 'yammer/api'
+require 'yammer/http_adapter'
 require 'yammer/client'
+require 'yammer/api_handler'
+require 'yammer/api_response'
 require 'yammer/identity_map'
 require 'yammer/base'
 require 'yammer/user'
@@ -11,23 +13,17 @@ require 'yammer/group'
 require 'yammer/group_membership'
 require 'yammer/message'
 require 'yammer/thread'
-require 'yammer/api'
 
 module Yammer
   class << self
     include Configurable
-
-    def client
-      @client = Yammer::Client.new
-    end
+    include ApiHandler
 
   private
-
     def method_missing(method_name, *args, &block)
-      return super unless client.respond_to?(method_name)
-      client.send(method_name, *args, &block)
+      return super unless api_handler.respond_to?(method_name)
+      api_handler.send(method_name, *args, &block)
     end
   end
 end
-
 Yammer.reset!

data/lib/yammer/api.rb

@@ -7,4 +7,5 @@ require 'yammer/api/search'
 require 'yammer/api/topic'
 require 'yammer/api/autocomplete'
 require 'yammer/api/network'
-require 'yammer/api/notification'
+require 'yammer/api/notification'
+require 'yammer/api/pending_attachment'

data/lib/yammer/api/autocomplete.rb

@@ -7,7 +7,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication authenticated user context
       # @raise [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [String] :prefix 
       # @option opts [String] :models 

data/lib/yammer/api/group.rb

@@ -6,7 +6,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param [Hash] opts the opts to fetch a thread with
       # @option opts [Integer] :page
       # @option opts [String] :sort_by sort groups by created_on, creator, name default order is by number of messages
@@ -21,7 +21,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the group ID
       # @example Fetch data for the thread
       #   Yammer.get_group(74)
@@ -33,7 +33,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param [Hash] opts the opts to fetch a thread with
       # @option opts [String] :name
       # @option opts [String] :description
@@ -49,7 +49,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the group ID
       # @param [Hash] opts
       # @option opts [String] :name
@@ -66,7 +66,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the group ID
       # @example Fetch data for the thread
       #   Yammer.groups_for_user(74)

data/lib/yammer/api/group_membership.rb

@@ -7,7 +7,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the group membership ID
       # @example Fetch data for the thread
       #   Yammer.get_group_membership(7)
@@ -20,7 +20,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the group ID
       # @example Fetch data for the thread
       #   Yammer.create_group_membership(74)

data/lib/yammer/api/message.rb

@@ -7,7 +7,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
       # @example Fetch data for the thread
@@ -21,7 +21,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the thread ID
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
@@ -36,7 +36,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the thread ID
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
@@ -51,7 +51,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
       # @example Fetch data for the thread
@@ -65,7 +65,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
       # @example Fetch data for the thread
@@ -79,7 +79,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
       # @example Fetch data for the thread
@@ -93,7 +93,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
       # @example Fetch data for the thread
@@ -107,7 +107,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
       # @example Fetch data for the thread
@@ -121,7 +121,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the thread ID
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
@@ -136,7 +136,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the thread ID
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
@@ -151,7 +151,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the thread ID
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
@@ -166,7 +166,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the thread ID
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than
@@ -181,7 +181,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param id [Integer] the thread ID
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Integer] :newer_than

data/lib/yammer/api/network.rb

@@ -7,7 +7,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication authenticated user context
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @param [Hash] opts the options to fetch a thread with
       # @option opts [Boolean] :include_suspended
       # @option opts [Boolean] :exclude_own_messages_from_unseen

data/lib/yammer/api/notification.rb

@@ -7,7 +7,7 @@ module Yammer
       # @rate_limited Yes
       # @authentication authenticated user context
       # @raise [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Yammer::Response]
+      # @return [Yammer::ApiResponse]
       # @example Fetch notifications for authenticated user
       #   Yammer.notifications
       def notifications

data/lib/yammer/api/pending_attachment.rb

@@ -0,0 +1,48 @@
+module Yammer
+  module Api
+    module PendingAttachment
+
+      # Create a new pending attachment owned by authenticated user
+      # @see https://developer.yammer.com/restapi/#rest-messages
+      # @api_path /api/v1/pending_attachments
+      # @rate_limited Yes
+      # @authentication User context
+      # @raise [Yammer::Error::Unauthorized Yammer::Error::Forbidden] Error when supplied user credentials are not valid
+      #   when user network does not allow attachments
+      # @return [Yammer::ApiResponse]
+      # @example Fetch existing pending attachment
+      #   Yammer.get_pending_attachment(62)
+      def get_pending_attachment(id)
+        get("/api/v1/pending_attachments/#{id}")
+      end
+
+      # Delete a pending attachment owned by the authenticated user
+      # @see https://developer.yammer.com/restapi/#rest-messages
+      # @api_path /api/v1/pending_attachments
+      # @rate_limited Yes
+      # @authentication User context
+      # @raise [Yammer::Error::Unauthorized Yammer::Error::NotFound] Error raised when supplied user credentials are not valid
+      #   when attachment cannot be found
+      # @return [Yammer::ApiResponse]
+      # @example Delete existing pending attachment
+      #   Yammer.delete_pending_attachment(34)
+      def delete_pending_attachment(id)
+        delete("/api/v1/pending_attachments/#{id}")
+      end
+
+      # Fetch a pending attachment owned by authenticated user
+      # @see https://developer.yammer.com/restapi/#rest-messages
+      # @api_path /api/v1/pending_attachments
+      # @rate_limited Yes
+      # @authentication User context
+      # @raise [Yammer::Error::Unauthorized Yammer::Error::NotFound] Error raised when supplied user credentials are not valid
+      #   when attachment cannot be found
+      # @return [Yammer::ApiResponse]
+      # @example Create new pending attachment
+      #   Yammer.create_pending_attachment
+      def create_pending_attachment(attachment)
+        post("/api/v1/pending_attachments", :attachment => attachment)
+      end
+    end
+  end
+end