Merge pull request #1 from ID25/refactoring

Refactoring

Author: kciter

lib/simple-slack-bot.rb lib/simple_slack_bot.rb

@@ -1,4 +1,3 @@
-
 require 'simple_slack_bot/command'
 require 'simple_slack_bot/config'
-require 'simple_slack_bot/client'
+require 'simple_slack_bot/client'

lib/simple_slack_bot/client.rb

@@ -1,8 +1,6 @@
-
 require 'slack-ruby-client'
 
 module SlackBot
-
   class Client
     attr_accessor :slack_web_client, :slack_realtime_client
     attr_accessor :commands
@@ -15,9 +13,7 @@ def initialize
     def add_command(regex)
       command = Command.new(self)
       command.regex = regex
-      command.action = lambda { |data|
-        yield(data)
-      }
+      command.action = -> (data) { yield(data) }
       @commands << command
     end
 
@@ -27,8 +23,8 @@ def start!
         return
       end
 
-      self.slack_init
-      self.message_event_init
+      slack_init
+      message_event_init
 
       EM.run do
         @slack_realtime_client.start!
@@ -73,16 +69,14 @@ def message_event_init
         puts data if config.debug.eql?(true)
 
         case data['subtype']
-          when 'channel_join' then
-            client.message channel: data['channel'], text: config.join_message
+        when 'channel_join' then
+          client.message channel: data['channel'], text: config.join_message
         end
 
         @commands.each do |command|
-          if command.match?(data['text'])
-            command.execute(data)
-          end
+          command.execute(data) if command.match?(data['text'])
         end
       end
     end
   end
-end
+end

lib/simple_slack_bot/command.rb

@@ -1,23 +1,18 @@
-
 module SlackBot
   class Command
-    attr_accessor :bot_client
-    attr_accessor :regex
-    attr_accessor :help_message
-    attr_accessor :action
+    attr_accessor :bot_client, :regex, :help_message, :action
 
     def initialize(bot_client)
       @bot_client = bot_client
     end
 
     def match?(str)
-      return false if @regex.nil? || @regex.match(str).nil?
-      true
+      (@regex.nil? || @regex.match(str).nil?) ? false : true
     end
 
     def execute(data)
       return if @action.nil?
       @action.call(data)
     end
   end
-end
+end

lib/simple_slack_bot/config.rb

@@ -1,12 +1,11 @@
-
 module SlackBot
   module Config
     extend self
 
     ATTRIBUTES = [
-        :debug,
-        :join_message,
-        :token
+      :debug,
+      :join_message,
+      :token
     ]
 
     attr_accessor(*Config::ATTRIBUTES)
@@ -16,13 +15,13 @@ module Config
     self.token = 'TOKEN'
   end
 
-  class << self
-    def configure
-      block_given? ? yield(Config) : Config
-    end
+  module_function
+
+  def configure
+    block_given? ? yield(Config) : Config
+  end
 
-    def config
-      Config
-    end
+  def config
+    Config
   end
-end
+end

spec/client_spec.rb

@@ -1,2 +1,18 @@
+require 'spec_helper'
 
-# TODO
+describe SlackBot::Client do
+  describe '#initialize' do
+    it 'have an empty commands array' do
+      expect(SlackBot::Client.new.commands).to eq []
+    end
+  end
+
+  describe '.add_command' do
+    bot = SlackBot::Client.new
+
+    it 'add command to commands array' do
+      result = bot.add_command('Hello')
+      expect(result).to eq bot.commands
+    end
+  end
+end

spec/command_spec.rb

@@ -1,2 +1,23 @@
+require 'spec_helper'
 
-# TODO
+describe SlackBot::Command do
+  describe '#initialize' do
+    bot = SlackBot::Client.new
+
+    it 'have a bot_client' do
+      command = SlackBot::Command.new(bot)
+      expect(command.bot_client).to eq bot
+    end
+  end
+
+  describe '.match?' do
+    bot = SlackBot::Client.new
+    bot.add_command('Hello')
+
+    it 'iterate commands' do
+      bot.commands.each do |command|
+        expect(command.regex).to eq 'Hello'
+      end
+    end
+  end
+end

spec/config_spec.rb

@@ -3,9 +3,9 @@
 describe SlackBot::Config do
   describe '#initialize' do
     it 'sets config' do
-      expect(SlackBot::config.join_message).to eq 'Hello!'
-      expect(SlackBot::config.debug).to eq false
-      expect(SlackBot::config.token).to eq 'TOKEN'
+      expect(SlackBot.config.join_message).to eq 'Hello!'
+      expect(SlackBot.config.debug).to eq false
+      expect(SlackBot.config.token).to eq 'TOKEN'
     end
   end
 
@@ -24,4 +24,4 @@
       expect(SlackBot.config.token).to eq 'Invalid Token'
     end
   end
-end
+end

spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'bundler/setup'
 Bundler.setup
 
-require 'simple-slack-bot'
+require 'simple_slack_bot'
 
 RSpec.configure do |config|
-end
+end