ellen 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00aad36c6f88f0f259b0fa6cd9a24c6e1a0cdd13
-  data.tar.gz: 38e66b51e6389d497260ca257f6145ee25f22c4b
+  metadata.gz: a7632e618c8546962cbe7c6dc8bb6c8f1622a75e
+  data.tar.gz: e0892a3d514bd92263803f65391c72b38a3cb6a0
 SHA512:
-  metadata.gz: 63bb23ab82f4d1781b6c9474fb8694113020eec94f497151d6f7e12ff1c5a44fd047a726f965ee1e16283be05cad46140fcee1ed5e47df4fc52c903ac8aaf4df
-  data.tar.gz: a14ac2143cde8550c000027ae6fdb4525b2bff22da17b5442cf3cb6e558f553f949543300a4d806458ce3e29ca281c68cb8ec33316179fbb60a615fd5001bd08
+  metadata.gz: 3b1a73b5c3d1ea5faf6596b2cc24562982d86fbb82980cdbac95524f43af3efb1bdc996476d30c86d557e44f3ddb4ec57a42aba68345238747edefd566a2b92b
+  data.tar.gz: 432256a6c72779709dd78553ad2991af954c152abafb064b9cdb108ded299104d1b8b3c21d4eecd76b3e4b5ea31b1fca4bf034b343ab0c0f575608a07837c37c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.0
+* Change adapter & message interface
+
 ## 0.1.3
 * Change Ellen::Message interface
 

data/lib/ellen/actions/base.rb

@@ -0,0 +1,11 @@
+module Ellen
+  module Actions
+    class Base
+      attr_reader :message
+
+      def initialize(message)
+        @message = message
+      end
+    end
+  end
+end

data/lib/ellen/actions/help.rb

@@ -0,0 +1,27 @@
+module Ellen
+  module Actions
+    class Help < Base
+      def call
+        message.reply(body)
+      end
+
+      private
+
+      def body
+        action_descriptions.join("\n")
+      end
+
+      def action_descriptions
+        Ellen.actions.map do |action|
+          prefix = ""
+          prefix << message.robot.name << " " unless  action.all?
+          "%-#{pattern_max_length + prefix.size}s - #{action.description}" % "#{prefix}#{action.pattern.inspect}"
+        end
+      end
+
+      def pattern_max_length
+        Ellen.actions.map {|action| action.pattern.inspect }.map(&:size).max
+      end
+    end
+  end
+end

data/lib/ellen/actions/ping.rb

@@ -0,0 +1,19 @@
+module Ellen
+  module Actions
+    class Ping < Base
+      def call
+        message.reply(pong)
+      end
+
+      private
+
+      def ping
+        message.body[-4..-1]
+      end
+
+      def pong
+        ping.gsub(/i/i, "i" => "o", "I" => "O")
+      end
+    end
+  end
+end

data/lib/ellen/adapters/shell.rb

@@ -16,8 +16,8 @@ module Ellen
         listen
       end
 
-      def say(body, options = {})
-        Ellen.logger.info(body)
+      def say(message)
+        Ellen.logger.info(message[:body])
       end
 
       private

data/lib/ellen/handlers/help.rb

@@ -1,12 +1,10 @@
 module Ellen
   module Handlers
     class Help < Base
-      on /help\z/i, name: "help", description: "Show this help message"
+      on /help( me)?\z/i, name: "help", description: "Show this help message"
 
       def help(message)
-        robot.say Ellen.actions.map {|action|
-          "%-30s - #{action.description}" % "#{robot.name unless action.all?} #{action.pattern.inspect}"
-        }.join("\n")
+        Ellen::Actions::Help.new(message).call
       end
     end
   end

data/lib/ellen/handlers/ping.rb

@@ -4,7 +4,7 @@ module Ellen
       on /ping\z/i, name: "ping", description: "Return PONG to PING"
 
       def ping(message)
-        robot.say message.body[-4..-1].gsub(/i/i, "i" => "o", "I" => "O")
+        Ellen::Actions::Ping.new(message).call
       end
     end
   end

data/lib/ellen/message.rb

@@ -1,10 +1,17 @@
 module Ellen
   class Message
-    attr_reader :body, :match_data, :from, :to
+    attr_reader(
+      :body,
+      :from,
+      :match_data,
+      :robot,
+      :to,
+    )
 
     def initialize(options)
       @body = options[:body]
       @from = options[:from]
+      @robot = options[:robot]
       @to = options[:to]
     end
 
@@ -15,5 +22,10 @@ module Ellen
     def [](index)
       match_data[index]
     end
+
+    def reply(body, options = {})
+      attributes = { body: body, from: from, to: to }.merge(options)
+      robot.say(attributes)
+    end
   end
 end

data/lib/ellen/robot.rb

@@ -22,7 +22,7 @@ module Ellen
     end
 
     def receive(attributes)
-      message = Message.new(attributes)
+      message = Message.new(attributes.merge(robot: self))
       handlers.each do |handler|
         handler.call(message)
       end

data/lib/ellen/version.rb

@@ -1,3 +1,3 @@
 module Ellen
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/ellen.rb

@@ -31,6 +31,9 @@ module Ellen
 end
 
 require "ellen/action"
+require "ellen/actions/base"
+require "ellen/actions/help"
+require "ellen/actions/ping"
 require "ellen/adapter_builder"
 require "ellen/env"
 require "ellen/env/missing_required_key_error"

data/spec/ellen/adapters/shell_spec.rb

@@ -50,7 +50,7 @@ describe Ellen::Adapters::Shell do
   describe "#say" do
     it "shows given message body on stdout" do
       Ellen.logger.should_receive(:info).with("a")
-      adapter.say("a")
+      adapter.say(body: "a")
     end
   end
 end

data/spec/ellen/handlers/help_spec.rb

@@ -6,9 +6,28 @@ describe Ellen::Handlers::Help do
   end
 
   describe "#help" do
+    let(:from) do
+      "alice"
+    end
+
+    let(:to) do
+      "#general"
+    end
+
+    let(:body) do
+      <<-EOS.strip_heredoc.strip
+        ellen /help( me)?\\z/i - Show this help message
+        ellen /ping\\z/i       - Return PONG to PING
+      EOS
+    end
+
     it "responds to `@ellen help` and says each handler's usage" do
-      robot.should_receive(:say).with(%r<ellen /help\\z/i +- Show this help message>)
-      robot.receive(body: "@ellen help")
+      robot.should_receive(:say).with(
+        body: body,
+        from: from,
+        to: to,
+      )
+      robot.receive(body: "@ellen help", from: from, to: to)
     end
   end
 end

data/spec/ellen/handlers/ping_spec.rb

@@ -6,15 +6,17 @@ describe Ellen::Handlers::Ping do
   end
 
   describe "#ping" do
-    {
-      "@ellen ping" => "pong",
-      "@ellen Ping" => "Pong",
-      "@ellen PING" => "PONG",
-    }.each do |input, output|
-      it "responds to `#{input}` and says `#{output}`" do
-        robot.should_receive(:say).with(output)
-        robot.receive(body: input)
-      end
+    let(:from) do
+      "alice"
+    end
+
+    let(:to) do
+      "#general"
+    end
+
+    it "returns PONG to PING" do
+      robot.should_receive(:say).with(body: "pong", from: from, to: to)
+      robot.receive(body: "@ellen ping", from: from, to: to)
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ if ENV["CI"]
   CodeClimate::TestReporter.start
 end
 
+require "active_support/core_ext/string/strip"
 require "ellen"
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ellen
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -170,6 +170,9 @@ files:
 - images/screenshot.png
 - lib/ellen.rb
 - lib/ellen/action.rb
+- lib/ellen/actions/base.rb
+- lib/ellen/actions/help.rb
+- lib/ellen/actions/ping.rb
 - lib/ellen/adapter_builder.rb
 - lib/ellen/adapters/base.rb
 - lib/ellen/adapters/shell.rb