chatroid 0.0.2 → 0.0.3

data/README.md

@@ -9,6 +9,8 @@ $ gem "chatroid"
 
 ## Example
 You can create your own bot working in a chat service.
+The following example creates a bot,
+which responds to tweets which include the word "yunotti" or any replies to it.
 
 ```ruby
 require "chatroid"
@@ -20,14 +22,15 @@ Chatroid.new do
   set :access_key,      "..."
   set :access_secret,   "..."
 
-  on_message do |event|
+  on_tweet do |event|
     if event["text"] =~ /yunotti/
-      post "✘╹◡╹✘"
+      favorite event
+      follow event
     end
   end
 
   on_reply do |event|
-    post "me too", :to => event
+    reply "✘╹◡╹✘", event
   end
 end.run!
 ```
@@ -36,4 +39,8 @@ end.run!
 Currently following services are supported:
 
 * Twitter
-* HipChat(WIP)
+
+I plan to support following services:
+
+* IRC
+* HipChat

data/lib/chatroid/adapter/twitter.rb

@@ -4,30 +4,18 @@ require "json"
 
 class Chatroid
   module Adapter
-    class Twitter
-      def initialize(chatroid)
-        @chatroid = chatroid
-      end
+    module Twitter
+      private
 
       def connect
-        EventMachine.error_handler do |error|
-          puts "Error raised during event loop: #{error.message}"
-        end
         EventMachine::run do
-          stream.each_item(&method(:on_each_event))
+          stream.each_item do |json|
+            event = JSON.parse(json)
+            on_each_event(event)
+          end
         end
       end
 
-      def post(body, options = {})
-        client.update(body)
-      end
-
-      def user_info
-        @user_info ||= client.info
-      end
-
-      private
-
       def stream
         @stream ||= ::Twitter::JSONStream.connect(
           :host  => "userstream.twitter.com",
@@ -35,38 +23,53 @@ class Chatroid
           :port  => 443,
           :ssl   => true,
           :oauth => {
-            :consumer_key    => @chatroid.config[:consumer_key],
-            :consumer_secret => @chatroid.config[:consumer_secret],
-            :access_key      => @chatroid.config[:access_key],
-            :access_secret   => @chatroid.config[:access_secret],
+            :consumer_key    => config[:consumer_key],
+            :consumer_secret => config[:consumer_secret],
+            :access_key      => config[:access_key],
+            :access_secret   => config[:access_secret],
           }
         )
       end
 
       def client
         @client ||= TwitterOAuth::Client.new(
-          :consumer_key    => @chatroid.config[:consumer_key],
-          :consumer_secret => @chatroid.config[:consumer_secret],
-          :token           => @chatroid.config[:access_key],
-          :secret          => @chatroid.config[:access_secret]
+          :consumer_key    => config[:consumer_key],
+          :consumer_secret => config[:consumer_secret],
+          :token           => config[:access_key],
+          :secret          => config[:access_secret]
         )
       end
 
-      def on_each_event(json)
-        case event = JSON.parse(json)
-        when event["in_reply_to_status_id"]
-          on_reply(event)
-        when event["text"]
-          on_tweet(event)
-        end
+      def tweet(body)
+        client.update(body)
+      end
+
+      def reply(body, event)
+        id   = event["id"]
+        user = event["user"]["screen_name"]
+        body = "@#{user} #{body}"
+        client.update(body, :in_reply_to_status_id => id)
+      end
+
+      def favorite(event)
+        client.favorite(event["id"])
       end
 
-      def on_tweet(event)
-        @chatroid.trigger_tweet(event)
+      def follow(event)
+        client.friend(event["user"]["id"])
       end
 
-      def on_reply(event)
-        @chatroid.trigger_reply(event)
+      def user_info
+        @user_info ||= client.info
+      end
+
+      def on_each_event(event)
+        case
+        when event["in_reply_to_user_id"] == user_info["id"]
+          trigger_reply(event)
+        when event["text"]
+          trigger_tweet(event)
+        end
       end
     end
   end

data/lib/chatroid/version.rb

@@ -1,3 +1,3 @@
 class Chatroid
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/chatroid.rb

@@ -15,7 +15,8 @@ class Chatroid
 
   def run!
     validate_connection
-    adapter.connect
+    extend(adapter)
+    connect
   end
 
   private
@@ -36,11 +37,6 @@ class Chatroid
     config.merge!(hash)
   end
 
-  # Post message via adapter
-  def post(*args)
-    adapter.post(*args)
-  end
-
   def validate_connection
     validate_config
     validate_adapter
@@ -63,15 +59,11 @@ class Chatroid
   end
 
   def has_adapter?
-    has_service? && adapter_class
-  end
-
-  def adapter_class
-    Adapter.find(config[:service])
+    has_service? && adapter
   end
 
   def adapter
-    @adapter ||= adapter_class.new(self)
+    Adapter.find(config[:service])
   end
 
   class ConnectionError < StandardError; end

data/spec/chatroid/adapter/twitter_spec.rb

@@ -1,28 +1,47 @@
 require "spec_helper"
 
 describe Chatroid::Adapter::Twitter do
-  shared_examples_for "interface of Chatroid::Adapter" do
-    it do
-      Chatroid::Adapter::Twitter.should be_respond_to(:new)
-    end
-
-    it do
-      Chatroid::Adapter::Twitter.new(mock).should be_respond_to(:connect)
-    end
-
-    it do
-      Chatroid::Adapter::Twitter.new(mock).should be_respond_to(:post)
+  let(:chatroid) do
+    Chatroid.new do
+      extend Chatroid::Adapter::Twitter
     end
   end
 
-  it_should_behave_like "interface of Chatroid::Adapter"
-
   describe "#connect" do
     it "should work in EventMachine::run" do
       EventMachine.should_receive(:run) do |&block|
         block.should be_a(Proc)
       end
-      Chatroid::Adapter::Twitter.new(mock).connect
+      chatroid.send(:connect)
+    end
+  end
+
+  describe "#tweet" do
+    it "should call TwitterOAuth::Client#update with body" do
+      TwitterOAuth::Client.any_instance.should_receive(:update).with("body")
+      chatroid.send(:tweet, "body")
+    end
+  end
+
+  describe "#reply" do
+    it "should call TwitterOAuth::Client#update with body and id" do
+      TwitterOAuth::Client.any_instance.should_receive(:update).
+        with("@foo body", :in_reply_to_status_id => 1)
+      chatroid.send(:reply, "body", "id" => 1, "user" => { "screen_name" => "foo" })
+    end
+  end
+
+  describe "#favorite" do
+    it "should call TwitterOAuth::Client#favorite with id" do
+      TwitterOAuth::Client.any_instance.should_receive(:favorite).with("1")
+      chatroid.send(:favorite, "id" => "1")
+    end
+  end
+
+  describe "#follow" do
+    it "should call TwitterOAuth::Client#friend with id" do
+      TwitterOAuth::Client.any_instance.should_receive(:friend).with("1")
+      chatroid.send(:follow, "user" => { "id" => "1" })
     end
   end
 end

data/spec/chatroid_spec.rb

@@ -55,8 +55,10 @@ describe Chatroid do
         chatroid = Chatroid.new
         chatroid.stub(:has_service?).and_return(true)
         chatroid.stub(:has_adapter?).and_return(true)
+        chatroid.stub(:adapter_class)
+        chatroid.stub(:extend)
         chatroid.stub(:adapter).and_return(adapter)
-        adapter.should_receive(:connect)
+        chatroid.should_receive(:connect)
         chatroid.run!
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatroid
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter-stream
-  requirement: &70293885438900 !ruby/object:Gem::Requirement
+  requirement: &70196510426520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70293885438900
+  version_requirements: *70196510426520
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &70293885438300 !ruby/object:Gem::Requirement
+  requirement: &70196510425840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70293885438300
+  version_requirements: *70196510425840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70293885437520 !ruby/object:Gem::Requirement
+  requirement: &70196510425060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293885437520
+  version_requirements: *70196510425060
 description: Chatroid is a gem for quickly creating chatterbot in Ruby
 email:
 - r7kamura@gmail.com