slack-ruby-bot-server 0.5.0 → 0.6.0

data/sample_apps/sample_app_mongoid/spec/api/root_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+def app
+  SlackRubyBotServer::Api::Middleware.instance
+end
+
+describe 'API' do
+  include Rack::Test::Methods
+
+  it 'root' do
+    get '/api'
+    expect(last_response.status).to eq 200
+    links = JSON.parse(last_response.body)['_links']
+    expect(links.keys.sort).to eq(%w(self status team teams).sort)
+  end
+end

data/sample_apps/sample_app_mongoid/spec/commands/help_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'commands/help'
+
+describe Help do
+  let!(:team) { Fabricate(:team) }
+  let(:app) { SlackRubyBotServer::Server.new(team: team) }
+  let(:client) { app.send(:client) }
+  let(:message_hook) { SlackRubyBot::Hooks::Message.new }
+  it 'default' do
+    expect(client).to receive(:say).with(channel: 'channel', text: [Help::HELP, SlackRubyBotServer::INFO].join("\n"))
+    expect(client).to receive(:say).with(channel: 'channel', gif: 'help')
+    message_hook.call(client, Hashie::Mash.new(channel: 'channel', text: "#{SlackRubyBot.config.user} help"))
+  end
+end

data/sample_apps/sample_app_mongoid/spec/commands/whoami_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'commands/whoami'
+
+describe Whoami do
+  let(:team) { Fabricate(:team) }
+  let(:app) { SlackRubyBotServer::Server.new(team: team) }
+  context 'whoami' do
+    it 'returns username' do
+      expect(message: "#{SlackRubyBot.config.user} whoami", channel: 'channel', user: 'user').to respond_with_slack_message(
+        '<@user>'
+      )
+    end
+  end
+end

data/{sample_app → sample_apps/sample_app_mongoid}/spec/spec_helper.rb

@@ -2,6 +2,8 @@ $LOAD_PATH.unshift File.expand_path('..', __dir__)
 
 ENV['RACK_ENV'] = 'test'
 
+require 'mongoid'
+require 'database_cleaner'
 require 'slack-ruby-bot-server/rspec'
 
 Mongoid.load!(File.expand_path('../config/mongoid.yml', __dir__), ENV['RACK_ENV'])

data/slack-ruby-bot-server.gemspec

@@ -17,16 +17,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'slack-ruby-bot'
   spec.add_dependency 'celluloid-io'
-  spec.add_dependency 'mongoid'
   spec.add_dependency 'unicorn'
   spec.add_dependency 'grape'
   spec.add_dependency 'grape-swagger'
-  spec.add_dependency 'roar', '~> 1.0.4'
-  spec.add_dependency 'grape-roar'
+  spec.add_dependency 'grape-roar', '>= 0.4.0'
   spec.add_dependency 'rack-cors'
-  spec.add_dependency 'kaminari-mongoid'
   spec.add_dependency 'kaminari-grape'
-  spec.add_dependency 'mongoid-scroll'
   spec.add_dependency 'rack-rewrite'
   spec.add_dependency 'rack-server-pages'
   spec.add_dependency 'foreman'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-bot
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  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'
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
@@ -94,34 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: roar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: grape-roar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rack-cors
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kaminari-mongoid
-  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'
 - !ruby/object:Gem::Dependency
   name: kaminari-grape
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid-scroll
-  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'
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +211,8 @@ files:
 - lib/slack-ruby-bot-server/api/presenters/teams_presenter.rb
 - lib/slack-ruby-bot-server/app.rb
 - lib/slack-ruby-bot-server/config.rb
+- 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/bson/object_id.rb
 - lib/slack-ruby-bot-server/ext/grape/sort_extension.rb
@@ -275,7 +221,9 @@ files:
 - lib/slack-ruby-bot-server/ext/slack-ruby-bot/commands/base.rb
 - lib/slack-ruby-bot-server/info.rb
 - lib/slack-ruby-bot-server/models.rb
-- lib/slack-ruby-bot-server/models/team.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
@@ -289,21 +237,40 @@ files:
 - public/scripts/register.js
 - public/scripts/stats.js
 - public/scripts/url.min.js
-- sample_app/.env
-- sample_app/.rspec
-- sample_app/Gemfile
-- sample_app/Procfile
-- sample_app/README.md
-- sample_app/Rakefile
-- sample_app/commands.rb
-- sample_app/commands/help.rb
-- sample_app/commands/whoami.rb
-- sample_app/config.ru
-- sample_app/config/mongoid.yml
-- sample_app/config/newrelic.yml
-- sample_app/spec/commands/help_spec.rb
-- sample_app/spec/commands/whoami_spec.rb
-- sample_app/spec/spec_helper.rb
+- 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/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

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

@@ -1,68 +0,0 @@
-class Team
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  SORT_ORDERS = ['created_at', '-created_at', 'updated_at', '-updated_at'].freeze
-
-  field :team_id, type: String
-  field :name, type: String
-  field :domain, type: String
-  field :token, type: String
-  field :active, type: Boolean, default: true
-
-  attr_accessor :server # server at runtime
-
-  scope :active, -> { where(active: true) }
-
-  validates_uniqueness_of :token, message: 'has already been used'
-  validates_presence_of :token
-  validates_presence_of :team_id
-
-  def deactivate!
-    update_attributes!(active: false)
-  end
-
-  def activate!(token)
-    update_attributes!(active: true, token: token)
-  end
-
-  def to_s
-    {
-      name: name,
-      domain: domain,
-      id: team_id
-    }.map do |k, v|
-      "#{k}=#{v}" if v
-    end.compact.join(', ')
-  end
-
-  def ping!
-    client = Slack::Web::Client.new(token: token)
-    auth = client.auth_test
-    {
-      auth: auth,
-      presence: client.users_getPresence(user: auth['user_id'])
-    }
-  end
-
-  def self.find_or_create_from_env!
-    token = ENV['SLACK_API_TOKEN']
-    return unless token
-    team = Team.where(token: token).first
-    team ||= Team.new(token: token)
-    info = Slack::Web::Client.new(token: token).team_info
-    team.team_id = info['team']['id']
-    team.name = info['team']['name']
-    team.domain = info['team']['domain']
-    team.save!
-    team
-  end
-
-  def self.purge!
-    # destroy teams inactive for two weeks
-    Team.where(active: false, :updated_at.lte => 2.weeks.ago).each do |team|
-      Mongoid.logger.info "Destroying #{team}, inactive since #{team.updated_at}, over two weeks ago."
-      team.destroy
-    end
-  end
-end