slack-ruby-bot-server 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b91c82bc0a49452c0b3871786fb739b763c8a25
-  data.tar.gz: 12e73c3db13dcaba4da39f499f0acb797e2db122
+  metadata.gz: 0713fb4866e25bc7cc7481ef0d03ce589610f970
+  data.tar.gz: 009024facb962ecda5813694df8d0a559d53de1c
 SHA512:
-  metadata.gz: bbf49bff1a3f7723468cc5841c68df08de3598451f1868ba4084262faa89a5a044ccbd1ea5a6a57cbbc8aadce2841681fb4e31c82a3d25c151af4099e13c3a5c
-  data.tar.gz: d9a0fa731ec1b9da48f4ef0e73189ebd6acf473e2f3bb5416e39acc5c1c0385aeea922b1e6d99d137cf2d8101a32356100822741f835b50df7a67a9e0062ba21
+  metadata.gz: 196e8d75ea412895c80f7647c3025f881312ba3b631b60905a95f696457a5311e9dfedaeba6a99fb71a072a4fff8dad9dd4711007645471b3645b48ca18f4975
+  data.tar.gz: bdc28e22da14129cfcba6fac48733943467e702ea68285dd329600e3f9e432a358e2a71ed1817423c113abb92934afe90f005aea67d6324833a062b379fbec48

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ### Changelog
 
+#### 0.6.1 (3/29/2017)
+
+* [#54](https://github.com/slack-ruby/slack-ruby-bot-server/pull/54): Removing one more Mongoid dependency when rescuing from _invoke - [@alexagranov](https://github.com/alexagranov).
+* [#53](https://github.com/slack-ruby/slack-ruby-bot-server/pull/53): No need for `otr-activerecord` if using activerecord under Rails - [@alexagranov](https://github.com/alexagranov).
+
 #### 0.6.0 (3/12/2017)
 
 * [#38](https://github.com/slack-ruby/slack-ruby-bot-server/issues/7): Added ActiveRecord support - [@zachfeldman](https://github.com/zachfeldman), [@spencerldixon](https://github.com/spencerldixon), [@dblock](https://github.com/dblock).

data/README.md

@@ -13,7 +13,7 @@ A library that contains a [Grape](http://github.com/ruby-grape/grape) API servin
 
 ### Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-bot-server, 0.6.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **stable** release of slack-ruby-bot-server, 0.6.1. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
 ### Try Me
 
@@ -157,6 +157,8 @@ end
 * [slack-amber-alert](https://github.com/dblock/slack-amber-alert), free service at [missingkidsbot.org](https://www.missingkidsbot.org)
 * [slack-gamebot](https://github.com/dblock/slack-gamebot), free service at [www.playplay.io](https://www.playplay.io)
 * [slack-market](https://github.com/dblock/slack-market), free service at [market.playplay.io](https://market.playplay.io)
+* [slack-shallbot](https://github.com/slack-ruby/slack-shellbot), free service at [shell.playplay.io](https://shell.playplay.io)
+* [slack-api-explorer](https://github.com/slack-ruby/slack-api-explorer), free service at [api-explorer.playplay.io](https://shell.playplay.io)
 
 ### Copyright & License
 

data/RELEASING.md

@@ -1,6 +1,6 @@
 # Releasing Slack-Ruby-Bot-Server
 
-There're no hard rules about when to release slack-ruby-bot-server. Release bug fixes frequenty, features not so frequently and breaking API changes rarely.
+There're no hard rules about when to release slack-ruby-bot-server. Release bug fixes frequently, features not so frequently and breaking API changes rarely.
 
 ### Release
 
@@ -13,12 +13,7 @@ rake
 
 Check that the last build succeeded in [Travis CI](https://travis-ci.org/slack-ruby/slack-ruby-bot-server) for all supported platforms.
 
-Increment the version, modify [lib/slack-ruby-bot-server/version.rb](lib/slack-ruby-bot-server/version.rb).
-
-*  Increment the third number if the release has bug fixes and/or very minor features, only (eg. change `0.2.1` to `0.2.2`).
-*  Increment the second number if the release contains major features or breaking API changes (eg. change `0.2.1` to `0.3.0`).
-
-Change "Next Release" in [CHANGELOG.md](CHANGELOG.md) to the new version.
+Change "Next" in [CHANGELOG.md](CHANGELOG.md) to the current date.
 
 ```
 ### 0.2.2 (7/10/2015)
@@ -26,12 +21,18 @@ Change "Next Release" in [CHANGELOG.md](CHANGELOG.md) to the new version.
 
 Remove the line with "Your contribution here.", since there will be no more contributions to this release.
 
-Remove the "Stable Release" section in README that warns users that they are reading the documentation for an unreleased version.
+Change `**next**` in the "Stable Release" section in README that warns users that they are reading the documentation for an unreleased version with `**stable**`.
+
+```
+## Stable Release
+
+You're reading the documentation for the **stable** release of slack-ruby-bot-server, 0.2.2. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+```
 
 Commit your changes.
 
 ```
-git add README.md CHANGELOG.md lib/slack-ruby-bot-server/version.rb
+git add README.md CHANGELOG.md
 git commit -m "Preparing for release, 0.2.2."
 git push origin master
 ```
@@ -52,18 +53,25 @@ Pushed slack-ruby-bot-server 0.2.2 to rubygems.org.
 Add the next release to [CHANGELOG.md](CHANGELOG.md).
 
 ```
-Next Release
-============
+### 0.2.3 (Next)
 
 * Your contribution here.
 ```
 
 Increment the third version number in [lib/slack-ruby-bot-server/version.rb](lib/slack-ruby-bot-server/version.rb).
 
-Comit your changes.
+Undo your change in README about the stable release.
 
 ```
-git add CHANGELOG.md lib/slack-ruby-bot-server/version.rb
+## Stable Release
+
+You're reading the documentation for the **next** release of slack-ruby-bot-server. Please see the documentation for the [last stable release, v0.2.2](https://github.com/slack-ruby/slack-ruby-bot-server/blob/v0.2.2/README.md) unless you're integrating with HEAD. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+```
+
+Commit your changes.
+
+```
+git add README.md CHANGELOG.md lib/slack-ruby-bot-server/version.rb
 git commit -m "Preparing for next development iteration, 0.2.3."
 git push origin master
 ```

data/Rakefile

@@ -5,7 +5,7 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.pattern = FileList['spec/**/*_spec.rb'].exclude(%r{ext\/(?!#{ENV['DATABASE_ADAPTER']})})
 end
 
 require 'rubocop/rake_task'

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

@@ -1,7 +1,7 @@
 require 'rack/cors'
 require 'rack-rewrite'
 require 'rack-server-pages'
-require 'otr-activerecord' if SlackRubyBotServer::Config.activerecord?
+require 'otr-activerecord' if SlackRubyBotServer::Config.activerecord? && !defined?(::Rails)
 
 module SlackRubyBotServer
   module Api

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

@@ -0,0 +1,17 @@
+module SlackRubyBot
+  module Commands
+    class Base
+      class << self
+        alias _invoke invoke
+
+        def invoke(client, data)
+          _invoke client, data
+        rescue StandardError => e
+          logger.info "#{name.demodulize.upcase}: #{client.owner}, #{e.class}: #{e}"
+          client.say(channel: data.channel, text: e.message, gif: 'error')
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,2 @@
-%w(client commands/base).each do |ext|
-  require_relative "slack-ruby-bot/#{ext}"
-end
+require_relative 'slack-ruby-bot/client'
+require_relative "#{SlackRubyBotServer::Config.database_adapter}/slack-ruby-bot/commands/base"

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

@@ -1,3 +1,3 @@
 module SlackRubyBotServer
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-bot
@@ -214,11 +214,12 @@ 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/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/activerecord.rb
@@ -293,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A Grape API serving a Slack bot to multiple teams.