slack-ruby-bot 0.10.5 → 0.11.0

data/spec/slack-ruby-bot/commands/support/match_spec.rb

@@ -0,0 +1,54 @@
+describe SlackRubyBot::Commands::Support::Match do
+  context 'initialized with invalid args' do
+    subject { -> { described_class.new('invalid-match-data') } }
+    it 'raises ArgumentError' do
+      expect(subject)
+        .to raise_error(ArgumentError, 'match_data should be a type of MatchData')
+    end
+  end
+
+  context 'initalized without attachment' do
+    subject do
+      match_data = /(?<group1>foo)(?<group2>bar)/.match('foobar')
+      described_class.new(match_data)
+    end
+
+    it 'responds to MatchData methods' do
+      MatchData.public_instance_methods(false).each do |method|
+        expect(subject).to respond_to(method)
+      end
+    end
+
+    describe '#attachment' do
+      it { expect(subject.attachment).to be_nil }
+    end
+    describe '#attachment_field' do
+      it { expect(subject.attachment_field).to be_nil }
+    end
+  end
+
+  context 'initialized with attachment' do
+    let(:attachment) { Hashie::Mash.new(text: 'Some text') }
+    let(:attachment_field) { :text }
+    subject do
+      match_data = /(?<group1>foo)(?<group2>bar)/.match('foobar')
+      described_class.new(match_data, attachment, attachment_field)
+    end
+
+    it 'responds to MatchData methods' do
+      MatchData.public_instance_methods(false).each do |method|
+        expect(subject).to respond_to(method)
+      end
+    end
+
+    describe '#attachment' do
+      it { expect(subject.attachment).not_to be_nil }
+      it { expect(subject.attachment).to be_kind_of(Hash) }
+      it { expect(subject.attachment).to eq(attachment) }
+    end
+    describe '#attachment_field' do
+      it { expect(subject.attachment_field).not_to be_nil }
+      it { expect(subject.attachment_field).to eq(:text) }
+    end
+  end
+end

data/spec/slack-ruby-bot/hooks/hook_support_spec.rb

@@ -20,7 +20,7 @@ describe SlackRubyBot::Hooks::HookSupport do
   describe 'hook code blocks' do
     it "let's you define class level code blocks" do
       expect(subject.hook_blocks.size).to eq(2)
-      expect(subject.hook_blocks.keys).to eq %w(hello goodbye)
+      expect(subject.hook_blocks.keys).to eq %w[hello goodbye]
 
       expect(subject.hook_blocks['hello'].size).to eq(2)
       expect(subject.hook_blocks['goodbye'].size).to eq(1)

data/spec/slack-ruby-bot/hooks/message_spec.rb

@@ -14,7 +14,7 @@ describe SlackRubyBot::Hooks::Message do
     it 'returns only built in command classes' do
       expect(built_in_command_classes).to include SlackRubyBot::Commands::Hi
       expect(built_in_command_classes).to include SlackRubyBot::Commands::Default
-      expect(built_in_command_classes).to include SlackRubyBot::Commands::HelpCommand
+      expect(built_in_command_classes).to include SlackRubyBot::Commands::Help
       expect(built_in_command_classes).to_not include SlackRubyBot::Bot
     end
     it 'does not return unknown command class' do

data/spec/slack-ruby-bot/mvc/controller/controller_to_command_spec.rb

@@ -59,7 +59,7 @@ describe SlackRubyBot::MVC::Controller::Base, 'setup' do
     expect(message: "  #{SlackRubyBot.config.user}   quxo red").to respond_with_slack_message('quxo: red')
     expect(model.client).to be_kind_of(SlackRubyBot::Client)
     expect(model.data).to be_kind_of(Hash)
-    expect(model.match).to be_kind_of(MatchData)
+    expect(model.match).to be_kind_of(SlackRubyBot::Commands::Support::Match)
   end
 
   it 'passes client, data, and match args to the view' do
@@ -69,7 +69,7 @@ describe SlackRubyBot::MVC::Controller::Base, 'setup' do
     expect(message: "  #{SlackRubyBot.config.user}   quxo red").to respond_with_slack_message('quxo: red')
     expect(view.client).to be_kind_of(SlackRubyBot::Client)
     expect(view.data).to be_kind_of(Hash)
-    expect(view.match).to be_kind_of(MatchData)
+    expect(view.match).to be_kind_of(SlackRubyBot::Commands::Support::Match)
   end
 end
 

data/spec/slack-ruby-bot/rspec/respond_with_error_spec.rb

@@ -1,11 +1,13 @@
 describe RSpec do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
-      command 'raise'
-
-      def self.call(_client, _data, match)
+      command 'raise' do |_client, _data, match|
         raise ArgumentError, match[:command]
       end
+
+      attachment 'raise' do |_client, data, _match|
+        raise ArgumentError, data.attachments[0].pretext
+      end
     end
   end
   def app
@@ -14,4 +16,7 @@ describe RSpec do
   it 'respond_with_error' do
     expect(message: "#{SlackRubyBot.config.user} raise").to respond_with_error(ArgumentError, 'raise')
   end
+  it 'respond_with_error_using_attachment_match' do
+    expect(attachments: { pretext: 'raise' }).to respond_with_error(ArgumentError, 'raise')
+  end
 end

data/spec/slack-ruby-bot/rspec/respond_with_slack_message_spec.rb

@@ -12,6 +12,9 @@ describe RSpec do
           client.say(text: "response #{i}", channel: data.channel)
         end
       end
+      attachment 'respond with attachment text' do |client, data, _match|
+        client.say(text: data.attachments[0].text.to_s, channel: data.channel)
+      end
     end
   end
 
@@ -46,4 +49,12 @@ describe RSpec do
     expect(message: "#{SlackRubyBot.config.user} respond 5 times")
       .not_to respond_with_slack_message('response 7')
   end
+  it 'respond_with_single_message_using_attachment_match' do
+    attachment = {
+      pretext: 'respond with attachment text',
+      text: 'foobar'
+    }
+    expect(attachments: attachment)
+      .to respond_with_slack_message('foobar')
+  end
 end

data/spec/slack-ruby-bot/rspec/respond_with_slack_messages_spec.rb

@@ -11,6 +11,11 @@ describe RSpec do
           client.say(text: "response #{i}", channel: data.channel)
         end
       end
+      attachment 'respond with attachment title' do |client, data, _match|
+        data[:attachments].each do |attachment|
+          client.say(text: "response #{attachment.title}", channel: data.channel)
+        end
+      end
     end
   end
 
@@ -42,4 +47,14 @@ describe RSpec do
     expect(message: "#{SlackRubyBot.config.user} respond with as_user")
       .to respond_with_slack_messages(expected_responses)
   end
+  it 'respond_with_multiple_messages_using_attachment_match' do
+    attachments = []
+    expected_responses = []
+    5.times do |i|
+      attachments.push(title: "title #{i}", pretext: 'respond with attachment title')
+      expected_responses.push("response title #{i}")
+    end
+    expect(attachments: attachments)
+      .to respond_with_slack_messages(expected_responses)
+  end
 end

data/spec/slack-ruby-bot/server_spec.rb

@@ -26,8 +26,8 @@ describe SlackRubyBot::Server do
     end
 
     it 'aliases' do
-      server = SlackRubyBot::Server.new(aliases: %w(foo bar))
-      expect(server.send(:client).aliases).to eq %w(foo bar)
+      server = SlackRubyBot::Server.new(aliases: %w[foo bar])
+      expect(server.send(:client).aliases).to eq %w[foo bar]
       expect(server.send(:client).names).to include 'foo'
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.11.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: '0'
 description: 
 email: dblock@dblock.org
 executables: []
@@ -169,8 +169,10 @@ files:
 - lib/slack-ruby-bot/commands/about.rb
 - lib/slack-ruby-bot/commands/base.rb
 - lib/slack-ruby-bot/commands/help.rb
-- lib/slack-ruby-bot/commands/help/attrs.rb
 - lib/slack-ruby-bot/commands/hi.rb
+- lib/slack-ruby-bot/commands/support/attrs.rb
+- lib/slack-ruby-bot/commands/support/help.rb
+- lib/slack-ruby-bot/commands/support/match.rb
 - lib/slack-ruby-bot/commands/unknown.rb
 - lib/slack-ruby-bot/config.rb
 - lib/slack-ruby-bot/hooks.rb
@@ -196,7 +198,6 @@ files:
 - lib/slack-ruby-bot/rspec/support/spec_helpers.rb
 - lib/slack-ruby-bot/rspec/support/vcr.rb
 - lib/slack-ruby-bot/server.rb
-- lib/slack-ruby-bot/support/commands_helper.rb
 - lib/slack-ruby-bot/support/loggable.rb
 - lib/slack-ruby-bot/version.rb
 - lib/slack_ruby_bot.rb
@@ -213,6 +214,7 @@ files:
 - spec/slack-ruby-bot/client_spec.rb
 - spec/slack-ruby-bot/commands/about_spec.rb
 - spec/slack-ruby-bot/commands/aliases_spec.rb
+- spec/slack-ruby-bot/commands/attachment_spec.rb
 - spec/slack-ruby-bot/commands/bot_message_spec.rb
 - spec/slack-ruby-bot/commands/bot_spec.rb
 - spec/slack-ruby-bot/commands/commands_command_classes_spec.rb
@@ -226,7 +228,6 @@ files:
 - spec/slack-ruby-bot/commands/commands_with_expression_spec.rb
 - spec/slack-ruby-bot/commands/direct_messages_spec.rb
 - spec/slack-ruby-bot/commands/empty_text_spec.rb
-- spec/slack-ruby-bot/commands/help/attrs_spec.rb
 - spec/slack-ruby-bot/commands/help_spec.rb
 - spec/slack-ruby-bot/commands/hi_spec.rb
 - spec/slack-ruby-bot/commands/match_spec.rb
@@ -239,6 +240,9 @@ files:
 - spec/slack-ruby-bot/commands/send_gif_spec.rb
 - spec/slack-ruby-bot/commands/send_message_spec.rb
 - spec/slack-ruby-bot/commands/send_message_with_gif_spec.rb
+- spec/slack-ruby-bot/commands/support/attrs_spec.rb
+- spec/slack-ruby-bot/commands/support/help_spec.rb
+- spec/slack-ruby-bot/commands/support/match_spec.rb
 - spec/slack-ruby-bot/commands/unknown_spec.rb
 - spec/slack-ruby-bot/config_spec.rb
 - spec/slack-ruby-bot/hooks/hook_support_spec.rb
@@ -249,7 +253,6 @@ files:
 - spec/slack-ruby-bot/rspec/respond_with_slack_message_spec.rb
 - spec/slack-ruby-bot/rspec/respond_with_slack_messages_spec.rb
 - spec/slack-ruby-bot/server_spec.rb
-- spec/slack-ruby-bot/support/commands_helper_spec.rb
 - spec/slack-ruby-bot/support/loggable_spec.rb
 - spec/slack-ruby-bot/version_spec.rb
 - spec/spec_helper.rb
@@ -273,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.4.5.3
 signing_key: 
 specification_version: 4
 summary: The easiest way to write a Slack bot in Ruby.
@@ -282,6 +285,7 @@ test_files:
 - spec/slack-ruby-bot/client_spec.rb
 - spec/slack-ruby-bot/commands/about_spec.rb
 - spec/slack-ruby-bot/commands/aliases_spec.rb
+- spec/slack-ruby-bot/commands/attachment_spec.rb
 - spec/slack-ruby-bot/commands/bot_message_spec.rb
 - spec/slack-ruby-bot/commands/bot_spec.rb
 - spec/slack-ruby-bot/commands/commands_command_classes_spec.rb
@@ -295,7 +299,6 @@ test_files:
 - spec/slack-ruby-bot/commands/commands_with_expression_spec.rb
 - spec/slack-ruby-bot/commands/direct_messages_spec.rb
 - spec/slack-ruby-bot/commands/empty_text_spec.rb
-- spec/slack-ruby-bot/commands/help/attrs_spec.rb
 - spec/slack-ruby-bot/commands/help_spec.rb
 - spec/slack-ruby-bot/commands/hi_spec.rb
 - spec/slack-ruby-bot/commands/match_spec.rb
@@ -308,6 +311,9 @@ test_files:
 - spec/slack-ruby-bot/commands/send_gif_spec.rb
 - spec/slack-ruby-bot/commands/send_message_spec.rb
 - spec/slack-ruby-bot/commands/send_message_with_gif_spec.rb
+- spec/slack-ruby-bot/commands/support/attrs_spec.rb
+- spec/slack-ruby-bot/commands/support/help_spec.rb
+- spec/slack-ruby-bot/commands/support/match_spec.rb
 - spec/slack-ruby-bot/commands/unknown_spec.rb
 - spec/slack-ruby-bot/config_spec.rb
 - spec/slack-ruby-bot/hooks/hook_support_spec.rb
@@ -318,7 +324,6 @@ test_files:
 - spec/slack-ruby-bot/rspec/respond_with_slack_message_spec.rb
 - spec/slack-ruby-bot/rspec/respond_with_slack_messages_spec.rb
 - spec/slack-ruby-bot/server_spec.rb
-- spec/slack-ruby-bot/support/commands_helper_spec.rb
 - spec/slack-ruby-bot/support/loggable_spec.rb
 - spec/slack-ruby-bot/version_spec.rb
 - spec/spec_helper.rb

data/lib/slack-ruby-bot/support/commands_helper.rb

@@ -1,76 +0,0 @@
-require 'singleton'
-require_relative '../commands/help/attrs'
-
-module SlackRubyBot
-  class CommandsHelper
-    include Singleton
-    attr_reader :commands_help_attrs
-
-    def initialize
-      @commands_help_attrs = []
-    end
-
-    def capture_help(klass, &block)
-      k = Commands::Help::Attrs.new(klass)
-      k.instance_eval(&block)
-      @commands_help_attrs << k
-    end
-
-    def bot_desc_and_commands
-      collect_help_attrs(bot_help_attrs) do |help_attrs|
-        bot_commands_descs = collect_name_and_desc(help_attrs.commands)
-        "#{command_name_and_desc(help_attrs)}\n\n*Commands:*\n#{bot_commands_descs.join("\n")}"
-      end
-    end
-
-    def other_commands_descs
-      collect_name_and_desc(other_commands_help_attrs)
-    end
-
-    def command_full_desc(name)
-      unescaped_name = Slack::Messages::Formatting.unescape(name)
-      help_attrs = find_command_help_attrs(unescaped_name)
-      return "There's no command *#{unescaped_name}*" unless help_attrs
-      return "There's no description for command *#{unescaped_name}*" if help_attrs.command_long_desc.blank?
-      "#{command_name_and_desc(help_attrs)}\n\n#{help_attrs.command_long_desc}"
-    end
-
-    private
-
-    def find_command_help_attrs(name)
-      help_attrs = commands_help_attrs.find { |k| k.command_name == name }
-      return help_attrs if help_attrs
-      commands_help_attrs.each { |k| k.commands.each { |c| return c if c.command_name == name } }
-      nil
-    end
-
-    def collect_help_attrs(help_attrs)
-      help_attrs_with_present_names(help_attrs).map do |ha|
-        yield(ha)
-      end
-    end
-
-    def collect_name_and_desc(help_attrs)
-      collect_help_attrs(help_attrs) do |ha|
-        command_name_and_desc(ha)
-      end
-    end
-
-    def command_name_and_desc(help_attrs)
-      desc = help_attrs.command_desc.present? ? " - #{help_attrs.command_desc}" : ''
-      "*#{help_attrs.command_name}*#{desc}"
-    end
-
-    def help_attrs_with_present_names(help_attrs)
-      help_attrs.select { |k| k.command_name.present? }
-    end
-
-    def bot_help_attrs
-      commands_help_attrs.select { |k| k.klass.ancestors.include?(SlackRubyBot::Bot) }
-    end
-
-    def other_commands_help_attrs
-      commands_help_attrs.select { |k| k.klass.ancestors.include?(SlackRubyBot::Commands::Base) && !k.klass.ancestors.include?(SlackRubyBot::Bot) }
-    end
-  end
-end