lolcommits-yammer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3378d5ec0c2ad9ee8e6d941f9446161b73abd3e4
-  data.tar.gz: 1a1c1ccbc0c6b8454eb4c16a2eba222a836fcc0f
+  metadata.gz: c08eaf8175131baf2871fcd4970104c45955bd1b
+  data.tar.gz: edcb63a618c579c0079104e265b3d8bfdccf5336
 SHA512:
-  metadata.gz: 80a60dd1ad84e9ec146bf41e6fa03e67189f4e88d8aa594e16e4f76978017046147c696a289052bfa1544dbde27700c6f774328ab21df8aa4bfddcb9e1110d06
-  data.tar.gz: ec383a1ba1c2c9680ca7bc513c147cdc8237617999c564a59ab4ead02fb7bc725f8de822feb14d0de6c9556264ba9c9eff89c13c4d61bfe539604ca00f28f3c1
+  metadata.gz: 2fe5007c65c62d3d85d28b34580ab997f654610b170cab6a712ec584dfcd7f2e21ccae1b4f64368772894658099ecdc7cc12b5d7358b4fe272b0abc2c88ee916
+  data.tar.gz: 2f62b1962d901bbca44ff073da351212fa8fd75302448a5539af72d962d0b4f9b254ccae6b183628c13d114c353b48bccb426245c890889ad6cc0f3aa89db1fc

data/lib/lolcommits/plugin/yammer.rb

@@ -1,20 +1,19 @@
 require 'lolcommits/plugin/base'
 require 'lolcommits/cli/launcher'
-require 'net/http'
-require 'uri'
 require 'webrick'
+require 'rest-client'
 require 'cgi'
-require 'yammer'
 
 module Lolcommits
   module Plugin
     class Yammer < Base
 
-      YAMMER_CLIENT_ID        = 'abbxXRgeSagk9GtiWW9rFw'.freeze
-      YAMMER_CLIENT_SECRET    = 'gHVw5Ekyy2mWOWsBzrZPs5EPnR6s04RibApcbuy10'.freeze
-      YAMMER_ACCESS_TOKEN_URL = 'https://www.yammer.com/oauth2/access_token.json'.freeze
-      OAUTH_REDIRECT_PORT     = 5429
-      OAUTH_REDIRECT_URL      = "http://localhost:#{OAUTH_REDIRECT_PORT}".freeze
+      MESSAGES_API_URL    = "https://www.yammer.com/api/v1/messages".freeze
+      ACCESS_TOKEN_URL    = 'https://www.yammer.com/oauth2/access_token.json'.freeze
+      OAUTH_CLIENT_ID     = 'abbxXRgeSagk9GtiWW9rFw'.freeze
+      OAUTH_CLIENT_SECRET = 'gHVw5Ekyy2mWOWsBzrZPs5EPnR6s04RibApcbuy10'.freeze
+      OAUTH_REDIRECT_PORT = 5429
+      OAUTH_REDIRECT_URL  = "http://localhost:#{OAUTH_REDIRECT_PORT}".freeze
 
       ##
       # Returns the name of the plugin.
@@ -78,11 +77,14 @@ module Lolcommits
       #
       def run_capture_ready
         print "Posting to Yammer ... "
-        response = yammer.create_message(
-          yammer_message, attachment1: File.new(runner.main_image)
+        response = RestClient.post(
+          "https://www.yammer.com/api/v1/messages",
+          { body: yammer_message, attachment1: File.new(runner.main_image) },
+          { 'Authorization' => "Bearer #{configuration["access_token"]}" }
         )
-        debug response.body.inspect
+
         if response.code != 201
+          debug response.body.inspect
           raise "Invalid response code (#{response.code})"
         end
 
@@ -98,16 +100,6 @@ module Lolcommits
 
       private
 
-      def yammer
-        @yammer ||= begin
-          ::Yammer.configure do |c|
-            c.client_id = YAMMER_CLIENT_ID
-            c.client_secret = YAMMER_CLIENT_SECRET
-          end
-          ::Yammer::Client.new(access_token: configuration['access_token'])
-        end
-      end
-
       def yammer_message
         "#{runner.message} #lolcommits"
       end
@@ -126,12 +118,13 @@ module Lolcommits
 
           if @oauth_code
             debug "Requesting Yammer OAuth Token with code: #{@oauth_code}"
-
-            oauth_response = Net::HTTP.post_form(URI(YAMMER_ACCESS_TOKEN_URL), {
-              'client_id'     => YAMMER_CLIENT_ID,
-              'client_secret' => YAMMER_CLIENT_SECRET,
-              'code'          => @oauth_code
-            })
+            oauth_response = RestClient.post(ACCESS_TOKEN_URL,
+              {
+                'client_id'     => OAUTH_CLIENT_ID,
+                'client_secret' => OAUTH_CLIENT_SECRET,
+                'code'          => @oauth_code
+              }
+            )
 
             if oauth_response.code.to_i == 200
               return JSON.parse(oauth_response.body)['access_token']['token']
@@ -144,7 +137,7 @@ module Lolcommits
       end
 
       def authorize_url
-        "https://www.yammer.com/oauth2/authorize?client_id=#{YAMMER_CLIENT_ID}&response_type=code&redirect_uri=#{OAUTH_REDIRECT_URL}"
+        "https://www.yammer.com/oauth2/authorize?client_id=#{OAUTH_CLIENT_ID}&response_type=code&redirect_uri=#{OAUTH_REDIRECT_URL}"
       end
 
       def open_url(url)

data/lib/lolcommits/yammer/version.rb

@@ -1,5 +1,5 @@
 module Lolcommits
   module Yammer
-    VERSION = "0.0.2".freeze
+    VERSION = "0.0.3".freeze
   end
 end

data/lolcommits-yammer.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.0.0"
 
-  spec.add_runtime_dependency "yam"
+  spec.add_runtime_dependency "rest-client"
   spec.add_runtime_dependency "webrick"
 
   spec.add_development_dependency "lolcommits", ">= 0.9.5"

data/test/lolcommits/plugin/yammer_test.rb

@@ -71,12 +71,11 @@ describe Lolcommits::Plugin::Yammer do
 
           output.must_equal "Posting to Yammer ... done!\n"
           assert_requested :post, create_message_api_url, times: 1, headers: {
-            'Accept'          => 'application/json',
-            'Accept-Encoding' => 'gzip, deflate',
-            'Authorization'   => 'Bearer oV4MuwnNKql3ebJMAYZRaD',
-            'Content-Type'    => /multipart\/form-data/,
-            'User-Agent'      => /Yammer Ruby Gem/
-          }
+            'Authorization' => 'Bearer oV4MuwnNKql3ebJMAYZRaD',
+            'Content-Type'  => /multipart\/form-data/
+          } do |req|
+            req.body.must_match(/Content-Disposition: form-data;.+name="attachment1"; filename="main_image.jpg.+"/)
+          end
         end
       end
 
@@ -88,7 +87,7 @@ describe Lolcommits::Plugin::Yammer do
           output.split("\n").must_equal(
             [
               "Posting to Yammer ... failed :(",
-              "Yammer error: Invalid response code (503)",
+              "Yammer error: 503 Service Unavailable",
               "Try a lolcommits capture with `--debug` and check for errors: `lolcommits -c --debug`"
             ]
           )
@@ -137,11 +136,11 @@ describe Lolcommits::Plugin::Yammer do
           yammer_oauth_code  = "yam-oauth-code"
           klass              = plugin.class
 
-          stub_request(:post, klass::YAMMER_ACCESS_TOKEN_URL).with(
+          stub_request(:post, klass::ACCESS_TOKEN_URL).with(
             body: {
-              "client_id"     => klass::YAMMER_CLIENT_ID,
-              "client_secret" => klass::YAMMER_CLIENT_SECRET,
-              "code"          => yammer_oauth_code
+              "client_id"     => klass::OAUTH_CLIENT_ID,
+              "client_secret" => klass::OAUTH_CLIENT_SECRET,
+              "code"          => [yammer_oauth_code]
             }
           ).to_return(
             status: 200,
@@ -170,7 +169,7 @@ describe Lolcommits::Plugin::Yammer do
   private
 
   def create_message_api_url
-    "https://www.yammer.com/api/v1/messages"
+    plugin.class::MESSAGES_API_URL
   end
 
   # fake click for the authorize step in Yammer, by hitting local webrick server

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits-yammer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Matthew Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: yam
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="