slackify 0.3.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f1105d73a8943514708110e7b544fbaf8e300770f902103dcca4da95bfc9fa
-  data.tar.gz: b4a2b7dd7fcffed2cce55214fb96d2d09ea6ff40513d0360900187118857b6b8
+  metadata.gz: b004a0a3eb23a883c606b81d616c09a4ad2a197f9120152b7a82678b844346df
+  data.tar.gz: 2a5dc0b466fff1f05a55ae8e164817734fe28191eead44f9c1671e1dfba4bfe6
 SHA512:
-  metadata.gz: a80fbbb042403ae528e9563c7d3cdaec8462e30a6aaf033d1c93c804b9e78cb58e1b03cbd1c324cab8329eb697da35fe5d81e47dffe633643fd39192d507a802
-  data.tar.gz: f822f3cf7448b07f946f3a7d07b644d1ae70a57ee9cc8a9f06996c2de20f36561b4894294f5c350ab5c7a44394e75aed1e2a5ef1f127e1ee47cdac000975edbd
+  metadata.gz: 3f4449f96003b07d5cfe0441766cb0e85adc57bd86c1b7ecc0482bdd25df113f8868272bc01e92ea1e25021c3db89899b0d9ca917148651e73f7063817367e9d
+  data.tar.gz: 6c3720e2f6c28113df12aedf494cd857980ec8bd6e3adc9bed7199f2168df6d753bf722e367e269f95401f6e2c37b624b213c90a59fb682c2826d79e9024c538

data/CHANGELOG.md

@@ -1,15 +1,23 @@
+## V0.4.0
+
+- **BREAKING CHANGE:** Use `approved_bot_ids` instead of `whitelisted_bot_ids` ([6243c11](https://github.com/jusleg/slackify/commit'6243c11c3b5e49fa31feb2ebfd9394c362509524)) by [@DougEdey](https://github.com/DougEdey)
+- Add support for named parameters in commands ([PR #12](https://github.com/jusleg/slackify/pull/12)) by [@DougEdey](https://github.com/DougEdey)
+- Add support for custom parameters in commands ([PR #17](https://github.com/jusleg/slackify/pull/17)) by [@DougEdey](https://github.com/DougEdey)
+- Tidy up some tests
+- Force slack-ruby-client to be version 0.15.1 or above to allow for pagination of Conversations
+
 ## V0.3.2
 
-* Add support for interactive block payloads ([b6cf1db](https://github.com/jusleg/slackify/commit/b6cf1dbb47b832037ebff56054efa27c9e3251dc)) by [@drose-shopify](https://github.com/drose-shopify)
+- Add support for interactive block payloads ([b6cf1db](https://github.com/jusleg/slackify/commit/b6cf1dbb47b832037ebff56054efa27c9e3251dc)) by [@drose-shopify](https://github.com/drose-shopify)
 
 ## V0.3.0
 
-* Add code documentation and improve exception message
-* Add whitelisting of bot ids in the configuration through `whitelisted_bot_ids=`
-* Refactored Handler configuration into `Slackify::Router` and `Slackify::Handlers::Factory`
-* Improved testing
-* Remove the need to perform `Slackify.load_handler`
-* **Breaking change:** Given that we now load the handlers on `Slack.configure`, the configuration step done in `config/application.rb` will have to be done in an initializer to have all the handler class loaded. 
+- Add code documentation and improve exception message
+- Add approval of bot ids in the configuration through `allowed_bot_ids=`
+- Refactored Handler configuration into `Slackify::Router` and `Slackify::Handlers::Factory`
+- Improved testing
+- Remove the need to perform `Slackify.load_handler`
+- **Breaking change:** Given that we now load the handlers on `Slack.configure`, the configuration step done in `config/application.rb` will have to be done in an initializer to have all the handler class loaded.
 
 ## V0.2.0
 
@@ -24,13 +32,14 @@ Update how the `bot_id` is set in the handler configuration. You can disable the
 Custom unhandled_handler configuration fix. It wouldn't let you set a custom one as the validation was checking for `is_a?` instead of `<`
 
 ## V0.1.3
+
 Added `remove_unhandled_handler` as a configuration option to disable the unhandled handler.
 
 ## V0.1.2
 
-* Renaming the gem from toddlerbot to slackify.
-* Cleanup of `lib/slackify` folder.
-* Added a new configuration: unhandled_handler. You can specify a subclass of `Slackify::Handlers::Base` in the config. This class will be called with `#unhandled` when a message has no regex match.
+- Renaming the gem from toddlerbot to slackify.
+- Cleanup of `lib/slackify` folder.
+- Added a new configuration: unhandled_handler. You can specify a subclass of `Slackify::Handlers::Base` in the config. This class will be called with `#unhandled` when a message has no regex match.
 
 ## V0.1.1
 

data/README.md

@@ -3,23 +3,25 @@
 Slackify is a gem that allows to build slackbots on Rails using the [Event API](https://api.slack.com/events-api) from Slack.
 
 ## Table of Contents
-* [How does it work](#how-does-it-work)
-  * [Handlers](#handlers)
-    * [Plain messages](#handling-plain-messages)
-    * [Interactive messages](#handling-interactive-messages)
-    * [Slash Command](#handling-slash-commands)
-    * [Custom handler for message subtypes](#custom-handler-for-message-subtypes)
-    * [Custom handler for event types](#custom-handler-for-event-types)
-    * [Custom unhandled handler](#custom-unhandled-handler)
-  * [Slack client](#slack-client)
-    * [Sending a simple message](#sending-a-simple-message)
-    * [Sending an interactive message](#sending-an-interactive-message)
-  * [Slack 3 second reply window](#slack-3-seconds-reply-window)
-* [How to run your own slackify](#how-to-run-your-own-slackify)
-  * [Initial Setup](#initial-setup)
-  * [Slack Setup](#slack-setup)
+
+- [How does it work](#how-does-it-work)
+  - [Handlers](#handlers)
+    - [Plain messages](#handling-plain-messages)
+    - [Interactive messages](#handling-interactive-messages)
+    - [Slash Command](#handling-slash-commands)
+    - [Custom handler for message subtypes](#custom-handler-for-message-subtypes)
+    - [Custom handler for event types](#custom-handler-for-event-types)
+    - [Custom unhandled handler](#custom-unhandled-handler)
+  - [Slack client](#slack-client)
+    - [Sending a simple message](#sending-a-simple-message)
+    - [Sending an interactive message](#sending-an-interactive-message)
+  - [Slack 3 second reply window](#slack-3-seconds-reply-window)
+- [How to run your own slackify](#how-to-run-your-own-slackify)
+  - [Initial Setup](#initial-setup)
+  - [Slack Setup](#slack-setup)
 
 # How does it work
+
 The core logic of the bot resides in its handlers. When the app starts, a list of handler gets initialized from a config file (`config/handlers.yml`). This initializes all the plain message handlers. Out of the box, the application supports three types of events
 
 1. [Plain messages](#handling-plain-messages)
@@ -27,19 +29,19 @@ The core logic of the bot resides in its handlers. When the app starts, a list o
 3. [Slash Command](#handling-slash-commands)
 
 ## Handlers
+
 ### Handling plain messages
+
 These are the basic handlers. They use a regex to identify if they should be called. When a message event gets sent to the bots, the slack controller sends the message to the list of handlers. The message will be checked against the regex of every handler until there is a match. When there is a match, the handler will get called with all the parameters provided by slack. If no handler matches the command, the unhandled handler will be called instead.
 
 Those handlers are configured via the `config/handlers.yml` configuration file. Let's dissect the configuration of a handler.
 
 ```yaml
--
-  repeat_handler:
+- repeat_handler:
     commands:
-      -
-        name: Repeat
+      - name: Repeat
         description: "`repeat [sentence]`: Repeats the sentence you wrote"
-        regex: !ruby/regexp '/^repeat (?<sentence>.+)/i'
+        regex: !ruby/regexp "/^repeat (?<sentence>.+)/i"
         action: repeat
 ```
 
@@ -65,20 +67,48 @@ To add a new handler, you can add a new file under `app/handlers/` and start add
 
 **Note:** The regex supports [named capture](https://www.regular-expressions.info/named.html). In this example, we have a name example of `sentence`. When the handler command will be called, a key in the parameter hash will be added: `command_arguments`. This key will point to a hash of the capture name and value. In this case, `command_arguments => {sentence: "the sentence you wrote"}`
 
+### Handling messages with defined parameters
+
+The regular expression matching in the previous example provides a mechanism to supply named parameters to a method. However, many handlers may want to use named & typed parameters. This can be done using the `base_command` and `parameters` options.
+
+We can rewrite the command above to
+
+```yaml
+- repeat_handler:
+    commands:
+      - name: Repeat
+        description: "`repeat [sentence]`: Repeats the sentence you wrote"
+        base_command: "repeat"
+        parameters:
+          - sentence: string
+          - times: 10
+        action: repeat
+```
+
+And call the command with
+
+`slackify repeat sentence="Why hullo there" times=10`
+
+This will supply a command arguments that are typed and coerced to the defined types:
+
+`command_arguments => {sentence: "Why hullo there", time: 10}`
+
 ### Handling interactive messages
+
 When sending an interactive message to a user, slack let's you define the `callback_id`. The app uses the callback id to select the proper handler for the message that was sent. The callback id must follow the given format: `class_name#method_name`. For instance if you set the callback id to `repeat_handler#repeat`, then `RepeatHandler#repeat` will be called. Adding new handlers does not require to update the `config/handlers.yml` configuration. You only need to update the callback id to define the proper handler to be used when you send an interactive message.
 
 ### Handling slash commands
+
 The code also has an example of a slash command and its handler (`slash_handler.rb`). To add a command on the bot, head to you app configuration on https://api.slack.com/apps and navigate to Slack Commands using the sidebar. Create a new one. The important part is to set the path properly. To bind with the demo handler, you would need to setup the path like this: `/slackify/slash/slash_handler/example_slash`. The format is `/slackify/slash/[handler_name]/[action_name]`. An app shouldn't have many slash commands. Keep in mind that adding a slash command means that the whole organization will see it.
 
-You will need to whitelist the method in the handler to indicate it can be used as a slash command using `allow_slash_method`
+You will need to allow the method in the handler to indicate it can be used as a slash command using `allow_slash_method`
 
 ```ruby
 class DummyHandler < Slackify::Handlers::Base
   allow_slash_method :slash_command
 
   class << self
-    
+
     def slash_command(_params)
       "dummy_handler slash_command() was called"
     end
@@ -134,18 +164,21 @@ end
 ```
 
 ## Slack client
+
 In order to send messages, the [slack ruby client gem](https://github.com/slack-ruby/slack-ruby-client) was used. You can send plain text messages, images and interactive messages. Since the bot was envisioned being more repsonsive than proactive, the client was made available for handlers to call using the `slack_client` method. If you wish to send messages outside of handlers, you can get the slack client by calling `Slackify.configuration.slack_client`
 
 ### Sending a simple message
+
 ```ruby
 slack_client.chat_postMessage(channel: 'MEMBER ID OR CHANNEL ID', text: 'Hello World', as_user: true)
 ```
 
 ### Sending an interactive message
+
 ```ruby
 slack_client.chat_postMessage(
-  channel: 'MEMBER ID OR CHANNEL ID', 
-  as_user: true, 
+  channel: 'MEMBER ID OR CHANNEL ID',
+  as_user: true,
   attachments: [{
     "fallback": "Would you recommend it to customers?",
     "title": "Would you recommend it to customers?",
@@ -171,10 +204,13 @@ slack_client.chat_postMessage(
 ```
 
 ## Slack 3 seconds reply window
+
 Slack introduced a [3 seconds reply window](https://api.slack.com/messaging/interactivity#response) for interactive messages. That means that if you reply to an interactive message or slash command event with a json, slack will show either update the attachment or send a new one without having to use `chat_postMessage`. If you wish to use this feature with Slackify, you only need to return either a json of an attachment or a plain text string when you handler method is called. **Your method should always return `nil` otherwise**.
 
 # How to run your own slackify
+
 ## Initial Setup
+
 1. Install slackify in your app by adding the following line in your `Gemfile`:
 
 ```ruby
@@ -193,32 +229,32 @@ bundle install
 
 5. [Proceed to connect your bot to slack](#slack-setup)
 
-
 ## Slack Setup
+
 First, you'll need to create a new app on slack. Head over to [slack api](https://api.slack.com/apps) and create a new app.
 
 1. **Set Slack Secret Token**
 
-    In order to verify that the requets are coming from slack, we'll need to set the slack secret token in slackify. This value can be found as the signing secret in the app credentials section of the basic information page.
+   In order to verify that the requets are coming from slack, we'll need to set the slack secret token in slackify. This value can be found as the signing secret in the app credentials section of the basic information page.
 
 2. **Add a bot user**
-  
-    Under the feature section, click on "bot users". Pick a name for you slack bot and toggle on "Always Show My Bot as Online". Save the setting.
+
+   Under the feature section, click on "bot users". Pick a name for you slack bot and toggle on "Always Show My Bot as Online". Save the setting.
 
 3. **Enable events subscription**
 
-    Under the feature section, click "Events subscription". Turn the feature on and use your app url followed by `/slackify/event`. [Ngrok](https://ngrok.com/) can easily get you a public url if you are developing locally. The app needs to be running when you configure this url. After the url is configured, under the section "Subscribe to Bot Events", add the bot user event `message.im`.
+   Under the feature section, click "Events subscription". Turn the feature on and use your app url followed by `/slackify/event`. [Ngrok](https://ngrok.com/) can easily get you a public url if you are developing locally. The app needs to be running when you configure this url. After the url is configured, under the section "Subscribe to Bot Events", add the bot user event `message.im`.
 
 4. **Activate the interactive components**
-  
-    Under the feature section, click "interactive components". Turn the feature on and use your ngrok url followed by `/slackify/interactive`. Save the setting.
+
+   Under the feature section, click "interactive components". Turn the feature on and use your ngrok url followed by `/slackify/interactive`. Save the setting.
 
 5. **Install the App**
 
-    Under the setting section, click "install app" and proceed to install the app to the workspace. Once the app is installed, go back to the "install app" page and copy the Bot User OAuth Access Token.
+   Under the setting section, click "install app" and proceed to install the app to the workspace. Once the app is installed, go back to the "install app" page and copy the Bot User OAuth Access Token.
 
 6. **Configure Slackify**
-Add a new initializer with the following code
+   Add a new initializer with the following code
 
 ```ruby
 # config/initializers/slackify.rb
@@ -229,7 +265,7 @@ end
 ```
 
 7. **Define handlers specific subtypes** (Optional)
-You can set custom [message subtype](https://api.slack.com/events/message) handlers or custom [event type](https://api.slack.com/events) handlers inside your configuration
+   You can set custom [message subtype](https://api.slack.com/events/message) handlers or custom [event type](https://api.slack.com/events) handlers inside your configuration
 
 ```ruby
 # config/initializers/slackify.rb
@@ -248,19 +284,19 @@ end
 ```
 
 8. **Handle bot messages** (Highly optional)
-If you want your bot to accept other bot messages (which you probably should not do), you can. In the configuration step, you can set an array of whitelisted bot ids.
+   If you want your bot to accept other bot messages (which you probably should not do), you can. In the configuration step, you can set an array of approved bot ids.
 
 ```ruby
 # config/initializers/slackify.rb
 Slackify.configure do |config|
 ...
-config.whitelisted_bot_ids = ['abc123', 'def456']
+config.approved_bot_ids = ['abc123', 'def456']
 ...
 end
 ```
 
 **At this point, you are ready to go 😄**
 
-
 # LICENSE
+
 Copyright (c) 2019 Justin Léger, Michel Chatmajian. See [LICENSE](https://github.com/jusleg/slackify/blob/master/LICENSE) for further details.

data/app/controllers/concerns/slack_token_verify.rb

@@ -26,8 +26,7 @@ module SlackTokenVerify
     end
 
     signature = "v0:#{timestamp}:#{request_body}"
-    calculated_hmac = "v0=" +
-                      OpenSSL::HMAC.hexdigest("sha256", Slackify.configuration.slack_secret_token, signature)
+    calculated_hmac = "v0=#{OpenSSL::HMAC.hexdigest('sha256', Slackify.configuration.slack_secret_token, signature)}"
 
     return if ActiveSupport::SecurityUtils.secure_compare(calculated_hmac, hmac_header)
 

data/app/controllers/slackify/slack_controller.rb

@@ -69,7 +69,7 @@ module Slackify
       return if (params[:event][:subtype] == "bot_message" ||
         params[:event].key?(:bot_id) ||
         params[:event][:hidden]) &&
-                Slackify.configuration.whitelisted_bot_ids.exclude?(params.dig(:event, :bot_id))
+                Slackify.configuration.approved_bot_ids.exclude?(params.dig(:event, :bot_id))
 
       command = params[:event][:text]
       Slackify::Router.call_command(command, params[:slack])

data/lib/slackify/configuration.rb

@@ -6,7 +6,7 @@ module Slackify
   # Where the configuration for Slackify lives
   class Configuration
     attr_reader :custom_message_subtype_handlers, :slack_bot_token, :unhandled_handler, :custom_event_type_handlers
-    attr_accessor :handlers, :slack_secret_token, :slack_client, :whitelisted_bot_ids
+    attr_accessor :handlers, :slack_secret_token, :slack_client, :approved_bot_ids
 
     def initialize
       @slack_bot_token = nil
@@ -16,7 +16,7 @@ module Slackify
       @custom_message_subtype_handlers = {}
       @custom_event_type_handlers = {}
       @unhandled_handler = Handlers::UnhandledHandler
-      @whitelisted_bot_ids = []
+      @approved_bot_ids = []
     end
 
     # Set your own unhandled handler
@@ -36,7 +36,7 @@ module Slackify
     # Set the token that we will use to connect to slack
     def slack_bot_token=(token)
       @slack_bot_token = token
-      @slack_client = Slack::Web::Client.new(token: token).freeze
+      @slack_client = Slack::Web::Client.new(token: token)
     end
 
     # Set a handler for a specific message subtype
@@ -71,7 +71,11 @@ module Slackify
     def read_handlers_yaml
       raise 'config/handlers.yml does not exist' unless File.exist?("#{Rails.root}/config/handlers.yml")
 
-      YAML.load_file("#{Rails.root}/config/handlers.yml") || []
+      if YAML.respond_to?(:unsafe_load_file)
+        YAML.unsafe_load_file(Rails.root.join("config/handlers.yml")) || []
+      else
+        YAML.load_file("#{Rails.root}/config/handlers.yml") || []
+      end
     end
   end
 end

data/lib/slackify/exceptions.rb

@@ -7,7 +7,7 @@ module Slackify
     class HandlerNotSupported < StandardError; end
     # You handler is failing validations
     class InvalidHandler < StandardError; end
-    # The handler method was not whitelisted to be a slash command
+    # The handler method was not approved to be a slash command
     class MissingSlashPermission < StandardError; end
   end
 end

data/lib/slackify/handlers/base.rb

@@ -22,7 +22,7 @@ module Slackify
         # needs to call a method on a supported handler and that handler needs
         # to explicitly specify which methods are for slash command.
         def allow_slash_method(element)
-          if @allowed_slash_methods
+          if defined?(@allowed_slash_methods) && @allowed_slash_methods
             @allowed_slash_methods.push(*element)
           else
             @allowed_slash_methods = Array(element)
@@ -32,6 +32,7 @@ module Slackify
         # Any class inheriting from Slackify::Handler::Base will be added to
         # the list of supported handlers
         def inherited(subclass)
+          super
           @@supported_handlers.push(subclass.to_s)
         end
 

data/lib/slackify/handlers/factory.rb

@@ -16,6 +16,8 @@ module Slackify
           built_command.regex = command['regex']
           built_command.handler = handler.name.camelize.constantize.method(command['action'])
           built_command.description = command['description']
+          built_command.parameters = command['parameters']
+          built_command.base_command = command['base_command']
           handler.commands << built_command.freeze
         end
 

data/lib/slackify/handlers/validator.rb

@@ -5,36 +5,83 @@ module Slackify
     # Simple validator for handlers. It will blow your app up on the
     # configuration step instead of crashing when handling production requests.
     class Validator
-      # Checks if your handler hash is valid. It's pass or raise 🧨💥
-      def self.verify_handler_integrity(handler)
-        handler_name = handler.keys.first
-        handler_class = handler_name.camelize.constantize
+      VALID_PARAMETER_TYPES = [:string, :int, :boolean, :float].freeze
 
-        unless handler[handler_name].key?('commands') && handler.dig(handler_name, 'commands')&.any?
-          raise Exceptions::InvalidHandler, "#{handler_name} doesn't have any command specified"
-        end
+      class << self
+        # Checks if your handler hash is valid. It's pass or raise 🧨💥
+        def verify_handler_integrity(handler)
+          handler_name = handler.keys.first
+          handler_class = handler_name.camelize.constantize
+
+          unless handler[handler_name].key?('commands') && handler.dig(handler_name, 'commands')&.any?
+            raise Exceptions::InvalidHandler, "#{handler_name} doesn't have any command specified"
+          end
 
-        handler_errors = []
+          handler_errors = []
 
-        handler.dig(handler_name, 'commands').each do |command|
-          command_errors = []
+          handler.dig(handler_name, 'commands').each do |command|
+            command_errors = []
 
-          unless command['regex'].is_a?(Regexp)
-            command_errors.append('No regex was provided.')
-          end
+            unless command['regex'] || command['base_command']
+              command_errors.append('No regex or base command was provided.')
+            end
+
+            if command['regex'].present?
+              if command['base_command'].present?
+                command_errors.append('Regex and base_command cannot be used in the same handler.')
+              end
+
+              if command['parameters'].present?
+                command_errors.append('Regex and parameters cannot be used in the same handler.')
+              end
+
+              unless command['regex'].is_a?(Regexp)
+                command_errors.append('No regex was provided.')
+              end
+            end
 
-          unless !command['action'].to_s.strip.empty? && handler_class.respond_to?(command['action'])
-            command_errors.append('No valid action was provided.')
+            if command['base_command']
+              unless command['base_command'].is_a?(String)
+                command_errors.append('Invalid base command provided, it must be a string.')
+              end
+
+              if command['parameters'].present?
+                command_errors << validate_parameters(command['parameters'])
+              end
+            end
+
+            unless !command['action'].to_s.strip.empty? && handler_class.respond_to?(command['action'])
+              command_errors.append('No valid action was provided.')
+            end
+            command_errors = command_errors.flatten.compact
+            handler_errors.append("[#{command['name']}]: #{command_errors.join(' ')}") unless command_errors.empty?
           end
 
-          handler_errors.append("[#{command['name']}]: #{command_errors.join(' ')}") unless command_errors.empty?
+          unless handler_errors.empty?
+            raise Exceptions::InvalidHandler, "#{handler_name} is not valid: #{handler_errors.join(' ')}"
+          end
+        rescue NameError
+          raise Exceptions::InvalidHandler, "#{handler_name} is not defined"
         end
 
-        unless handler_errors.empty?
-          raise Exceptions::InvalidHandler, "#{handler_name} is not valid: #{handler_errors.join(' ')}"
+        def validate_parameters(parameters)
+          errors = []
+          parameters.each do |parameter|
+            key = parameter.keys[0]
+            type = parameter.values[0]
+
+            next if VALID_PARAMETER_TYPES.include?(type.to_sym)
+
+            type.constantize
+            next if Slackify::Parameter.supported_parameters.include?(type)
+
+            errors << "Invalid parameter type for: #{key}, '#{type}'.\n"\
+              "If this is a custom parameter, make sure it inherits from Slackify::Parameter"
+          rescue NameError
+            errors << "Failed to find the custom class for: #{key}, '#{type}'."
+          end
+          errors
         end
-      rescue NameError
-        raise Exceptions::InvalidHandler, "#{handler_name} is not defined"
       end
     end
   end

data/lib/slackify/parameter.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Slackify
+  # Base parameter class that any user defined parameters must inherit from
+  class Parameter
+    @@supported_parameters = []
+
+    class << self
+      # Any class inheriting from Slackify::Parameter will be added to
+      # the list of supported parameters
+      def inherited(subclass)
+        super
+        @@supported_parameters.push(subclass.to_s)
+      end
+
+      # Show a list of the parameters supported by the app. Since we do
+      # metaprogramming, we want to ensure we can only call defined parameter
+      def supported_parameters
+        @@supported_parameters
+      end
+    end
+  end
+end

data/lib/slackify/router.rb

@@ -3,6 +3,12 @@
 module Slackify
   # In charge of routing a message to its proper handler
   class Router
+    MATCHING_QUOTES = {
+      "'": "'",
+      '"': '"',
+      '“': "”",
+    }.freeze
+
     class << self
       # List all available commands
       def all_commands
@@ -11,7 +17,10 @@ module Slackify
 
       # Find the matching command based on the message string
       def matching_command(message)
-        all_commands.each { |command| return command if command.regex.match? message }
+        all_commands.each do |command|
+          return command if command.regex.present? && command.regex.match?(message)
+          return command if command.base_command.present? && message.start_with?(command.base_command)
+        end
         nil
       end
 
@@ -23,10 +32,75 @@ module Slackify
 
           Slackify.configuration.unhandled_handler.unhandled(params)
         else
-          new_params = params.merge(command_arguments: command.regex.match(message).named_captures)
+          new_params = params.merge( command_arguments: extract_arguments(message, command) )
+
           command.handler.call(new_params)
         end
       end
+
+      def extract_arguments(message, command)
+        if command.regex
+          command.regex.match(message).named_captures
+        else
+          raw_arguments = message.sub(/^#{command.base_command}/, '').strip
+          spec = {}
+          command.parameters.each do |parameter|
+            spec[parameter.keys[0].to_sym] = { type: parameter.values[0].to_sym }
+          end
+          parse_by_spec(spec, raw_arguments)
+        end
+      end
+
+      def parse_by_spec(spec, raw_arguments)
+        processed_args = {}
+
+        s = StringScanner.new(raw_arguments)
+        until s.eos?
+          # get the key, remove '=' and extra whitespace
+          current_key = s.scan_until(/=/)
+          break if current_key.nil?
+
+          current_key = current_key[0..-2].strip
+
+          # grab value accounting for any quotes
+          next_char = s.getch
+          terminating_string = if (end_quote = MATCHING_QUOTES[next_char.to_sym])
+                                 /#{end_quote}/
+                               else
+                                 s.unscan
+                                 / /
+                               end
+
+          processed_args[current_key.to_sym] = if s.exist?(terminating_string)
+                                                 # grab everything before the next instance of the terminating character
+                                                 s.scan_until(terminating_string)[0..-2]
+                                               else
+                                                 # this is probably wrong unless we were expecting a space, but hit eos
+                                                 s.rest
+                                               end
+        end
+
+        # only pass on expected parameters for now.
+        processed_spec = {}
+        spec.each do |key, value|
+          # coerce to the expected type
+          type = value.fetch(:type, 'string')
+          processed_spec[key] = case type
+                                when :int
+                                  processed_args[key].to_i
+                                when :float
+                                  processed_args[key].to_f
+                                when :boolean
+                                  ActiveModel::Type::Boolean.new.cast(processed_args[key])
+                                when :string
+                                  processed_args[key]
+                                else
+                                  Object.const_get(type).new(processed_args[key]).parse
+                                end
+        end
+
+        processed_spec
+      end
     end
   end
 end

data/lib/slackify.rb

@@ -4,11 +4,13 @@ require 'slackify/configuration'
 require 'slackify/engine'
 require 'slackify/exceptions'
 require 'slackify/handlers'
+require 'slackify/parameter'
 require 'slackify/router'
 
 module Slackify
   class << self
     attr_writer :configuration
+
     def configuration
       @configuration ||= Configuration.new
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slackify
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.2
 platform: ruby
 authors:
 - Justin Leger
@@ -27,6 +27,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.1
+- !ruby/object:Gem::Dependency
+  name: strscan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -117,6 +131,7 @@ files:
 - lib/slackify/handlers/factory.rb
 - lib/slackify/handlers/unhandled_handler.rb
 - lib/slackify/handlers/validator.rb
+- lib/slackify/parameter.rb
 - lib/slackify/router.rb
 homepage: https://github.com/jusleg/slackify
 licenses:
@@ -139,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Slackbot framework for Rails using the Events API