edi 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49b443b32994361ff1476b80c9170b541165d7c2
-  data.tar.gz: 3393b9b90969d9619a08e9c132f84cc5e535859e
+  metadata.gz: e58b16b135e152636c1cac5801c1202469b77775
+  data.tar.gz: ebb7220b6e05bb58c838fa677e33f6a05e41316b
 SHA512:
-  metadata.gz: d62316c9aa4da46aad19d6d1ff4df57fb9b0c3faefe2519903131fce135a20e35587883650cba2568788ef499dd4dc31cc37eaf1cdf0ef831a6ee28c3c787f89
-  data.tar.gz: bd9580510b9280dabd57e8340e1ab9008c77ba155a17750d525a3ac14ba4d8e9e197a73ff7c941b2c1ffe1ddbbc8ceed86e9c85a88aff34a0e25fcaeb4d33589
+  metadata.gz: 811b359111df50176f17dbfdb47a65e50ff57387df17dbfa8c6b9181c4c18c339cee953d782bb551c4a48139caae5ce4e91119b8d1139ef7c2b3f6b46f76a766
+  data.tar.gz: 973f43e01e447e95117d1b214acb8ddb215693b6f0762fb10575f379ecdf17460e17ba7177e0a827287fb9cc96f5e60a5db1cb4be750f4aedde6031925628311

data/README.md

@@ -106,6 +106,16 @@ class Joke < EDI::Service
 end
 ```
 
+## Deployment
+
+Since EDI is, under the hood, a web socket client, it can be deployed to any internet connected computer, and does not require a web server. Simple run
+
+```shell
+$ edi start -D
+```
+
+And EDI will connect to slack and will stay connected for the life of the process.
+
 ## Ship List
 
 When these things are done, we'll be ready for 1.0
@@ -117,6 +127,7 @@ When these things are done, we'll be ready for 1.0
 - [x] Service Generator
 - [x] Configure All The Things
 - [x] Boot Process for the Generated App
+- [x] Switch from sinatra-based incoming and outgoing webhooks to websocket-based implementation
 
 ## Upcoming Features
 
@@ -128,7 +139,7 @@ You can make special classes that model special messages you'd like EDI to send
 
 ```ruby
 class CiMessage < EDI::Message
-  channel "#general":w
+  channel "#general"
 
 end
 ```

data/lib/edi/services/null_service.rb

@@ -1,5 +1,5 @@
 class NullService < EDI::Service
   def run
-    EDI::ArrayResponder.new(EDI.config.default_response).respond
+    nil
   end
 end

data/lib/edi/slack/websocket_incoming_message.rb

@@ -23,7 +23,7 @@ module Slack
 
     def mentions_edi?
       if text
-        text.match /#{EDI.bot_name}/i
+        !!text.match(/#{EDI.bot_name}(\W|$)/i)
       else
         false
       end

data/lib/edi/version.rb

@@ -1,3 +1,3 @@
 module EDI
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/edi/websocket/client.rb

@@ -25,7 +25,7 @@ module Websocket
           if incoming_message.should_respond?
             response_text = ""
             service = Proc.new { response_text = EDI.runner.new(message: incoming_message).execute }
-            response = Proc.new { client.send Slack::WebsocketOutgoingMessage.new(text: response_text, channel: incoming_message.channel, id: id).to_json }
+            response = Proc.new { client.send Slack::WebsocketOutgoingMessage.new(text: response_text, channel: incoming_message.channel, id: id).to_json if response_text }
             EM.defer service, response
             increment_id
           end

data/spec/slack/websocket_incoming_message_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'json'
+
+RSpec.describe Slack::WebsocketIncomingMessage do
+  subject { described_class.new params }
+  describe "Case Insensitive" do
+    context "Lowercase" do
+      let(:params) { {type: "message", text: "hello edi"}.to_json }
+      it { expect(subject.mentions_edi?).to eq true }
+    end
+
+    context "uppercase" do
+      let(:params) { {type: "message", text: "hello EDI"}.to_json }
+      it { expect(subject.mentions_edi?).to eq true }
+    end
+  end
+
+  describe "Responds when edi is followed by !" do
+    let(:params) { {type: "message", text: "hello edi!"}.to_json }
+    it { expect(subject.mentions_edi?).to eq true }
+  end
+
+  describe "Responds when edi is followed by ." do
+    let(:params) { {type: "message", text: "hello edi."}.to_json }
+    it { expect(subject.mentions_edi?).to eq true }
+  end
+
+  describe "Responds when edi is followed by ?" do
+    let(:params) { {type: "message", text: "hello edi?"}.to_json }
+    it { expect(subject.mentions_edi?).to eq true }
+  end
+
+  describe "Responds when edi is followed by ," do
+    let(:params) { {type: "message", text: "hello edi,"}.to_json }
+    it { expect(subject.mentions_edi?).to eq true }
+  end
+
+  describe "Doesn't respond when edi is part of a larger word" do
+    let(:params) { {type: "message", text: "I should edit that file"}.to_json }
+    it { expect(subject.mentions_edi?).to eq false }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edi
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - DVG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -365,6 +365,7 @@ files:
 - spec/services/null_service_spec.rb
 - spec/services/tweet_that_spec.rb
 - spec/services/weather_spec.rb
+- spec/slack/websocket_incoming_message_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/vcr_cassettes/fact.yml
 - spec/support/fixtures/vcr_cassettes/giphy.yml
@@ -434,6 +435,7 @@ test_files:
 - spec/services/null_service_spec.rb
 - spec/services/tweet_that_spec.rb
 - spec/services/weather_spec.rb
+- spec/slack/websocket_incoming_message_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/vcr_cassettes/fact.yml
 - spec/support/fixtures/vcr_cassettes/giphy.yml