journeta 0.0.3 → 0.0.4

data/History.txt

@@ -1,5 +1,14 @@
+== 0.0.4 2008-08-22
+
+* Graphical instant messenger example.
+  * examples/instant_messenger_gui.rb (requires the wxruby gem)
+  * Will talk to the command line example seemlessly.
+* Linux bug fixes.
+* Ruby 1.8.6 support
+
 == 0.0.3 2008-08-21
 
+* Linux support.
 * Added peer 'groups' support to avoid peer message spamming.
 * Major refactoring to make outbound messages sent asynchonously to the sending thread.
 * Example and documentation updates.

data/Manifest.txt

@@ -5,6 +5,7 @@ README.txt
 Rakefile
 lib/journeta.rb
 examples/instant_messenger.rb
+examples/instant_messenger_gui.rb
 examples/queue_client.rb
 examples/queue_server.rb
 lib/journeta/logger.rb
@@ -21,6 +22,7 @@ lib/journeta/journeta_engine.rb
 lib/journeta/common/dummy_peer_handler.rb
 lib/journeta/common/job.rb
 lib/journeta/common/shutdown.rb
+lib/journeta/common/basic_message.rb
 scripts/txt2html
 setup.rb
 test/test_journeta.rb

data/examples/instant_messenger.rb

@@ -6,20 +6,13 @@ $LOAD_PATH.unshift lib_path
 # Load up the library!
 require 'journeta'
 include Journeta
-
-
-# Any arbitrary object can be sent to peers as long as it's serializable to YAML.
-# We'll create an ordinary class with a couple typical-looking fields to send to our peers.
-class ExampleMessage
-  attr_accessor :name
-  attr_accessor :text
-end
+include Journeta::Common
 
 # A message handler will be called by the engine every time a message is received.
 # This code will be customized for your application-specific needs.
 class ExampleHandler < Journeta::DefaultPeerHandler
   def handle(message)
-    if message.class == ExampleMessage
+    if message.class == BasicMessage
       puts "#{message.name.chop}: #{message.text}"
     else
       putsd("Unsupported message type received from peer. (#{message})")
@@ -79,7 +72,7 @@ begin
   loop do
     begin
       input = gets
-      m = ExampleMessage.new
+      m = BasicMessage.new
       m.name = name
       m.text = input
       journeta.send_to_known_peers(m)

data/examples/instant_messenger_gui.rb

@@ -0,0 +1,166 @@
+#!/usr/bin/env ruby
+current_dir = File.dirname(File.expand_path(__FILE__))
+lib_path = File.join(current_dir, '..', 'lib')
+$LOAD_PATH.unshift lib_path
+
+puts 'A GUI instant messenger demo which can also talk to the command-line version! (Requires the "wxruby" gem.)'
+# Load up the library!
+require 'journeta'
+include Journeta
+include Journeta::Common
+
+require 'rubygems'
+
+
+# Use UTF-8.
+$KCODE = 'u'
+
+# Library to get character lengths (as opposed to byte lengths) from Ruby strings.
+require 'jcode'
+
+# Load the wxruby GUI library.
+require 'wx'
+
+class JournetaGUIHandler
+  
+  def initialize(control)
+    @control = control
+  end
+  
+  def handle(message)
+    if message.class == BasicMessage
+      text = @control.get_value
+      text.chop!
+      text += "\n#{message.name.chop}: #{message.text}"
+      @control.set_value text
+    else
+      putsd("Unsupported message type received from peer. (#{message})")
+    end
+  end
+end
+
+
+class PeerTextControl < Wx::TextCtrl
+  
+  DEFAULT_TEXT = "(joined chat at #{Time.now})\n\n"
+  
+  def initialize(parent, text = DEFAULT_TEXT)
+    super(parent, -1, text, 
+          Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::TE_MULTILINE)
+  end
+  
+end
+
+# A read-only text ctrl useful for displaying output
+class MessageTextControl < Wx::TextCtrl
+  STYLE = Wx::TE_READONLY|Wx::TE_MULTILINE
+  def initialize(parent)
+    super(parent, -1, '', Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, STYLE)
+  end
+end
+
+class IConvFrame < Wx::Frame
+  
+  @name = 'anonymous'
+  
+  # Ruby stdlib for converting strings between encodings
+  begin
+    require 'iconv'
+    ICONV_LOADED = 1
+  rescue LoadError
+  end
+  
+  
+  
+  def initialize(title, pos, size)
+    super(nil, -1, title, pos, size)
+    panel = Wx::Panel.new(self)
+    
+    # TODO Ask user for name.
+    dialog = Wx::TextEntryDialog.new(self,  "What's your name?", 
+                    "Please enter text", 
+                    "anonymous", 
+    Wx::OK , 
+    Wx::DEFAULT_POSITION)
+    dialog.show_modal
+    @name = dialog.get_value
+    
+    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+    
+    # The text input and display
+    @peer_control = PeerTextControl.new(panel)
+    sizer.add(@peer_control, 3, Wx::GROW|Wx::ALL, 2)
+    @peer_control.set_editable(false)
+    # TODO set background color so it's obviously read-only.
+    #    @peer_control.set_background_colour('888888')
+    
+    @message_control = MessageTextControl.new(panel)
+    @message_control.set_editable(true)
+    sizer.add(@message_control, 1, Wx::GROW|Wx::ALL, 2)
+    
+    # The button to show what's selected
+    button = Wx::Button.new(panel, -1, 'Send')
+    sizer.add(button, 0, Wx::ADJUST_MINSIZE|Wx::ALL, 2 )
+    evt_button(button.get_id) { | e | on_click(e) }
+    
+    panel.set_sizer_and_fit( sizer )
+    
+    peer_port = (2048 + rand( 2 ** 8))
+    @journeta = Journeta::JournetaEngine.new(:peer_port => peer_port, :peer_handler => JournetaGUIHandler.new(@peer_control), :groups => ['im_example'])    
+    @journeta.start
+  end
+  
+  
+  def construct_menus()
+    menu_bar = Wx::MenuBar.new()
+    
+    menu_file = Wx::Menu.new()
+    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
+    evt_menu(Wx::ID_EXIT) { on_quit() }
+    menu_bar.append(menu_file, "&File")
+    if self.class.const_defined?(:ICONV_LOADED)
+      construct_import_export_menus(menu_bar)
+    end
+    
+    menu_help = Wx::Menu.new()
+    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+    evt_menu(Wx::ID_ABOUT) { on_about() }
+    menu_bar.append(menu_help, "&Help")
+    
+    set_menu_bar(menu_bar)
+  end
+  
+  def on_click(e)
+    text = @message_control.get_value
+    msg = BasicMessage.new
+    msg.name = @name
+    msg.text = text
+    @journeta.send_to_known_peers(msg)
+    @message_control.set_value('')
+    @peer_control.set_value "#{@peer_control.get_value}\n#{@name}: #{text}"
+  end
+  
+  def on_quit()
+    @journeta.stop
+    close(TRUE)
+  end
+  
+  def on_about()
+    msg =  "A GUI demo. Wx version #{Wx::VERSION_STRING}"
+    Wx::message_box(msg, "About Minimal", Wx::OK|Wx::ICON_INFORMATION, self)
+  end
+end
+
+
+class InstantMessengerApplication < Wx::App
+  
+  def on_init()    
+    frame = IConvFrame.new("Journeta Instant Messenger",
+    Wx::Point.new(50, 50),
+    Wx::Size.new(450, 450) )
+    
+    frame.show(true)
+  end
+end
+
+InstantMessengerApplication.new().main_loop()

data/lib/journeta.rb

@@ -16,6 +16,7 @@ require 'journeta/peer_registry'
 require 'journeta/peer_connection'
 require 'journeta/journeta_engine'
 
+require 'journeta/common/basic_message'
 require 'journeta/common/job'
 require 'journeta/common/shutdown'
 require 'journeta/common/dummy_peer_handler'

data/lib/journeta/common/basic_message.rb

@@ -0,0 +1,12 @@
+module Journeta
+
+  module Common
+
+    class BasicMessage
+      attr_accessor :name
+      attr_accessor :text
+    end
+    
+  end
+
+end

data/lib/journeta/peer_registry.rb

@@ -68,7 +68,7 @@ module Journeta
       @mutex.synchronize do
         # Grab all peers in relevant groups.
         group = all_do
-        n= group.count
+        n= group.length
         if n > 0
           putsd "Sending payload to #{n} peers."
           group.each do |uuid, conn|

data/lib/journeta/presence_listener.rb

@@ -18,8 +18,13 @@ module Journeta
         socket = UDPSocket.new
         # Remember how i said this was fucked up? yeaahhhhhh. i hope you like C.
         # `man setsockopt` for details.
-        # SO_REUSEPORT is needed so multiple peers can be run on the same machine.
-        socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, [1].pack("i_") )
+        if PLATFORM[/linux/i]
+          socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, [1].pack("i_") )
+        else
+          # SO_REUSEPORT is needed so multiple peers can be run on the same machine.
+          # socket.setsockopt(Socket::IPPROTO_IP, Socket::IP_TTL, [1].pack('i')) # Preston's original config for OS X.
+          socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, [1].pack("i_") ) # Remi's suggested default.
+        end        
         # socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, [1].pack("i_") )
         socket.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, addresses)
         socket.bind(Socket::INADDR_ANY, port)

data/lib/journeta/version.rb

@@ -2,7 +2,7 @@ module Journeta #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: journeta
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Preston Lee
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 -07:00
+date: 2008-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ files:
 - Rakefile
 - lib/journeta.rb
 - examples/instant_messenger.rb
+- examples/instant_messenger_gui.rb
 - examples/queue_client.rb
 - examples/queue_server.rb
 - lib/journeta/logger.rb
@@ -58,6 +59,7 @@ files:
 - lib/journeta/common/dummy_peer_handler.rb
 - lib/journeta/common/job.rb
 - lib/journeta/common/shutdown.rb
+- lib/journeta/common/basic_message.rb
 - scripts/txt2html
 - setup.rb
 - test/test_journeta.rb