slack-ruby-bot-server 0.9.0 → 0.12.1

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

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

data/public/index.html.erb

@@ -3,6 +3,7 @@
   <title>Slack Ruby Bot Server</title>
   <script src="/scripts/jquery-1.7.1.min.js"></script>
   <script src="/scripts/url.min.js"></script>
+  <script src="/scripts/messages.js"></script>
   <script src="/scripts/register.js"></script>
   <script src="/scripts/stats.js"></script>
 </head>

data/public/scripts/messages.js

@@ -0,0 +1,33 @@
+var SlackRubyBotServer = {};
+
+$(document).ready(function() {
+
+  SlackRubyBotServer.message = function(text) {
+    $('#messages').fadeOut('slow', function() {
+      $('#messages').fadeIn('slow').html(text)
+    });
+  };
+
+  SlackRubyBotServer.error = function(xhr) {
+    try {
+      var message;
+      if (xhr.responseText) {
+        var rc = JSON.parse(xhr.responseText);
+        if (rc && rc.message) {
+          message = rc.message;
+          if (message == 'invalid_code') {
+            message = 'The code returned from the OAuth workflow was invalid.'
+          } else if (message == 'code_already_used') {
+            message = 'The code returned from the OAuth workflow has already been used.'
+          }
+        }
+      }
+
+      SlackRubyBotServer.message(message || xhr.statusText || xhr.responseText || 'Unexpected Error');
+
+    } catch(err) {
+      SlackRubyBotServer.message(err.message);
+    }
+  };
+
+});

data/public/scripts/register.js

@@ -1,37 +1,7 @@
-var SlackRubyBotServer = {};
-
 $(document).ready(function() {
-
-  SlackRubyBotServer.message = function(text) {
-    $('#messages').fadeOut('slow', function() {
-      $('#messages').fadeIn('slow').html(text)
-    });
-  };
-
-  SlackRubyBotServer.error = function(xhr) {
-    try {
-      var message;
-      if (xhr.responseText) {
-        var rc = JSON.parse(xhr.responseText);
-        if (rc && rc.message) {
-          message = rc.message;
-          if (message == 'invalid_code') {
-            message = 'The code returned from the OAuth workflow was invalid.'
-          } else if (message == 'code_already_used') {
-            message = 'The code returned from the OAuth workflow has already been used.'
-          }
-        }
-      }
-
-      SlackRubyBotServer.message(message || xhr.statusText || xhr.responseText || 'Unexpected Error');
-
-    } catch(err) {
-      SlackRubyBotServer.message(err.message);
-    }
-  };
-
   // Slack OAuth
   var code = $.url('?code')
+  var state = $.url('?state')
   if (code) {
     SlackRubyBotServer.message('Working, please wait ...');
     $('#register').hide();
@@ -39,7 +9,8 @@ $(document).ready(function() {
       type: "POST",
       url: "/api/teams",
       data: {
-        code: code
+        code: code,
+        state: state
       },
       success: function(data) {
         SlackRubyBotServer.message('Team successfully registered!<br><br>DM <b>@bot</b> or create a <b>#channel</b> and invite <b>@bot</b> to it.');

data/sample_apps/sample_app_activerecord/Gemfile

@@ -7,6 +7,7 @@ gem 'pg'
 gem 'rack-server-pages'
 gem 'rack-test'
 gem 'slack-ruby-bot-server', path: '../../'
+gem 'unicorn'
 
 group :development, :test do
   gem 'standalone_migrations', '~> 5.2'

data/sample_apps/sample_app_activerecord/README.md

@@ -7,5 +7,6 @@ This is a sample slack-ruby-bot-server with ActiveRecord.
 ```
 bundle install
 rake db:create db:migrate
+RAILS_ENV=test rake db:migrate
 rackup
 ```

data/sample_apps/sample_app_activerecord/config.ru

@@ -4,8 +4,15 @@ Bundler.require :default
 
 require_relative 'commands'
 require 'yaml'
+require 'erb'
 
-ActiveRecord::Base.establish_connection(YAML.load_file('config/postgresql.yml')[ENV['RACK_ENV']])
+ActiveRecord::Base.establish_connection(
+  YAML.safe_load(
+    ERB.new(
+      File.read('config/postgresql.yml')
+    ).result, [], [], true
+  )[ENV['RACK_ENV']]
+)
 
 NewRelic::Agent.manual_start
 

data/sample_apps/sample_app_activerecord/config/postgresql.yml

@@ -14,4 +14,4 @@ test:
 
 production:
   <<: *default
-  database: slack_ruby_bot_server_production
+  url: <%= ENV["DATABASE_URL"] %>

data/sample_apps/sample_app_activerecord/db/migrate/20170307164946_create_teams_table.rb

@@ -6,7 +6,6 @@ class CreateTeamsTable < ActiveRecord::Migration[5.0]
       t.boolean :active, default: true
       t.string :domain
       t.string :token
-
       t.timestamps
     end
   end

data/sample_apps/sample_app_activerecord/db/migrate/20190323181453_add_activated_fields.rb

@@ -0,0 +1,7 @@
+class AddActivatedFields < ActiveRecord::Migration[5.0]
+  def change
+    add_column :teams, :bot_user_id, :string
+    add_column :teams, :activated_user_id, :string
+    add_column :teams, :activated_user_access_token, :string
+  end
+end

data/sample_apps/sample_app_activerecord/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20_170_307_164_946) do
+ActiveRecord::Schema.define(version: 20_190_323_181_453) do
   # These are extensions that must be enabled in order to support this database
   enable_extension 'plpgsql'
 
@@ -20,7 +20,10 @@ ActiveRecord::Schema.define(version: 20_170_307_164_946) do
     t.boolean  'active', default: true
     t.string   'domain'
     t.string   'token'
-    t.datetime 'created_at',                null: false
-    t.datetime 'updated_at',                null: false
+    t.datetime 'created_at',                                 null: false
+    t.datetime 'updated_at',                                 null: false
+    t.string   'bot_user_id'
+    t.string   'activated_user_id'
+    t.string   'activated_user_access_token'
   end
 end

data/sample_apps/sample_app_mongoid/Gemfile

@@ -6,6 +6,7 @@ gem 'slack-ruby-bot-server', path: '../../'
 
 gem 'kaminari-mongoid'
 gem 'mongoid-scroll'
+gem 'unicorn'
 
 group :test do
   gem 'database_cleaner'

data/slack-ruby-bot-server.gemspec

@@ -1,6 +1,6 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'slack-ruby-bot-server/version'
+require_relative 'lib/slack-ruby-bot-server/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'slack-ruby-bot-server'
@@ -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'
+  spec.add_dependency 'async-websocket', '~> 0.8.0'
   spec.add_dependency 'foreman'
   spec.add_dependency 'grape'
   spec.add_dependency 'grape-roar', '>= 0.4.0'
@@ -24,5 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack-rewrite'
   spec.add_dependency 'rack-server-pages'
   spec.add_dependency 'slack-ruby-bot', '>= 0.12.0'
-  spec.add_dependency 'unicorn'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: unicorn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - dblock@dblock.org
@@ -187,8 +173,7 @@ files:
 - RELEASING.md
 - Rakefile
 - UPGRADING.md
-- app.json
-- images/new.png
+- images/create-app.png
 - images/slackbotserver.gif
 - images/slackbutton.gif
 - lib/slack-ruby-bot-server.rb
@@ -221,7 +206,6 @@ files:
 - 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/models.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
@@ -235,6 +219,7 @@ files:
 - public/index.html.erb
 - public/robots.txt
 - public/scripts/jquery-1.7.1.min.js
+- public/scripts/messages.js
 - public/scripts/register.js
 - public/scripts/stats.js
 - public/scripts/url.min.js
@@ -252,6 +237,7 @@ files:
 - 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
@@ -293,8 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: A Grape API serving a Slack bot to multiple teams.

data/app.json

@@ -1,9 +0,0 @@
-{
-	"name": "Slack Bot Server",
-	"description": "A Slack bot server.",
-	"respository": "https://github.com/slack-ruby/slack-ruby-bot-server",
-	"keywords": ["slack", "bots"],
-	"addons": [
-		"mongolab"
-	]
-}

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

@@ -1 +0,0 @@
-require 'slack-ruby-bot-server/models/team'