talker 0.0.2 → 0.0.4

data/README.md

@@ -6,13 +6,9 @@ A real-time Talker Ruby client.
 
 2) Get your Talker Token on https://myaccount.talkerapp.com/settings
 
-3) Find the Room ID you want to connect to. This is the last part of the URL:
+3) Serve hot and enjoy
 
-     https://myaccount.talkerapp.com/rooms/<room_id>
-
-4) Serve hot and enjoy
-
-    Talker.connect(:room => ROOM_ID, :token => YOUR_TALKER_TOKEN) do |client|
+    Talker.connect(:room => "Room name", :token => YOUR_TALKER_TOKEN) do |client|
       client.on_connected do
         client.send_message "hello!"
       end

data/bin/talker-cat

@@ -1,23 +1,20 @@
 #!/usr/bin/env ruby
-require "talker"
+require "talker/client"
 require "talker/cli"
 
 token = Talker::CLI.load_token
 room = ARGV.first
 
 abort <<-EOS unless room
-usage: echo 'something' | talker-cat <room_id>
+usage: echo 'something' | talker-cat <room name>
 
-  Send a message to a room:
+  Send the result of a command to a room:
   
-    echo 'something' | talker-cat 1
+    ls lolcats/*.jpg | talker-cat Main
   
   Send a file to a room:
   
-    talker-cat 1 < site_fixer.rb
-  
-  Room ID is the last part of the URL:
-    https://myaccount.talkerapp.com/rooms/<room_id>
+    talker-cat Main < site_fixer.rb
   
 EOS
 
@@ -36,7 +33,7 @@ module Reader
   end
 end
 
-Talker.connect(:room => room.to_i, :token => token) do |client|
+Talker::Client.connect(:room => room, :token => token) do |client|
   client.on_connected do
     conn = EM.watch STDIN, Reader
     conn.client = client

data/bin/talker-shell

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require "talker"
+require "talker/client"
 require "talker/cli"
 
 token = Talker::CLI.load_token
@@ -7,13 +7,11 @@ room, cmd, process_name = *ARGV
 process_name ||= cmd
 
 abort <<-EOS unless room && cmd
-usage: talker-shell <room_id> <command> [name]
+usage: talker-shell <room name> <command> [name]
+
   Launch an irb session connected to a room:
   
-    talker-shell 1 irb
-  
-  Room ID is the last part of the URL:
-    https://myaccount.talkerapp.com/rooms/<room_id>
+    talker-shell Main irb
   
 EOS
 
@@ -38,7 +36,7 @@ end
 
 
 EM.run do
-  Talker.connect(:room => room.to_i, :token => token) do |client|
+  Talker::Client.connect(:room => room, :token => token) do |client|
     @process = nil
     
     client.on_connected do

data/lib/talker.rb

@@ -1,147 +1,5 @@
-require "eventmachine"
-require "yajl"
-
-class Talker < EM::Connection
-  CALLBACKS = %w( connected message private_message join idle back leave presence error close event )
-  
-  class Error < RuntimeError; end
-  
-  attr_accessor :connect_options, :thread, :current_user
-  
+module Talker
   def self.connect(options={})
-    host = options.delete(:host) || "talkerapp.com"
-    port = (options.delete(:port) || 8500).to_i
-
-    thread = Thread.new { EM.run } unless EM.reactor_running?
-    
-    connection = EM.connect host, port, self do |c|
-      c.thread = thread
-      c.connect_options = options
-      yield c if block_given?
-    end
-    
-    thread.join if thread
-    
-    connection
+    Client.connect(options)
   end
-  
-  def initialize
-    @users = {}
-  end
-  
-  # Callbacks
-  CALLBACKS.each do |method|
-    class_eval <<-EOS
-      def on_#{method}(&block)
-        @on_#{method} = block
-      end
-    EOS
-  end
-  
-  def users
-    @users.values
-  end
-  
-  def send_message(message, attributes={})
-    send({ :type => "message", :content => message }.merge(attributes))
-  end
-  
-  def find_user!(user_name)
-    @users.values.detect { |user| user["name"] == user_name } || raise(Error, "User #{user_name} not found")
-  end
-  
-  def send_private_message(to, message)
-    if to.is_a?(String)
-      user_id = find_user!(to)["id"]
-    else
-      user_id = to
-    end
-    send_message message, :to => user_id
-  end
-  
-  def leave
-    send :type => "close"
-    close
-  end
-  
-  def close
-    close_connection_after_writing
-  end
-  
-  
-  ## EventMachine callbacks
-  
-  def connection_completed
-    send @connect_options.merge(:type => "connect")
-    EM.add_periodic_timer(20) { send :type => "ping" }
-  end
-  
-  def post_init
-    @parser = Yajl::Parser.new
-    @parser.on_parse_complete = method(:event_parsed)
-  end
-  
-  def receive_data(data)
-    @parser << data
-  end
-  
-  def unbind
-    trigger :close
-    @thread.kill if @thread
-  end
-  
-  
-  private
-    def event_parsed(event)
-      trigger :event, event
-      
-      case event["type"]
-      when "connected"
-        @current_user = event["user"]
-        trigger :connected, event["user"]
-      when "error"
-        if @on_error
-          @on_error.call(event["message"])
-        else
-          raise Error, event["message"]
-        end
-      when "users"
-        event["users"].each do |user|
-          @users[user["id"]] = user
-        end
-        trigger :presence, @users.values
-      when "join"
-        @users[event["user"]["id"]] = event["user"]
-        trigger :join, event["user"]
-      when "leave"
-        @users.delete(event["user"]["id"])
-        trigger :leave, event["user"]
-      when "idle"
-        trigger :idle, event["user"]
-      when "back"
-        trigger :back, event["user"]
-      when "message"
-        @users[event["user"]["id"]] ||= event["user"]
-        if event["private"]
-          trigger :private_message, event["user"], event["content"]
-        else
-          trigger :message, event["user"], event["content"]
-        end
-      else
-        raise Error, "unknown event type received from server: " + event["type"]
-      end
-      
-    rescue
-      close
-      raise
-    end
-    
-    def trigger(callback, *args)
-      callback = instance_variable_get(:"@on_#{callback}")
-      callback.call(*args) if callback
-    end
-    
-    def send(data)
-      send_data Yajl::Encoder.encode(data) + "\n"
-    end
 end

data/lib/talker/cli.rb

@@ -1,4 +1,4 @@
-class Talker
+module Talker
   class CLI
     def self.load_token
       token_path = File.join(ENV['HOME'], '.talker')

data/lib/talker/client.rb

@@ -0,0 +1,151 @@
+require "eventmachine"
+require "yajl"
+
+module Talker
+  class Client < EM::Connection
+    CALLBACKS = %w( connected message private_message join idle back leave presence error close event )
+    
+    class Error < RuntimeError; end
+    
+    attr_accessor :connect_options, :thread, :current_user
+    
+    def self.connect(options={})
+      host = options.delete(:host) || "talkerapp.com"
+      port = (options.delete(:port) || 8500).to_i
+      ssl = options[:ssl] != false
+      
+      thread = Thread.new { EM.run } unless EM.reactor_running?
+      
+      connection = EM.connect host, port, self do |c|
+        c.start_tls if ssl
+        c.thread = thread
+        c.connect_options = options
+        yield c if block_given?
+      end
+      
+      thread.join if thread
+      
+      connection
+    end
+    
+    def initialize
+      @users = {}
+    end
+    
+    # Callbacks
+    CALLBACKS.each do |method|
+      class_eval <<-EOS
+        def on_#{method}(&block)
+          @on_#{method} = block
+        end
+      EOS
+    end
+    
+    def users
+      @users.values
+    end
+    
+    def send_message(message, attributes={})
+      send({ :type => "message", :content => message }.merge(attributes))
+    end
+    
+    def find_user!(user_name)
+      @users.values.detect { |user| user["name"] == user_name } || raise(Error, "User #{user_name} not found")
+    end
+    
+    def send_private_message(to, message)
+      if to.is_a?(String)
+        user_id = find_user!(to)["id"]
+      else
+        user_id = to
+      end
+      send_message message, :to => user_id
+    end
+    
+    def leave
+      send :type => "close"
+      close
+    end
+    
+    def close
+      close_connection_after_writing
+    end
+    
+    
+    ## EventMachine callbacks
+    
+    def connection_completed
+      send @connect_options.merge(:type => "connect")
+      EM.add_periodic_timer(20) { send :type => "ping" }
+    end
+    
+    def post_init
+      @parser = Yajl::Parser.new
+      @parser.on_parse_complete = method(:event_parsed)
+    end
+    
+    def receive_data(data)
+      @parser << data
+    end
+    
+    def unbind
+      trigger :close
+      @thread.kill if @thread
+    end
+    
+    
+    private
+      def event_parsed(event)
+        trigger :event, event
+        
+        case event["type"]
+        when "connected"
+          @current_user = event["user"]
+          trigger :connected, event["user"]
+        when "error"
+          if @on_error
+            @on_error.call(event["message"])
+          else
+            raise Error, event["message"]
+          end
+        when "users"
+          event["users"].each do |user|
+            @users[user["id"]] = user
+          end
+          trigger :presence, @users.values
+        when "join"
+          @users[event["user"]["id"]] = event["user"]
+          trigger :join, event["user"]
+        when "leave"
+          @users.delete(event["user"]["id"])
+          trigger :leave, event["user"]
+        when "idle"
+          trigger :idle, event["user"]
+        when "back"
+          trigger :back, event["user"]
+        when "message"
+          @users[event["user"]["id"]] ||= event["user"]
+          if event["private"]
+            trigger :private_message, event["user"], event["content"]
+          else
+            trigger :message, event["user"], event["content"]
+          end
+        else
+          raise Error, "unknown event type received from server: " + event["type"]
+        end
+      
+      rescue
+        close
+        raise
+      end
+      
+      def trigger(callback, *args)
+        callback = instance_variable_get(:"@on_#{callback}")
+        callback.call(*args) if callback
+      end
+      
+      def send(data)
+        send_data Yajl::Encoder.encode(data) + "\n"
+      end
+  end
+end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require "rubygems"
 require "yaml"
 require 'spec'
 $:.unshift File.dirname(__FILE__) + "/../lib"
-require "talker"
+require "talker/client"
 
 # Installing em-spec from http://github.com/macournoyer/em-spec
 require 'em/spec'
@@ -13,7 +13,7 @@ TALKER_CONFIG = YAML.load_file(File.dirname(__FILE__) + "/talker.yml")
 
 module Helpers
   def connect(&callback)
-    Talker.connect :room => TALKER_CONFIG["room"].to_i, :token => TALKER_CONFIG["token"], &callback
+    Talker::Client.connect :room => TALKER_CONFIG["room"].to_i, :token => TALKER_CONFIG["token"], &callback
   end
 end
 

data/talker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = "talker"
-  s.version         = "0.0.2"
+  s.version         = "0.0.4"
  
   s.authors         = ["Marc-Andre Cournoyer"]
   s.email           = "macournoyer@talkerapp.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: talker
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -05:00
+date: 2010-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ files:
 - bin/talker-cat
 - bin/talker-shell
 - lib/talker/cli.rb
+- lib/talker/client.rb
 - lib/talker.rb
 - Rakefile
 - README.md