libfchat 1.4 → 1.5

data/lib/libfchat/fchat.rb

@@ -9,11 +9,12 @@ module Libfchat
   require 'multi_json'
   require 'faye/websocket'
   require 'eventmachine'
+  require 'logger'
+  require 'insensitive_hash/minimal'
   require 'libfchat/version'
   require 'libfchat/webapi'
   
   class Fchat
-    attr_accessor :spam
     attr_reader :ticket
     attr_accessor :websocket
 
@@ -33,17 +34,19 @@ module Libfchat
     attr_accessor :ops
     attr_accessor :users
     attr_accessor :rooms
+    attr_accessor :logger
 
     ##
     # Initialize the object with the name and version. 
     # Default to just identifying as the library
 
-    def initialize(clientname="libfchat-ruby by Jippen Faddoul ( http://github.com/jippen/libfchat-ruby )",version=Libfchat::VERSION)
+    def initialize(clientname="libfchat-ruby by Jippen Faddoul ( http://github.com/jippen/libfchat-ruby )",version=Libfchat::VERSION, level=Logger::DEBUG)
       @clientname = clientname
       @version = version
-      @users = Hash.new
-      @rooms = Hash.new
-      @spam = true
+      @users = InsensitiveHash.new
+      @rooms = InsensitiveHash.new
+      @logger = Logger.new(STDOUT)
+      @logger.level = level
     end
 
     ##
@@ -69,10 +72,7 @@ module Libfchat
         data = MultiJson.load('{}')
       end
 
-      # Output if spamminess is enabled
-      if @spam
-        puts "<< #{msg}"
-      end
+      @logger.debug("<< #{msg}")
 
       begin
         self.send("got_#{type}",data)
@@ -86,6 +86,7 @@ module Libfchat
     def login(server,account,password,character,timeout=30)
       webapi = Libfchat::WebAPI.new
       @ticket = webapi.get_ticket(account,password)
+      @me = character
 
       EM.run {
         @websocket = Faye::WebSocket::Client.new(server)
@@ -110,13 +111,11 @@ module Libfchat
     def send_message(type, json)
       jsonstr = ::MultiJson.dump(json)
       msg = "#{type} #{jsonstr}"
-      if @spam
-        if type == 'IDN'
-          json[:ticket] = '[REDACTED]'
-        end
-        filteredjsonstr = ::MultiJson.dump(json)
-        puts ">> #{type} #{filteredjsonstr}"
+      if type == 'IDN'
+        json[:ticket] = '[REDACTED]'
       end
+      filteredjsonstr = ::MultiJson.dump(json)
+      @logger.debug(">> #{type} #{filteredjsonstr}")
       @websocket.send(msg)
     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 = "1.4" unless defined?(::Libfchat::VERSION)
+  VERSION = "1.5" unless defined?(::Libfchat::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libfchat
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &16280920 !ruby/object:Gem::Requirement
+  requirement: &13036760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *16280920
+  version_requirements: *13036760
 - !ruby/object:Gem::Dependency
   name: miniunit
-  requirement: &16280320 !ruby/object:Gem::Requirement
+  requirement: &13036220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *16280320
+  version_requirements: *13036220
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &16279740 !ruby/object:Gem::Requirement
+  requirement: &13035760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *16279740
+  version_requirements: *13035760
 - !ruby/object:Gem::Dependency
   name: faye-websocket
-  requirement: &16279180 !ruby/object:Gem::Requirement
+  requirement: &13035300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *16279180
+  version_requirements: *13035300
 description: A library for connecting to F-chat ( http://f-list.net )
 email: cheetahmorph@gmail.com
 executables: []