scsi 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72b52c20daefb5e48f29ea7a3669f062b9f2bb7d
-  data.tar.gz: fdcfa0bf71e203f47be2204880242811dedefa6c
+  metadata.gz: 5c69377469572b51abb3d920f71f343e4531596b
+  data.tar.gz: 2188f305be3d6fcaa7883d743f18622d35cde308
 SHA512:
-  metadata.gz: 65e4ee49682f37fdd0d15ea7890c80cb4981944b23142b54df3903ad77c22da92545e6db664e5a9d86ce801ad25501c324db21190454bab12b627b63f97aee25
-  data.tar.gz: 5e0acb79d339383eee13ef48d1d3e64c43e5698ef9f6814b314ae1d8fd1556398d26d2bc0cbc6ef0bf3b161818d3f806b484d1d97a2e78f03a917c8a3fb6c496
+  metadata.gz: fa7ab4a897d6ac810ba967165fa098848b2208f47486f1a5f3baa95bf9c77dbd55d255f3d6a6c5334c2645ebe4706666e6bdb6593bb25f6f1c3487f532659bbf
+  data.tar.gz: 222c0f4bdfc6f19713b998638ddb4a1d12ef512b55d943ae90f9cfa63c5837ff45385bb587111f33ecf8677b56630a4070f2191fee91c65b6848dbdfa0d8242d

data/README.md

@@ -1,5 +1,7 @@
 # scsi
 
+[![Gem Version](https://badge.fury.io/rb/scsi.svg)](https://badge.fury.io/rb/scsi) [![Code Climate](https://codeclimate.com/github/propelfuels/scsi/badges/gpa.svg)](https://codeclimate.com/github/propelfuels/scsi) [![security](https://hakiri.io/github/propelfuels/scsi/master.svg)](https://hakiri.io/github/propelfuels/scsi/master)
+
 A Ruby server for receiving Slack Slash Command and responding with Slack info.
 
 ## Requirements
@@ -41,7 +43,7 @@ end
 
 ### Run
 
-In Slack, add a [Slash Command](https://my.slack.com/apps/A0F82E8CA-slash-commands) configuration. Set the URL to wherever you're exposing the SCSI server at. (Hint: setup an SSL front; Slack requires your server to talk HTTPS. E.g., NGINX reverse proxy, [Cloudflare](https://www.cloudflare.com/ssl/).)
+In Slack, add a [Slash Command](https://my.slack.com/apps/A0F82E8CA-slash-commands) configuration. Set the URL to wherever you're exposing the SCSI server at. (Hint: setup an SSL front; Slack requires your server to talk HTTPS. E.g., NGINX reverse proxy, [Cloudflare](https://www.cloudflare.com/ssl/).) Also, turn on the "Escape channels, users, and links" setting.
 
 The minimum to start the SCSI server:
 

data/lib/scsi/helper.rb

@@ -7,9 +7,9 @@ module SCSI
 
     def slash_keys
       return [
-        :user_name, :user_id,
-        :channel_name, :channel_id,
-        :team_domain, :team_id
+        :user_id, :user_name,
+        :channel_id, :channel_name,
+        :team_id, :team_domain
       ]
     end
 
@@ -17,24 +17,57 @@ module SCSI
       return nil unless params.class == Hash
       info = {}
       slash_keys.each { |k| info[k] = params[k] }
+      info[:text] = params[:text]
       return info
     end
 
-    def format_info(info)
+    def create_attachments(data:, keys:)
       attachments = []
       i = 0
-      while i < slash_keys.count do
-        a = slash_keys[i]
-        b = slash_keys[i + 1]
+      while i < keys.count do
+        a = keys[i]
+        b = keys[i + 1]
         attachments << {fields: [
-          {title: a, value: info[a], short: true},
-          {title: b, value: info[b], short: true}
+          {title: a, value: data[a], short: true},
+          {title: b, value: data[b], short: true}
         ]}
         i += 2
       end
+      return attachments
+    end
+
+    def attachments_from_text(text)
+      attachments = []
+      text.scan(/<(.*?)>/) do |m|
+        case m[0][0]
+        when '#'
+          keys = [:channel_id, :channel_name]
+        when '@'
+          keys = [:user_id, :user_name]
+        when '!'
+          keys = [:special_command, :label]
+        else
+          keys = [:link, :label]
+        end
+        values = m[0].split('|')
+        data = {keys[0] => values[0][1..-1], keys[1] => values[1]}
+        attachments << create_attachments(data: data, keys: keys)[0]
+      end
+      return attachments
+    end
+
+    def format_info(info)
+      attachments = []
+      q = ''
+      attachments = attachments_from_text(info[:text]) if info[:text]
+      if attachments.empty?
+        attachments = create_attachments(data: info, keys: slash_keys)
+      else
+        q = " ?>> `#{info[:text]}`"
+      end
       return {
         response_type: "ephemeral",
-        text: "SCSI: Slash Command Slack Info v#{SCSI::Version}",
+        text: "SCSI: Slash Command Slack Info v#{SCSI::Version}" + q,
         attachments: attachments
       }
     end

data/lib/scsi/version.rb

@@ -1,5 +1,5 @@
 module SCSI
 
-  Version = '0.1.0'
+  Version = '0.2.0'
 
 end

data/scsi.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
+  s.required_ruby_version = '>= 2.1'
+
   s.add_runtime_dependency 'kajiki', '~> 1.1'
   s.add_runtime_dependency 'sinatra', '~> 1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scsi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kajiki
@@ -69,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="