libfchat 0.1.5 → 0.2.0

data/lib/libfchat/fchat.rb

@@ -7,14 +7,14 @@ module Libfchat
     #I don't actually NEED rubygems, unless on 1.8
   end
   require 'multi_json'
+  require 'faye/websocket'
   require 'eventmachine'
-  require 'em-http-request'
   require 'libfchat/version'
   require 'libfchat/webapi'
   
   class Fchat
     attr_reader :ticket
-    attr_accessor :http
+    attr_accessor :websocket
 
     attr_reader :version
     attr_reader :clientname
@@ -28,6 +28,21 @@ module Libfchat
       @version = version
     end
 
+    ##
+    # Some method_missing magic to make ruby handle just throwing around
+    # commands that may or may not exist.
+
+    def method_missing(method_name, *args, &block)
+      puts "Method_missing: #{method_name}"
+      # Try to handle all three-letter strings
+      puts "Trying to parse |#{method_name.to_s[0,3]}|"
+      if method_name.to_s[0,3] == method_name.to_s
+        puts "Dunno how to handle #{method_name.to_s}"
+      else
+        #super(method_name,*args,&block)
+      end
+    end
+
     ##
     # Login to fchat as a specific user, and start the event machine
 
@@ -35,34 +50,32 @@ module Libfchat
       webapi = Libfchat::WebAPI.new
       @ticket = webapi.get_ticket(account,password)
 
-      EventMachine.run {
-        self.http = EventMachine::HttpRequest.new(server).get :timeout => timeout
-        self.http.errback { puts "Could not connect to " + server }
-        self.http.callback { 
+      EM.run {
+        @websocket = Faye::WebSocket::Client.new(server)
+
+        @websocket.onopen = lambda do |event|
           puts "Websocket connected"
-          self.send_IDN(account,character,ticket)
-        }
+          self.send('IDN',account,character,ticket)
+          puts "Authentication sent"
+        end
+
+        @websocket.onclose = lambda do |event|
+          @websocket = nil
+        end
 
-        self.http.stream { |msg|
-          puts "#{msg[0,3]}: #{msg[4,-1]}"
-          self.send(msg[0,3].upcase,MultiJson.load(msg[4,-1]))
-        }
+        @websocket.onmessage = lambda do |event|
+          puts "<< #{event.data}"
+        end
       }
     end
 
-    ##
-    # Some method_missing magic to make ruby handle just throwing around
-    # commands that may or may not exist.
-
-    def method_missing(method_name, *args, &block)
-      # Try to handle all three-letter strings
-      if method_name.to_s[0,3] == method_name.to_s
-        puts "Dunno how to handle #{method_name.to_s}"
-      else
-        super(method_name,*args,&block)
-      end
+    def send_message(type,json)
+      jsonstr = ::MultiJson.dump(json)
+      msg = "#{type} #{jsonstr}"
+      puts ">> #{msg}"
+      @websocket.send(msg)
     end
-  
+
     # ====================================================== #
     # All commands that can be sent by a client have helpers #
     # ====================================================== #
@@ -71,33 +84,39 @@ module Libfchat
     # Performs an account ban against a characters account. 
     # *This command requires chat op or higher.*
     
-    def send_ACB(character)
+    def ACB(character)
       json = { :character => character }
-      self.http.send( "ACB " + MultiJSON.dump(json) )
+      self.send('send_message','ACB',json)
     end
 
     ##
     # Adds a character to the chat operator list.
     # *This command is admin only.*
       
-    def send_AOP(character)
+    def AOP(character)
       json = { :character => character }
-      self.http.send( "AOP " + MultiJSON.dump(json) )
+      self.send('send_message','AOP',json)
     end
 
     ##
     # This command is used to identify with the server.
-    # NOTE: If you send any commands before identifying, you will be disconnected.
-
-    def send_IDN(account,character,ticket,cname=@clientname,cversion=@version,method="ticket")
+    # NOTE: If you send any commands before identifying, you will be
+    # disconnected.
+
+    def IDN(account,
+            character,
+            ticket,
+            cname=@clientname,
+            cversion=@version,
+            method="ticket")
       # Initial identification with the server
       json = {:account   => account,
               :character => character,
-              :ticket    => ticket,
+              :ticket    => ticket['ticket'],
               :cname     => cname,
               :cversion  => cversion,
-              :method    => ticket}
-      self.http.send( "IDN " + MultiJson.dump(json) )
+              :method    => 'ticket'}
+      self.send('send_message','IDN',json)
     end
 
 

data/lib/libfchat/version.rb

@@ -2,5 +2,5 @@ module Libfchat
   # We're doing this because we might write tests that deal
   # with other versions of Libfchat and we are unsure how to
   # handle this better.
-  VERSION = "0.1.5" unless defined?(::Libfchat::VERSION)
+  VERSION = "0.2.0" unless defined?(::Libfchat::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libfchat
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -60,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.6
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 0.4.6
 description: A library for connecting to F-chat ( http://f-list.net )
 email: cheetahmorph@gmail.com
 executables: []