edi 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 509fdbebab1bf240454565b4bb1a3835210e060d
-  data.tar.gz: 1daef08eb3939ab71bf48ed5c526643a284e3670
+  metadata.gz: 601cdae478aa39f3a62c7fa674c5611004d72d5c
+  data.tar.gz: 4c663b2a26f1006c0ab47c63f3e323b68b4fd985
 SHA512:
-  metadata.gz: 54b1cb9fde916c3378d58f94ba03af1239a14541b910389c802a7c2e3e018f833c7a9398151baeb2156e29881c99a2eb09f71af534881be7c9b0f10f447cebd7
-  data.tar.gz: 2410c5a787d83bdff9b8765f6a2f95a46b9bab1783c457ec87b70e0084e732909d4ae4d85deb6e71827061cfb11c9566e923754d1e803a1ecbc4b627e00724aa
+  metadata.gz: 430594d7295f5dc3827b2d4cf1d29e988d1599eb3b0cfbd6b8e6f1f12ffd4ba32348abae9b92f11205f52b6efb5ef581d87cd4b90723a3d1fb0a3c87cdc67291
+  data.tar.gz: bb11a163d75bb8eb35bce7949ed1cbc1891ea89833ead95b1c0607c98f8516c9a3d40068204c8a65b486b8e079e8a3a4714fd6b5b9e84742c9c64e2378edd607

data/:w

@@ -0,0 +1,57 @@
+require 'faye/websocket'
+require 'eventmachine'
+
+module Websocket
+  class Client
+    attr_accessor :ws_url, :client, :id
+
+    def initialize
+      self.id = 1
+    end
+
+    def connect
+      connection = EDI.get("https://slack.com/api/rtm.start?token=#{EDI.bot_token}").response
+      require 'byebug'
+      debugger
+      self.ws_url = connection["url"]
+      EM.run {
+
+        self.client = Faye::WebSocket::Client.new(ws_url)
+
+        client.on :open do |event|
+          puts "EDI is now online"
+        end
+
+        # Respond to Messages
+        client.on :message do |event|
+          incoming_message = Slack::WebsocketIncomingMessage.new(event.data)
+          if incoming_message.should_respond?
+            puts "EDI received message #{incoming_message.text} in channel #{incoming_message.channel}"
+            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 if response_text }
+            EM.defer service, response
+            increment_id
+          end
+        end
+
+        # Kepp Websocket Connection Alive
+        EM.add_periodic_timer(1) do
+          client.ping
+        end
+      }
+    end
+
+    def send_message(message)
+      client.send Slack::WebsocketOutgoingMessage.new(text: message, channel: "D046WN43L", id: id).to_json
+      increment_id
+    end
+
+private
+
+    # There has to be a way to do this better
+    def increment_id
+      self.id += 1
+    end
+  end
+end

data/lib/edi.rb

@@ -70,6 +70,18 @@ module EDI
       self.config.bot_token
     end
 
+    def channels
+      @channels ||= []
+    end
+
+    def add_channel(channel)
+      channels << channel
+    end
+
+    def send_message(message, channel_name: "general", channel_id: nil)
+      EDI.websocket.send_message(message, channel_name: channel_name, channel_id: channel_id)
+    end
+
   end
   include EDI::HTTPUtilities
   include EDI::Configuration

data/lib/edi/service_runner.rb

@@ -7,6 +7,7 @@ class ServiceRunner
 
     def execute
       self.service = EDI::Interpreter.new(message).determine_service.new(message)
+      puts "Service: #{service.class} invoked"
       begin
         _run_service
       rescue EDI::UnfitEnvironmentException => e

data/lib/edi/slack.rb

@@ -1,3 +1,4 @@
 require 'edi/slack/message'
 require 'edi/slack/websocket_incoming_message'
 require 'edi/slack/websocket_outgoing_message'
+require 'edi/slack/channel'

data/lib/edi/slack/channel.rb

@@ -0,0 +1,18 @@
+module Slack
+  class Channel
+    attr_accessor :id, :name
+    def initialize(id:, name:)
+      @id = id
+      @name = name
+    end
+
+    def self.find_by_name(name)
+      EDI.channels.find { |c| c.name == name }
+    end
+
+    def self.find_by_id(id)
+      EDI.channels.find { |c| c.id == id }
+    end
+
+  end
+end

data/lib/edi/version.rb

@@ -1,3 +1,3 @@
 module EDI
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/lib/edi/websocket/client.rb

@@ -10,7 +10,11 @@ module Websocket
     end
 
     def connect
-      self.ws_url = EDI.get("https://slack.com/api/rtm.start?token=#{EDI.bot_token}").response["url"]
+      connection = EDI.get("https://slack.com/api/rtm.start?token=#{EDI.bot_token}").response
+      connection["channels"].each do |c|
+        EDI.add_channel Slack::Channel.new(name: c["name"], id: c["id"])
+      end
+      self.ws_url = connection["url"]
       EM.run {
 
         self.client = Faye::WebSocket::Client.new(ws_url)
@@ -23,6 +27,7 @@ module Websocket
         client.on :message do |event|
           incoming_message = Slack::WebsocketIncomingMessage.new(event.data)
           if incoming_message.should_respond?
+            puts "EDI received message #{incoming_message.text} in channel #{incoming_message.channel}"
             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 if response_text }
@@ -38,8 +43,21 @@ module Websocket
       }
     end
 
+    def send_message(message, channel_name: "general", channel_id: nil)
+      unless channel_id
+        channel_id = lookup_channel_by_name(channel_name).id
+      end
+      client.send Slack::WebsocketOutgoingMessage.new(text: message, channel: channel_id, id: id).to_json
+      increment_id
+    end
+
 private
 
+    def lookup_channel_by_name(name)
+      Slack::Channel.find_by_name(name)
+    end
+
+    # There has to be a way to do this better
     def increment_id
       self.id += 1
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edi
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - DVG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -288,6 +288,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- ":w"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -342,6 +343,7 @@ files:
 - lib/edi/services/tweet_that.rb
 - lib/edi/services/weather.rb
 - lib/edi/slack.rb
+- lib/edi/slack/channel.rb
 - lib/edi/slack/message.rb
 - lib/edi/slack/websocket_incoming_message.rb
 - lib/edi/slack/websocket_outgoing_message.rb