peertransfer_chat 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5bbdac3d964c554f5b08d7820a9e9ee13a0b3587
-  data.tar.gz: 0432d40850c197488c997af30216a80e833e0bff
+SHA256:
+  metadata.gz: 9c28b8b6798c36f859bf9fa63d12fcfb372ad3c5d2bf8bbfaad56283687fdf22
+  data.tar.gz: a8660d1c881f00574c989093cbd9785b546ba338d3af408863c04d975f327d0b
 SHA512:
-  metadata.gz: 184a0c1249dc3bd4ba6c97a681bf53c486933ed47a9c58ea5f341f0ab44108ce532ee54d669ee76d52f0da1c7301059cca1fe070b1ae619d9b435ba7913637f9
-  data.tar.gz: 3794ea9a639eecefcd1502659802c2373500e660daf3822c71c6eec0725493ee04ac3df074b84381f0be231cc192b21d13be585a0af0f5d37588d3db71d76328
+  metadata.gz: 31aa7028b318466037262af551f3f54e32584cb55659a2a8fa8bfbf6f84f4b821dc1a02e9f107510d05a0e15321ac3914c7af0ca22a60fdff5ac943a303fb418
+  data.tar.gz: 80ac78dbdbf6b67e73adfd9b23dfa8c0aadb2d70e34bbdfe653cac50f4c968a11d37ecc0a470a7346866ed45f99778b3aee9ada95a18a8d6262876e45fc67a1d

data/README.md

@@ -29,8 +29,7 @@ Configure the chat client:
 
 ```ruby
 PeertransferChat.configure do |config|
-  config.team = team_name
-  config.incoming_token = team_token
+  config.api_token = api_token
   config.channel = team_channel
   config.username = team_username
 end
@@ -48,9 +47,6 @@ PeertransferChat::Client.upload('/path/to/a/file.txt')
 ```
 
 ## Slack settings description
- - `team` Your team
  - `channel` Channel name
  - `api_token` This token comes from your user https://api.slack.com/web
  - `rtm_token` Real time messaging, you can find it in integration -> bot -> token
- - `incomming_token` Incoming web hook token, you can create one in  integration -> incomming webhooks
- - `channel_id` Channel id you can find it in the code of your slack team web page

data/lib/peertransfer_chat/client.rb

@@ -1,4 +1,4 @@
-require 'slackr'
+require 'slack-ruby-client'
 
 class PeertransferChat
   class Client
@@ -20,38 +20,36 @@ class PeertransferChat
     end
 
     def upload(filename, opts = {})
-      slack = Slackr.connect(team, api_token, slack_opts)
-      slack.upload(filename, { 'channels' => channel_id}.merge(opts))
+      client.files_upload(
+        channels: channel,
+        as_user: true,
+        file: Faraday::UploadIO.new(filename, 'image/png'),
+        title: 'output.txt',
+        filename: filename,
+        initial_comment: 'Attachment'
+      )
     end
 
     def speak(message)
-      slack = Slackr.connect(team, incoming_token, slack_opts)
-      slack.say(message)
+      client.chat_postMessage(channel: channel, text: message, as_user: true, username: username)
     end
 
     private
 
-    def team
-      config.team
+    def client
+      @client ||= Slack::Web::Client.new(token: api_token)
     end
 
-    def incoming_token
-      config.incoming_token
+    def channel
+      config.channel
     end
 
     def api_token
       config.api_token
     end
 
-    def channel_id
-      config.channel_id
-    end
-
-    def slack_opts
-      {
-        'channel' => config.channel,
-        'username' => config.username
-      }
+    def username
+      config.username
     end
 
     def config

data/lib/peertransfer_chat/config.rb

@@ -1,11 +1,11 @@
 class PeertransferChat
   class Config
-    SETTINGS = [:team, :channel, :incoming_token, :username, :api_token, :channel_id]
+    SETTINGS = [:channel, :username, :api_token]
 
     attr_accessor(*SETTINGS)
 
     def valid?
-      @team && @channel && @incoming_token && @username
+      @api_token && @channel && @username
     end
   end
 

data/lib/peertransfer_chat/version.rb

@@ -1,3 +1,3 @@
 class PeertransferChat
-  VERSION = "0.2.1"
+  VERSION = '1.0.0'
 end

data/peertransfer_chat.gemspec

@@ -6,8 +6,8 @@ require 'peertransfer_chat/version'
 Gem::Specification.new do |spec|
   spec.name          = 'peertransfer_chat'
   spec.version       = PeertransferChat::VERSION
-  spec.authors       = ['peerTransfer tech']
-  spec.email         = ['tech@peertransfer.com']
+  spec.authors       = ['Flywire Engineering']
+  spec.email         = ['engineering@flywire.com']
   spec.summary       = %q{A common interface to our chat system}
   spec.description   = %q{A common interface to our chat system}
 
@@ -19,9 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files = Dir['spec/*.rb'] + Dir['spec/**/*.rb']
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'slackr', '0.0.6'
+  spec.add_runtime_dependency 'slack-ruby-client', '~> 0.14'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'coveralls',  '~> 0.8'
 end

data/spec/integration/client_spec.rb

@@ -1,32 +1,30 @@
 require 'spec_helper'
 
 describe PeertransferChat::Client do
-  let(:slack_client) { instance_spy(Slackr) }
-  let(:team_name) { 'a team' }
-  let(:team_token) { 'a token' }
+  let(:slack_client) { instance_spy(Slack::Web::Client) }
   let(:team_channel) { 'a channel' }
   let(:team_username) { 'a username' }
-  let(:opts) { { 'channel' => team_channel, 'username' => team_username } }
+  let(:api_token) { 'a_api_token' }
 
   context 'with class configuration' do
     before do
       PeertransferChat.configure do |c|
-        c.team = team_name
-        c.incoming_token = team_token
         c.channel = team_channel
         c.username = team_username
+        c.api_token = api_token
       end
 
-      allow(Slackr).to receive(:connect).
-        with(team_name, team_token, opts).
+      allow(Slack::Web::Client).to receive(:new).
+        with(token: api_token).
         and_return(slack_client)
     end
 
-    describe '.say' do
+    describe '.speak' do
       it 'speaks something to a channel' do
         described_class.speak('hello')
 
-        expect(slack_client).to have_received(:say).with('hello')
+        expect(slack_client).to have_received(:chat_postMessage).
+          with(channel: team_channel, text: 'hello', as_user: true, username: team_username)
 
         PeertransferChat.reset!
       end
@@ -35,25 +33,25 @@ describe PeertransferChat::Client do
 
   context 'with instance configuration' do
     before do
-      allow(Slackr).to receive(:connect).
-        with(team_name, team_token, opts).
+      allow(Slack::Web::Client).to receive(:new).
+        with(token: api_token).
         and_return(slack_client)
     end
 
     let(:client) do
       PeertransferChat::Client.new do |c|
-        c.team = team_name
-        c.incoming_token = team_token
+        c.api_token = api_token
         c.channel = team_channel
         c.username = team_username
       end
     end
 
-    describe '.say' do
+    describe '.speak' do
       it 'speaks something to a channel' do
         client.speak('hello')
 
-        expect(slack_client).to have_received(:say).with('hello')
+        expect(slack_client).to have_received(:chat_postMessage).
+          with(channel: team_channel, text: 'hello', as_user: true, username: team_username)
       end
     end
   end

data/spec/lib/client_spec.rb

@@ -1,49 +1,59 @@
 require 'spec_helper'
 
 describe PeertransferChat::Client do
-  let(:slack_client) { instance_double(Slackr) }
-  let(:team_name) { 'a team' }
-  let(:team_token) { 'a token' }
+  let(:slack_client) { instance_spy(Slack::Web::Client) }
   let(:api_token) { 'an api token' }
   let(:team_channel) { 'a channel' }
   let(:team_username) { 'a username' }
-  let(:opts) { { 'channel' => team_channel, 'username' => team_username } }
 
   before do
     allow(PeertransferChat).to receive(:config).and_return(
       double(
         PeertransferChat::Config,
-        team: team_name,
-        incoming_token: team_token,
         channel: team_channel,
         username: team_username,
-        channel_id: 'C026VKGP7',
         api_token: api_token
       )
     )
   end
 
   describe '.upload' do
+    let(:filename) { '/foo/bar.bin' }
+
     it 'uploads image to a channel' do
-      allow(Slackr).to receive(:connect).
-        with(team_name, api_token, opts).
+      allow(Slack::Web::Client).to receive(:new).
+        with(token: api_token).
         and_return(slack_client)
 
-      expect(slack_client).to receive(:upload).with('/foo/bar.bin', { 'channels' => 'C026VKGP7' })
+      file_io = instance_double(Faraday::UploadIO)
+
+      allow(Faraday::UploadIO).to receive(:new).with(filename, 'image/png').
+        and_return(file_io)
+
+      described_class.upload(filename)
+
+      expect(slack_client).to have_received(:files_upload). with(
+        channels: team_channel,
+        as_user: true,
+        file: file_io,
+        title: 'output.txt',
+        filename: filename,
+        initial_comment: 'Attachment'
+      )
 
-      described_class.upload('/foo/bar.bin')
     end
   end
 
-  describe '.say' do
+  describe '.speak' do
     it 'speaks something to a channel' do
-      allow(Slackr).to receive(:connect).
-        with(team_name, team_token, opts).
+      allow(Slack::Web::Client).to receive(:new).
+        with(token: api_token).
         and_return(slack_client)
 
-      expect(slack_client).to receive(:say).with('hello')
-
       described_class.speak('hello')
+
+      expect(slack_client).to have_received(:chat_postMessage).
+          with(channel: team_channel, text: 'hello', as_user: true, username: team_username)
     end
   end
 end

data/spec/lib/config_spec.rb

@@ -1,16 +1,14 @@
 require 'spec_helper'
 
 describe PeertransferChat::Config do
-  let(:team_name) { 'a team' }
-  let(:team_token) { 'a token' }
+  let(:api_token) { 'a token' }
   let(:team_channel) { 'a channel' }
   let(:team_username) { 'a username' }
 
   context 'when configured' do
     before do
       PeertransferChat.configure do |config|
-        config.team = team_name
-        config.incoming_token = team_token
+        config.api_token = api_token
         config.channel = team_channel
         config.username = team_username
       end
@@ -27,15 +25,14 @@ describe PeertransferChat::Config do
     end
 
     it 'stores config' do
-      expect(PeertransferChat.config.team).to eq('a team')
+      expect(PeertransferChat.config.api_token).to eq(api_token)
     end
   end
 
   context 'not configured' do
     before do
       PeertransferChat.configure do |config|
-        config.team = team_name
-        config.incoming_token = team_token
+        config.api_token = api_token
         config.channel = team_channel
       end
     end

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
-require 'simplecov'
 require 'coveralls'
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start do
-  add_filter '/spec/'
-  add_filter '/vendor/'
-end
+
+Coveralls.wear!
 
 require 'peertransfer_chat'

metadata

@@ -1,45 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: peertransfer_chat
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
-- peerTransfer tech
-autorequire: 
+- Flywire Engineering
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: slackr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-- !ruby/object:Gem::Dependency
-  name: bundler
+  name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '0.14'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,19 +42,19 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 description: A common interface to our chat system
 email:
-- tech@peertransfer.com
+- engineering@flywire.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -85,10 +71,10 @@ files:
 - spec/lib/client_spec.rb
 - spec/lib/config_spec.rb
 - spec/spec_helper.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,9 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A common interface to our chat system
 test_files: