slack-ruby-bot-server 0.12.1 → 1.2.0

data/lib/slack-ruby-bot-server/api/middleware.rb

@@ -6,11 +6,10 @@ require 'otr-activerecord' if SlackRubyBotServer::Config.activerecord? && !defin
 module SlackRubyBotServer
   module Api
     class Middleware
-      def self.logger
-        @logger ||= begin
-          STDOUT.sync = true
-          Logger.new(STDOUT)
-        end
+      include SlackRubyBotServer::Loggable
+
+      def self.reset!
+        @instance = nil
       end
 
       def self.instance

data/lib/slack-ruby-bot-server/app.rb

@@ -1,10 +1,11 @@
 module SlackRubyBotServer
   class App
+    include SlackRubyBotServer::Loggable
+
     def prepare!
       check_database!
       init_database!
       purge_inactive_teams!
-      configure_global_aliases!
     end
 
     def self.instance
@@ -13,13 +14,6 @@ module SlackRubyBotServer
 
     private
 
-    def logger
-      @logger ||= begin
-        STDOUT.sync = true
-        Logger.new(STDOUT)
-      end
-    end
-
     def check_database!
       SlackRubyBotServer::DatabaseAdapter.check!
     end
@@ -31,11 +25,5 @@ module SlackRubyBotServer
     def purge_inactive_teams!
       Team.purge!
     end
-
-    def configure_global_aliases!
-      SlackRubyBot.configure do |config|
-        config.aliases = ENV['SLACK_RUBY_BOT_ALIASES'].split(' ') if ENV['SLACK_RUBY_BOT_ALIASES']
-      end
-    end
   end
 end

data/lib/slack-ruby-bot-server/config.rb

@@ -2,14 +2,18 @@ module SlackRubyBotServer
   module Config
     extend self
 
-    attr_accessor :server_class
+    attr_accessor :logger
     attr_accessor :service_class
     attr_accessor :database_adapter
     attr_accessor :view_paths
+    attr_accessor :oauth_scope
+    attr_accessor :oauth_version
 
     def reset!
-      self.server_class = SlackRubyBotServer::Server
+      self.logger = nil
       self.service_class = SlackRubyBotServer::Service
+      self.oauth_scope = nil
+      self.oauth_version = :v2
 
       self.view_paths = [
         'views',
@@ -26,6 +30,32 @@ module SlackRubyBotServer
                               end
     end
 
+    def oauth_authorize_url
+      case oauth_version
+      when :v2
+        'https://slack.com/oauth/v2/authorize'
+      when :v1
+        'https://slack.com/oauth/authorize'
+      else
+        raise ArgumentError, 'Invalid oauth_version, must be one of :v1 or v2.'
+      end
+    end
+
+    def oauth_access_method
+      case oauth_version
+      when :v2
+        :oauth_v2_access
+      when :v1
+        :oauth_access
+      else
+        raise ArgumentError, 'Invalid oauth_version, must be one of :v1 or v2.'
+      end
+    end
+
+    def oauth_scope_s
+      oauth_scope&.join('+')
+    end
+
     def activerecord?
       database_adapter == :activerecord
     end

data/lib/slack-ruby-bot-server/config/database_adapters/activerecord.rb

@@ -18,6 +18,8 @@ module SlackRubyBotServer
         t.string :name
         t.string :domain
         t.string :token
+        t.string :oauth_scope
+        t.string :oauth_version, default: 'v1', null: false
         t.string :bot_user_id
         t.string :activated_user_id
         t.string :activated_user_access_token

data/lib/slack-ruby-bot-server/ext.rb

@@ -1,3 +1,3 @@
-%w[bson/object_id grape/sort_extension slack-ruby-bot].each do |ext|
+%w[bson/object_id grape/sort_extension].each do |ext|
   require_relative "ext/#{ext}"
 end

data/lib/slack-ruby-bot-server/ext/mongoid/slack-ruby-bot/commands/base.rb

@@ -8,12 +8,12 @@ module SlackRubyBot
           _invoke client, data
         rescue Mongoid::Errors::Validations => e
           logger.info "#{name.demodulize.upcase}: #{client.owner}, error - #{e.document.class}, #{e.document.errors.to_hash}"
-          client.say(channel: data.channel, text: e.document.errors.first[1], gif: 'error')
+          client.say(channel: data.channel, text: e.document.errors.first[1])
           true
         rescue StandardError => e
           logger.info "#{name.demodulize.upcase}: #{client.owner}, #{e.class}: #{e}"
           logger.debug e.backtrace.join("\n")
-          client.say(channel: data.channel, text: e.message, gif: 'error')
+          client.say(channel: data.channel, text: e.message)
           true
         end
       end

data/lib/slack-ruby-bot-server/loggable.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module SlackRubyBotServer
+  module Loggable
+    def self.included(base)
+      base.send :include, InstanceMethods
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def logger
+        @logger ||= SlackRubyBotServer::Config.logger || begin
+          $stdout.sync = true
+          Logger.new($stdout)
+        end
+      end
+    end
+
+    module InstanceMethods
+      def logger
+        self.class.logger
+      end
+    end
+  end
+end

data/lib/slack-ruby-bot-server/models/team/methods.rb

@@ -32,11 +32,31 @@ module Methods
 
     def ping!
       client = Slack::Web::Client.new(token: token)
+
       auth = client.auth_test
+
+      presence = begin
+        client.users_getPresence(user: auth['user_id'])
+                 rescue Slack::Web::Api::Errors::MissingScope
+                   nil
+      end
+
       {
         auth: auth,
-        presence: client.users_getPresence(user: auth['user_id'])
+        presence: presence
       }
     end
+
+    def ping_if_active!
+      return unless active?
+
+      ping!
+    rescue Slack::Web::Api::Errors::SlackError => e
+      logger.warn "Active team #{self} ping, #{e.message}."
+      case e.message
+      when 'account_inactive', 'invalid_auth'
+        deactivate!
+      end
+    end
   end
 end

data/lib/slack-ruby-bot-server/models/team/mongoid.rb

@@ -8,6 +8,8 @@ class Team
   field :name, type: String
   field :domain, type: String
   field :token, type: String
+  field :oauth_scope, type: String
+  field :oauth_version, type: String, default: 'v1'
   field :active, type: Boolean, default: true
   field :bot_user_id, type: String
   field :activated_user_id, type: String

data/lib/slack-ruby-bot-server/rspec.rb

@@ -1,4 +1,3 @@
-require 'slack-ruby-bot/rspec'
 require 'slack-ruby-bot-server'
 require 'fabrication'
 require 'faker'

data/lib/slack-ruby-bot-server/service.rb

@@ -1,6 +1,6 @@
 module SlackRubyBotServer
   class Service
-    include SlackRubyBot::Loggable
+    include SlackRubyBotServer::Loggable
 
     def self.start!
       Thread.new do
@@ -47,34 +47,30 @@ module SlackRubyBotServer
     end
 
     def start!(team)
-      run_callbacks :starting, team
       logger.info "Starting team #{team}."
-      options = { team: team }
-      server = SlackRubyBotServer::Config.server_class.new(options)
-      start_server! team, server
+      run_callbacks :starting, team
       run_callbacks :started, team
-      server
     rescue StandardError => e
       run_callbacks :error, team, e
       logger.error e
     end
 
-    def restart!(team, server, wait = 1)
+    def restart!(team)
+      logger.info "Restarting team #{team}."
       run_callbacks :restarting, team
-      start_server! team, server, wait
       run_callbacks :restarted, team
+    rescue StandardError => e
+      run_callbacks :error, team, e
+      logger.error e
     end
 
     def stop!(team)
       logger.info "Stopping team #{team}."
       run_callbacks :stopping, team
-      team.server&.stop!
       run_callbacks :stopped, team
     rescue StandardError => e
       run_callbacks :error, team, e
       logger.error e
-    ensure
-      team.server = nil
     end
 
     def start_from_database!
@@ -98,14 +94,9 @@ module SlackRubyBotServer
       run_callbacks :deactivating, team
       team.deactivate!
       run_callbacks :deactivated, team
-    rescue Mongoid::Errors::Validations => e
-      run_callbacks :error, team, e
-      logger.error "#{team.name}: #{e.message}, error - #{e.document.class}, #{e.document.errors.to_hash}, ignored."
     rescue StandardError => e
       run_callbacks :error, team, e
       logger.error "#{team.name}: #{e.class}, #{e.message}, ignored."
-    ensure
-      team.server = nil
     end
 
     def self.reset!
@@ -127,23 +118,6 @@ module SlackRubyBotServer
       end
     end
 
-    def start_server!(team, server, wait = 1)
-      team.server = server
-      server.start_async
-    rescue StandardError => e
-      run_callbacks :error, team, e
-      case e.message
-      when 'account_inactive', 'invalid_auth' then
-        logger.error "#{team.name}: #{e.message}, team will be deactivated."
-        deactivate!(team)
-      else
-        wait = e.retry_after if e.is_a?(Slack::Web::Api::Errors::TooManyRequestsError)
-        logger.error "#{team.name}: #{e.message}, restarting in #{wait} second(s)."
-        sleep(wait)
-        start_server! team, server, [wait * 2, 60].min
-      end
-    end
-
     def run_callbacks(type, team = nil, error = nil, options = {})
       callbacks = @callbacks[type.to_s]
       return false unless callbacks

data/lib/slack-ruby-bot-server/version.rb

@@ -1,3 +1,3 @@
 module SlackRubyBotServer
-  VERSION = '0.12.1'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/public/index.html.erb

@@ -16,7 +16,7 @@
   </p>
   <p id='messages' />
   <p id='register'>
-    <a href="https://slack.com/oauth/authorize?scope=bot&client_id=<%= ENV['SLACK_CLIENT_ID'] %>"><img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcset="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x"></a>
+    <a href="<%= SlackRubyBotServer::Config.oauth_authorize_url %>?scope=<%= SlackRubyBotServer::Config.oauth_scope_s %>&client_id=<%= ENV['SLACK_CLIENT_ID'] %>"><img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcset="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x"></a>
   </p>
   <p id='active_teams_count'>&nbsp;</p>
   <p>

data/slack-ruby-bot-server.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'async-websocket', '~> 0.8.0'
+  spec.add_dependency 'async'
   spec.add_dependency 'foreman'
   spec.add_dependency 'grape'
   spec.add_dependency 'grape-roar', '>= 0.4.0'
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack-cors'
   spec.add_dependency 'rack-rewrite'
   spec.add_dependency 'rack-server-pages'
-  spec.add_dependency 'slack-ruby-bot', '>= 0.12.0'
+  spec.add_dependency 'slack-ruby-client'
 end

data/tasks/db.rake

@@ -5,40 +5,4 @@ namespace :db do
       Logger.new(STDOUT)
     end
   end
-
-  namespace :heroku do
-    desc 'Mongodump the BotServer database for a slack-ruby-bot-server Heroku app.'
-    task :backup, [:app] do |_t, args|
-      require 'mongoid-shell'
-
-      logger.info("[#{Time.now}] db:heroku:backup started")
-
-      # get heroku configuration info
-      app = args[:app] || raise('Missing app.')
-      JSON.parse(`bundle exec heroku config --app #{app} --json`).each_pair do |k, v|
-        ENV[k] = v
-      end
-
-      # connect to MongoDB
-      env = (ENV['RACK_ENV'] || 'development').to_s
-      logger.info "Connecting to the #{env} environment."
-      Mongoid.load! 'config/mongoid.yml', env
-
-      # mongodump
-      mongodump = Mongoid::Shell::Commands::Mongodump.new(session: Mongoid.default_client)
-      mongodump.out = File.join(Dir.tmpdir, 'db/' + mongodump.host.tr(':', '_'))
-      logger.info("[#{Time.now}] clearing (#{mongodump.out})")
-      FileUtils.rm_rf mongodump.out if File.directory? mongodump.out
-      logger.info("[#{Time.now}] mongodump to #{mongodump.out}")
-      system mongodump.to_s
-
-      # backup
-      backup_name = "#{app}-#{Time.now.strftime('%Y-%m-%d-%H%M%S')}"
-      tmp_db_filename = File.join(mongodump.out, backup_name)
-      logger.info("[#{Time.now}] compressing (#{tmp_db_filename}.tar.gz)")
-      system "tar -cvf #{tmp_db_filename}.tar #{mongodump.out}/#{mongodump.db}"
-      system "gzip #{tmp_db_filename}.tar"
-      logger.info "Created #{tmp_db_filename}.tar.gz."
-    end
-  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: async-websocket
+  name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -137,26 +137,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slack-ruby-bot
+  name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
-description: 
+        version: '0'
+description:
 email:
 - dblock@dblock.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -174,8 +175,6 @@ files:
 - Rakefile
 - UPGRADING.md
 - images/create-app.png
-- images/slackbotserver.gif
-- images/slackbutton.gif
 - lib/slack-ruby-bot-server.rb
 - lib/slack-ruby-bot-server/api.rb
 - lib/slack-ruby-bot-server/api/endpoints.rb
@@ -199,19 +198,16 @@ files:
 - lib/slack-ruby-bot-server/config/database_adapters/activerecord.rb
 - lib/slack-ruby-bot-server/config/database_adapters/mongoid.rb
 - lib/slack-ruby-bot-server/ext.rb
-- lib/slack-ruby-bot-server/ext/activerecord/slack-ruby-bot/commands/base.rb
 - lib/slack-ruby-bot-server/ext/bson/object_id.rb
 - lib/slack-ruby-bot-server/ext/grape/sort_extension.rb
 - lib/slack-ruby-bot-server/ext/mongoid/slack-ruby-bot/commands/base.rb
-- lib/slack-ruby-bot-server/ext/slack-ruby-bot.rb
-- lib/slack-ruby-bot-server/ext/slack-ruby-bot/client.rb
 - lib/slack-ruby-bot-server/info.rb
+- lib/slack-ruby-bot-server/loggable.rb
 - lib/slack-ruby-bot-server/models/team/activerecord.rb
 - lib/slack-ruby-bot-server/models/team/methods.rb
 - lib/slack-ruby-bot-server/models/team/mongoid.rb
 - lib/slack-ruby-bot-server/rspec.rb
 - lib/slack-ruby-bot-server/rspec/fabricators/team.rb
-- lib/slack-ruby-bot-server/server.rb
 - lib/slack-ruby-bot-server/service.rb
 - lib/slack-ruby-bot-server/version.rb
 - public/favicon.ico
@@ -223,48 +219,13 @@ files:
 - public/scripts/register.js
 - public/scripts/stats.js
 - public/scripts/url.min.js
-- sample_apps/README.md
-- sample_apps/sample_app_activerecord/.rspec
-- sample_apps/sample_app_activerecord/.standalone_migrations
-- sample_apps/sample_app_activerecord/Gemfile
-- sample_apps/sample_app_activerecord/Procfile
-- sample_apps/sample_app_activerecord/README.md
-- sample_apps/sample_app_activerecord/Rakefile
-- sample_apps/sample_app_activerecord/commands.rb
-- sample_apps/sample_app_activerecord/commands/help.rb
-- sample_apps/sample_app_activerecord/commands/whoami.rb
-- sample_apps/sample_app_activerecord/config.ru
-- sample_apps/sample_app_activerecord/config/newrelic.yml
-- sample_apps/sample_app_activerecord/config/postgresql.yml
-- sample_apps/sample_app_activerecord/db/migrate/20170307164946_create_teams_table.rb
-- sample_apps/sample_app_activerecord/db/migrate/20190323181453_add_activated_fields.rb
-- sample_apps/sample_app_activerecord/db/schema.rb
-- sample_apps/sample_app_activerecord/spec/api/root_spec.rb
-- sample_apps/sample_app_activerecord/spec/commands/help_spec.rb
-- sample_apps/sample_app_activerecord/spec/commands/whoami_spec.rb
-- sample_apps/sample_app_activerecord/spec/spec_helper.rb
-- sample_apps/sample_app_mongoid/.rspec
-- sample_apps/sample_app_mongoid/Gemfile
-- sample_apps/sample_app_mongoid/Procfile
-- sample_apps/sample_app_mongoid/README.md
-- sample_apps/sample_app_mongoid/Rakefile
-- sample_apps/sample_app_mongoid/commands.rb
-- sample_apps/sample_app_mongoid/commands/help.rb
-- sample_apps/sample_app_mongoid/commands/whoami.rb
-- sample_apps/sample_app_mongoid/config.ru
-- sample_apps/sample_app_mongoid/config/mongoid.yml
-- sample_apps/sample_app_mongoid/config/newrelic.yml
-- sample_apps/sample_app_mongoid/spec/api/root_spec.rb
-- sample_apps/sample_app_mongoid/spec/commands/help_spec.rb
-- sample_apps/sample_app_mongoid/spec/commands/whoami_spec.rb
-- sample_apps/sample_app_mongoid/spec/spec_helper.rb
 - script/console
 - slack-ruby-bot-server.gemspec
 - tasks/db.rake
 homepage: https://github.com/slack-ruby/slack-ruby-bot-server
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -280,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Grape API serving a Slack bot to multiple teams.
 test_files: []