poundie 0.0.4 → 0.1.1

data/lib/poundie.rb

@@ -6,6 +6,8 @@ require "yaml"
 require "readline"
 require "typhoeus"
 require "json"
+require "uri"
+require "yajl/http_stream"
 
 require "poundie/runner"
 require "poundie/plugin"
@@ -14,8 +16,6 @@ require "poundie/campfire/message"
 require "poundie/plugins/greeter"
 require "poundie/plugins/debug"
 
-trap('INT') { puts "ok bye!" ; exit! }
-
 module Poundie
   def self.start(name="default")
     name.gsub!(/\W/, '_')

data/lib/poundie/campfire/message.rb

@@ -1,8 +1,8 @@
 module Poundie
   module Campfire
     class Message
-      def initialize(hash)
-        @hash = hash
+      def initialize(room, hash)
+        @room, @hash = room, hash
       end
 
       def id
@@ -22,7 +22,7 @@ module Poundie
       end
 
       def user
-        Poundie::Campfire::User.new(@hash[:user])
+        Poundie::Campfire::User.get(@room, @hash[:user_id])
       end
 
       def type

data/lib/poundie/campfire/user.rb

@@ -1,6 +1,17 @@
 module Poundie
   module Campfire
     class User
+      def self.get(room, user_id)
+        cache[user_id] || begin
+          json = room.users.detect { |u| u["id"] == user_id }
+          cache[user_id] = Poundie::Campfire::User.new(json)
+        end
+      end
+
+      def self.cache
+        @cache ||= {}
+      end
+
       def initialize(hash)
         @hash = hash
       end

data/lib/poundie/plugin.rb

@@ -36,11 +36,12 @@ module Poundie
     end
 
     def call(message)
-      message = Poundie::Campfire::Message.new(message)
+      message = Poundie::Campfire::Message.new(@room, message)
       begin
         match?(message) && perform(message)
       rescue => e
         puts "ERROR: #{e.message}"
+        puts "       #{e.backtrace.join("\n")}"
         raise e
       end
     end

data/lib/poundie/runner.rb

@@ -8,12 +8,11 @@ module Poundie
     end
 
     def run
-      trap('INT') { exit! }
-      room.listen do |line|
+      url = URI.parse("http://#{@token}:x@streaming.campfirenow.com//room/#{room.id}/live.json")
+      puts "Starting stream: #{url.inspect}"
+      Yajl::HttpStream.get(url, :symbolize_keys => true) do |message|
         Thread.new do
-          plugins.each { |plugin|
-            plugin.call(line)
-          }
+          plugins.each { |plugin| plugin.call(message) }
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: poundie
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 25
   prerelease: 
   segments: 
   - 0
-  - 0
-  - 4
-  version: 0.0.4
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 -04:00
-default_executable: 
+date: 2011-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tinder
@@ -46,6 +45,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Uses plugins to interact with campfire rooms
 email: 
 executables: []
@@ -65,7 +78,6 @@ files:
 - lib/poundie/plugins/greeter.rb
 - lib/poundie/plugins/debug.rb
 - lib/poundie/runner.rb
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -95,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: A campfire bot