smartfox 0.3.1 → 0.4.0

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "self@richardpenwell.me"
     gem.homepage = "http://github.com/penwellr/smartfox"
     gem.authors = ["Richard Penwell"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", "~> 2.0"
     gem.add_dependency 'json'
     gem.add_dependency 'builder'
     gem.add_dependency 'libxml-ruby'
@@ -22,17 +22,21 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.spec_files = FileList['spec/**/*_spec.rb']
+  end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-  spec.rcov_opts = ['--exclude', "features,kernel,load-diff-lcs\.rb,instance_exec\.rb,lib/spec.rb,lib/spec/runner.rb,^spec/*,bin/spec,examples,/gems,/Library/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+    spec.rcov_opts = ['--exclude', "features,kernel,load-diff-lcs\.rb,instance_exec\.rb,lib/spec.rb,lib/spec/runner.rb,^spec/*,bin/spec,examples,/gems,/Library/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
+  end
+rescue
+  puts "Rspec ~> 2.0 (or a dependency) is not available.  Install it with: gem install rspec"
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/smartfox/client.rb

@@ -6,16 +6,17 @@ class SmartFox::Client
   class ConnectionFailureError < SmartFox::SmartFoxError; end
   class ApiIncompatibleError < SmartFox::SmartFoxError; end
   class TransportTimeoutError < SmartFox::SmartFoxError; end
-
+  
   attr_reader :connected, :room_list, :buddy_list, :server, :port
-  attr_reader :current_room, :users, :user_id
+  attr_reader :current_room, :users
   alias_method :connected?, :connected
+  attr_accessor :user_id, :user_name
   
   CLIENT_VERSION = "1.5.8"
   CONNECTION_TIMEOUT = 5
   TRANSPORTS = [ SmartFox::Socket::Connection, SmartFox::BlueBox::Connection ]
   EVENTS = [ :connected, :logged_in, :rooms_updated ]
-
+  
   HEADER_SYSTEM = 'sys'
   HEADER_EXTENDED = 'xt'
   
@@ -24,12 +25,13 @@ class SmartFox::Client
   ACTION_API_OBSOLETE = 'apiKO'
   ACTION_LOGIN = 'login'
   ACTION_LOGIN_OK = 'logOK'
-  ACTION_AUTO_JOIN = 'autoJoin'
+  ACTION_AUTO_JOIN = 'autoJoin'  
+  ACTION_JOIN_ROOM = 'joinRoom'
   ACTION_UPDATE_ROOMS = 'getRmList'
   ACTION_ROOM_LIST = 'rmList'
   ACTION_JOIN_OK = 'joinOK'
   ACTION_JOIN_FAIL = 'joinKO'
-
+  
   EXTENDED_RESPONSE = 'xtRes'
   
   def initialize(options = {})
@@ -52,11 +54,11 @@ class SmartFox::Client
           started_at = Time.now
           @transport = transport_class.new(self)
           @transport.connect
-
+          
           while not connected? and Time.now <= started_at + CONNECTION_TIMEOUT
             Thread.pass
           end
-
+          
           return @transport if connected?
         rescue
         end
@@ -64,52 +66,66 @@ class SmartFox::Client
       raise ConnectionFailureError.new "Could not negotiate any transport with server."
     end
   end
-
+  
   def disconnect
     if @connected
       @transport.disconnect
       @connected = false
     end
-  end
-
+  end 
+  
   def extended_command(action, data = nil, room = -1, options = {})
     options[:format] ||= :xml
-
+    
     case options[:format]
-    when :xml
+      when :xml
       send_packet(HEADER_EXTENDED, action, room) { |x| x.cdata!(data || '') }
     end
   end
-
+  
   def add_handler(event, &proc)
     @events[event.to_sym] = [] unless @events[event.to_sym]
     @events[event.to_sym] << proc
   end
-
+  
   def refresh_rooms
     send_packet(HEADER_SYSTEM, ACTION_UPDATE_ROOMS)
   end
-
+  
   def connect_succeeded
     send_packet(HEADER_SYSTEM, ACTION_VERSION_CHECK, 0) { |x| x.ver(:v => CLIENT_VERSION.delete('.')) }
   end
-
+  
   def auto_join
     send_packet(HEADER_SYSTEM, ACTION_AUTO_JOIN)
+  end  
+  
+  def join_room(room)
+    #CHECK: activeRoomId == -1 no room has already been entered
+    if(@current_room == -1 || @current_room == nil)       
+      leave_current_room = "0"
+      room_to_leave = -1                
+    else 
+      leave_current_room = "1"
+      room_to_leave = @current_room
+    end
+    send_packet(HEADER_SYSTEM, ACTION_JOIN_ROOM, room.id) { |x| 
+      x.room(:id=>room.id,:pwd=>'',:spec=>'0',:leave=>leave_current_room,:old=>room_to_leave) 
+    }
   end
-
+  
   def packet_recieved(data)
     begin
       SmartFox::Logger.debug "SmartFox::Client#packet_recieved('#{data}')"
-      packet = SmartFox::Packet.parse(data)
+      packet = SmartFox::Packet.parse(data)     
       case packet.header
-      when HEADER_SYSTEM
+        when HEADER_SYSTEM
         if @connected
           handle_system_packet(packet)
         else
           complete_login(packet)
         end
-      when HEADER_EXTENSION
+        when HEADER_EXTENDED
         raise_event :extended_response, self, packet.data
       end
     rescue => e
@@ -117,7 +133,7 @@ class SmartFox::Client
       SmartFox::Logger.exception e
     end
   end
-
+  
   def login(zone, username, password = nil)
     send_packet(HEADER_SYSTEM, ACTION_LOGIN) do |packet|
       packet.login(:z => zone) do |login|
@@ -127,20 +143,21 @@ class SmartFox::Client
     end
     Thread.pass
   end
-
+  
   def send_extended(extension, action, options)
+    SmartFox::Logger.debug "send_extended #{extension},#{action},#{options}"    
     options[:format] ||= :xml
-    options[:room] ||= (current_room ? current_room.id : 0)
+    options[:room] ||= (@current_room ? @current_room.id : 0)
     options[:parameters] ||= {}
-
+    
     case options[:format]
-    when :xml
-
+      when :xml
+      
     when :json
       send_extended_json_packet(extension, action, options[:room], options[:parameters])
     end
   end
-
+  
   def parse_user(node)
     if user = @users[node['i'].to_i]
       user.parse(node)
@@ -148,7 +165,7 @@ class SmartFox::Client
       @users[node['i'].to_i] = SmartFox::User.parse(node)
     end
   end
-
+  
   private
   def send_packet(header, action, room_id = -1)
     xml = Builder::XmlMarkup.new()
@@ -163,13 +180,13 @@ class SmartFox::Client
     SmartFox::Logger.debug "SmartFox::Client#send_packet -> #{packet}"
     @transport.send_data(packet + "\0")
   end
-
+  
   def send_extended_json_packet(name, action, room, object)
     packet = { :t => 'xt', :b => { :x => name, :c => action, :r => room, :p => object } }
     SmartFox::Logger.debug "SmartFox::Client#send_extended_json_packet -> #{packet.to_json}"
     @transport.send_data(packet.to_json + "\0")
   end
-
+  
   def raise_event(event_name, *params)
     event = @events[event_name.to_sym]
     return unless event
@@ -177,7 +194,7 @@ class SmartFox::Client
       event_handler.call(*params)
     end
   end
-
+  
   def complete_login(connect_response)
     if connect_response.header == HEADER_SYSTEM and connect_response.action == ACTION_API_OK
       @connected = true
@@ -187,32 +204,36 @@ class SmartFox::Client
       raise ApiIncompatibleError if connect_response.action == ACTION_API_OBSOLETE
       raise ConnectionFailureError.new "Did not recieve an expected response from the server."
     end
-  end
-
+  end  
+  
   def handle_system_packet(packet)
-    case packet.action
-    when ACTION_LOGIN_OK
+     SmartFox::Logger.debug "packet.action=#{packet.action}"
+    case packet.action     
+      when ACTION_LOGIN_OK
+      SmartFox::Logger.debug "packet.data = #{packet.data}"
+      SmartFox::Logger.debug "packet.data.first = #{packet.data.first}"
       @username = packet.data.first['n']
       @moderator = packet.data.first['mod'] != "0"
       @user_id = packet.data.first['id'].to_i
       SmartFox::Logger.info "SmartFox::Client logged in as #{@username} (ID:#{@user_id})"
       raise_event(:logged_in, self)
-    when ACTION_ROOM_LIST
+      when ACTION_ROOM_LIST
       @rooms.clear
       packet.data.first.children.each do |room|
         room_object = SmartFox::Room.parse(self, room)
         @rooms[room_object.id] = room_object
+        @room_list=@rooms
       end
-
+      
       raise_event(:rooms_updated, self, @rooms)
-    when ACTION_JOIN_OK
+      when ACTION_JOIN_OK
       @current_room = @rooms[packet.room]
       SmartFox::Logger.info "SmartFox::Client joined room #{packet.room}"
       SmartFox::Logger.debug "SmartFox::Client#handle_system_packet ACTION_JOIN_OK data => #{packet.data}"
       @current_room.joined
       @current_room.parse_users(packet.data.find{|n| n.name == 'uLs'})
       raise_event(:room_joined, self, @current_room)
-    when ACTION_JOIN_FAIL
+      when ACTION_JOIN_FAIL
       raise_event(:room_join_failed, self)
     else
       if packet.room > 0
@@ -220,6 +241,6 @@ class SmartFox::Client
       end
     end
   end
-
-
+  
+  
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: smartfox
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Richard Penwell
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+        version: "2.0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -56,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -70,9 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -87,7 +68,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -113,8 +93,8 @@ homepage: http://github.com/penwellr/smartfox
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -122,23 +102,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Client library for SmartFoxServer

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC