yammer4r 0.1.4 → 0.1.5

data/Rakefile

@@ -0,0 +1,13 @@
+$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
+ 
+require 'rubygems'
+require 'rake'
+require 'spec/rake/spectask'
+require 'yammer4r'
+
+desc "Run all specs"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_files = FileList['spec/**/*spec.rb']
+end
+
+task :default => [:spec]

data/TODO

@@ -0,0 +1,2 @@
+Test! There are currently no tests for yammer4r, and that makes me very sad.
+Switch to HTTParty instead of yammer_request.  

data/bin/yammer_create_oauth_yml.rb

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+
+# Instructions:
+#
+# Register your application at https://www.yammer.com/client_applications/new
+# Upon successful registration, you'll recieve your consumer key and secret.
+# Pass these values on the command line as --key (-k) and --secret (-s) then
+# follow the instructions.
+
+require 'optparse'
+require 'rubygems'
+require 'oauth'
+
+OPTIONS = {
+  :outfile  => 'oauth.yml'
+}
+
+YAMMER_OAUTH = "https://www.yammer.com" 
+
+ARGV.options do |o|
+  script_name = File.basename($0)
+  
+  o.set_summary_indent('  ')
+  o.banner =    "Usage: #{script_name} [OPTIONS]"
+  o.define_head "Create a yaml file for yammer oauth"
+  o.separator   ""
+  o.separator   "[-k] and [-s] options are mandatory"
+  o.separator   ""
+  
+  o.on("-o", "--outfile=[val]", String,
+       "Yaml output file",
+       "Default: #{OPTIONS[:outfile]}")     { |OPTIONS[:outfile]| }
+  o.on("-k", "--key=val", String,
+       "Consumer key for Yammer app")       { |key| OPTIONS[:key] = key}
+  o.on("-s", "--secret=val", String,
+       "Consumer secret for Yammer app")    { |secret| OPTIONS[:secret] = secret}
+  
+  o.separator ""
+
+  o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
+  o.parse!
+end
+
+unless OPTIONS[:key] && OPTIONS[:secret]
+  raise ArgumentError, "Must supply consumer key and secret (use -h for help)"
+end
+
+consumer      = OAuth::Consumer.new OPTIONS[:key], OPTIONS[:secret], {:site => YAMMER_OAUTH}
+request_token = consumer.get_request_token
+
+puts "Please visit the following URL in your browser to authorize your application, then enter the 4 character security code when done: #{request_token.authorize_url}"
+oauth_verifier =  gets
+response = consumer.token_request(consumer.http_method, 
+                                  (consumer.access_token_url? ? consumer.access_token_url : consumer.access_token_path),
+                                  request_token, 
+                                  {}, 
+                                  :oauth_verifier =>  oauth_verifier.chomp)
+access_token = OAuth::AccessToken.new(consumer,response[:oauth_token],response[:oauth_token_secret])
+
+oauth_yml = <<-EOT
+consumer:
+  key: #{OPTIONS[:key]}
+  secret: #{OPTIONS[:secret]}
+access:
+  token: #{access_token.token}
+  secret: #{access_token.secret}
+EOT
+
+File.open(OPTIONS[:outfile], "w") do |f|
+  f.write oauth_yml
+end

data/lib/yammer/client.rb

@@ -13,6 +13,7 @@ module Yammer
       end
 
       consumer = OAuth::Consumer.new(options[:consumer][:key], options[:consumer][:secret], :site => yammer_url)
+      consumer.http.set_debug_output($stderr) if options[:verbose] == true
       @access_token = OAuth::AccessToken.new(consumer, options[:access][:token], options[:access][:secret])
     end
 
@@ -28,7 +29,7 @@ module Yammer
       ml = parsed_response['messages'].map do |m|
          mash(m)
       end
-        Yammer::MessageList.new(ml, older_available, self)
+      Yammer::MessageList.new(ml, older_available, self)
     end
 
     # POST or DELETE a message
@@ -37,10 +38,9 @@ module Yammer
       yammer_request(action, params)
     end
 
-    def users
-      JSON.parse(yammer_request(:get, {:resource => :users}).body).map do |u|
-        Yammer::User.new(mash(u), self)
-      end
+    def users(params = {})
+      params.merge!(:resource => :users)
+      JSON.parse(yammer_request(:get, params).body).map { |u| Yammer::User.new(mash(u), self) }
     end
 
     def user(id)

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require 'yammer4r'
+require 'spec'

data/spec/yammer/client_spec.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ostruct'
+
+describe Yammer::Client do
+  
+  context "creating" do
+  
+    before(:each) do
+      mock_consumer = mock(OAuth::Consumer)
+      OAuth::Consumer.stub!("new").and_return(mock_consumer)
+      @mock_http = mock("http")
+      mock_consumer.stub!("http").and_return(@mock_http)
+    end
+  
+    it "can be configured to be verbose" do
+      @mock_http.should_receive("set_debug_output").with($stderr)
+      Yammer::Client.new(:consumer => {}, :access => {}, :verbose => true)
+    end
+
+    it "should not be configured to be verbose unless asked to be" do
+      @mock_http.should_not_receive("set_debug_output")
+      Yammer::Client.new(:consumer => {}, :access => {})
+    end
+
+    it "should not be configured to be verbose if asked not to be" do
+      @mock_http.should_not_receive("set_debug_output")
+      Yammer::Client.new(:consumer => {}, :access => {}, :verbose => false)
+    end
+
+  end  
+  
+  context "users" do
+    
+    before(:each) do
+      @mock_access_token = mock(OAuth::AccessToken)
+      @response = OpenStruct.new(:code => 200, :body => '{}')
+      OAuth::AccessToken.stub!("new").and_return(@mock_access_token)
+      @client = Yammer::Client.new(:consumer => {}, :access => {})
+    end
+    
+    it "should request the first page by default" do
+      @mock_access_token.should_receive("get").with("/api/v1/users.json").and_return(@response)
+      @client.users
+    end
+    
+    it "can request a specified page" do
+      @mock_access_token.should_receive("get").with("/api/v1/users.json?page=2").and_return(@response)
+      @client.users(:page => 2)
+    end
+    
+  end  
+  
+end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: yammer4r
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jim Patterson
 - Jason Stewart
+- Peter Moran
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 -04:00
+date: 2009-12-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +45,7 @@ dependencies:
         version: 0.3.5
     version: 
 description: Yammer4R provides an object based API to query or update your Yammer account via pure Ruby.  It hides the ugly HTTP/REST code from your code.
-email: jimp79@gmail.com
+email: workingpeter@gmail.com
 executables: []
 
 extensions: []
@@ -55,14 +56,19 @@ files:
 - README
 - example.rb
 - oauth.yml.template
+- Rakefile
+- TODO
+- bin/yammer_create_oauth_yml.rb
 - lib/yammer4r.rb
 - lib/yammer/client.rb
 - lib/yammer/message.rb
 - lib/yammer/message_list.rb
 - lib/yammer/user.rb
 - lib/ext/core_ext.rb
+- spec/spec_helper.rb
+- spec/yammer/client_spec.rb
 has_rdoc: true
-homepage: http://github.com/jpatterson/yammer4r
+homepage: http://github.com/pmoran/yammer4r
 licenses: []
 
 post_install_message: