stompserver 0.9.7 → 0.9.8

data/lib/stomp_server/stomp_auth.rb

@@ -0,0 +1,22 @@
+module StompServer
+
+class StompAuth
+attr_accessor :authorized
+
+  def initialize(passfile='.passwd')
+    @passfile = passfile
+    @authorized = Hash.new
+    if File.exists?(@passfile)
+      file = File.read(@passfile)
+      file.split(/\n/).each do |data|
+        next if data =~/^\s*#/
+        data.gsub(/\s/,'')
+        if data =~ /^\s*(\S+)\s*:\s*(.*?)\s*$/
+          @authorized[$1] = $2
+        end
+      end
+    end
+    puts "Authorized users #{@authorized.keys}" if $DEBUG
+  end
+end
+end

data/lib/{stomp_frame.rb → stomp_server/stomp_frame.rb}

@@ -1,3 +1,5 @@
+
+module StompServer
 class StompFrame
   attr_accessor :command, :headers, :body
   def initialize(command=nil, headers=nil, body=nil)
@@ -5,7 +7,7 @@ class StompFrame
     @headers = headers || {}
     @body = body || ''
   end
-  
+ 
   def to_s
     result = @command + "\n"
     @headers['content-length'] = @body.size.to_s if @body.include?(0)
@@ -23,13 +25,14 @@ class StompFrame
   end
 end
 
+
 class StompFrameRecognizer
   attr_accessor :frames
   
   def initialize
     @buffer = ''
     @body_length = nil
-    @frame = StompFrame.new
+    @frame = StompServer::StompFrame.new
     @frames = []
   end
   
@@ -38,7 +41,7 @@ class StompFrameRecognizer
     @frame.body = @buffer[0...len]
     @buffer = @buffer[len+1..-1]
     @frames << @frame
-    @frame = StompFrame.new
+    @frame = StompServer::StompFrame.new
   end
   
   def parse_binary_body
@@ -65,10 +68,6 @@ class StompFrameRecognizer
       
       # body_length is nil, if there is no content-length, otherwise it is the length (as in integer)
       @body_length = @frame.headers['content-length'] && @frame.headers['content-length'].to_i
-    else
-      # saftey valve to dump bad (DOSA?) headers/frames
-      # this should be a constant or read out of a configuration file
-      raise RuntimeError.new("Invalid stompframe (possible DOSA)") if @buffer.length > 4096
     end
   end
   
@@ -94,3 +93,4 @@ class StompFrameRecognizer
     parse
   end    
 end
+end

data/lib/stomp_server/stomp_id.rb

@@ -0,0 +1,21 @@
+
+# This class is instantiated in all the queue storage classes, plus the queue manager (for the statistic messages).  It generates a unique
+# id for each message.  The caller passes an additional identifier that is appended message-id, which is usually the id of the frame and is
+# different for each storage class.
+
+require 'socket'
+require 'resolv-replace'
+
+module StompServer
+class StompId
+
+  def initialize
+    @host = Socket.gethostname.to_s
+  end
+
+  def [](id)
+    msgid = sprintf("%.6f",Time.now.to_f).to_s.sub('.','-')
+    msgid = @host + '-' + msgid + '-' + id.to_s
+  end
+end
+end

data/lib/stomp_server/stomp_user.rb

@@ -0,0 +1,17 @@
+
+# Used when accessing queues/topics outside of EM
+require 'stomp_id'
+require 'stomp_frame'
+$MULTIUSER = true
+
+module StompServer
+class StompUser
+  attr_accessor :data
+  def initialize
+    @data = []
+  end
+  def stomp_send_data(data)
+    @data << data.to_s
+  end
+end
+end

data/lib/stomp_server/test_server.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'eventmachine'
+
+module StompServer
+module TestServer
+
+
+  def post_init
+    @transactions = {}
+    @connected = false
+  end
+
+  def receive_data(data)
+  end
+
+  def unbind
+    p "Unbind called" if $DEBUG
+    @connected = false
+  end
+end
+end

data/lib/{topic_manager.rb → stomp_server/topic_manager.rb}

@@ -1,10 +1,22 @@
 # topic - non persistent, sent to all interested parties
 
+module StompServer
 class TopicManager
+  attr_accessor :frame_index
   def initialize
+    @frame_index =0
     @topics = Hash.new { Array.new }
+    puts "TopicManager initialized"
   end  
 
+  def index
+    @frame_index
+  end
+
+  def next_index
+    @frame_index += 1
+  end
+
   def subscribe(topic, user)
     @topics[topic] += [user]
   end
@@ -22,9 +34,9 @@ class TopicManager
   def sendmsg(msg)
     msg.command = "MESSAGE"
     topic = msg.headers['destination']
-    payload = msg.to_s
     @topics[topic].each do |user|
-      user.send_data(payload)
+      user.stomp_send_data(msg)
     end
   end  
 end
+end

data/test/tesly.rb

@@ -0,0 +1,15 @@
+begin
+  require 'tesly_reporter'
+  
+  module TeslyReporter
+    class Config
+      AppName = 'StompServer' unless const_defined? :AppName
+      # put your code here
+      # User = 'id'
+    end
+  end
+  
+rescue LoadError => err
+  # do nothing
+end  
+

data/test/test_queue_manager.rb

@@ -1,33 +1,55 @@
-require 'queue_manager'
-require 'frame_journal'
-require 'test/unit' unless defined? $ZENTEST and $ZENTEST
-require 'tesly'
+require 'stomp_server/stomp_id'
+require 'stomp_server/stomp_frame'
+require 'stomp_server/queue_manager'
+require 'stomp_server/queue'
+require 'stomp_server/queue/file_queue'
+require 'stomp_server/queue/memory_queue'
+require 'stomp_server/queue/dbm_queue'
+require 'test/unit'
+require 'fileutils'
 
 class TestQueues < Test::Unit::TestCase
+
+  class MockQueueManager < StompServer::QueueManager
+    def initialize(qstore)
+      @qstore = qstore
+      @queue_stats = Hash.new
+      @queues = Hash.new { Array.new }
+      @pending = Hash.new { Array.new }
+    end
+  end
   
   class UserMock
     attr_accessor :data
     def initialize ; @data = '' ; end
-    def send_data(data); @data += data ; end
+    def stomp_send_data(data); @data += data.to_s ; end
+    def connected?;true;end
   end
   
   class MessageMock
-    attr_accessor :headers, :data, :command
-    def initialize(dest, msg, id=1)  
-      @headers = { 'destination' => dest, 'message-id' => id }
-      @data = msg
+    attr_accessor :headers, :data, :command, :body
+    def initialize(dest, msg, id=1)
+      @body = msg
+      @headers = {
+        'message-id' => id,
+        'destination' => dest,
+        'content-length' => msg.size.to_s
+      }
+
+      @frame = StompServer::StompFrame.new('MESSAGE', headers, body)
+      @data = @frame.to_s
     end
-    def body ; @data ; end
-    def to_s ; @data ; end
+    def to_s ; @data.to_s ; end
+  end
+
+  def teardown
+    FileUtils.rm_rf(".queue_test")
   end
 
-  FileUtils.rm Dir.glob(".test_queue/*") rescue nil
-  @@journal = FrameJournal.new(".test_queue")
-  
   def setup
-    #needs a journal
-    @@journal.clear
-    @t = QueueManager.new(@@journal)
+    FileUtils.rm_rf(".queue_test") if File.directory?('.queue_test')
+    @@qstore = StompServer::FileQueue.new(".queue_test")
+    @t = MockQueueManager.new(@@qstore)
   end
 
   def test_subscribe
@@ -98,19 +120,4 @@ class TestQueues < Test::Unit::TestCase
     assert_equal('', u2.data)
   end
   
-  def test_sendmsg_ack
-    u = UserMock.new
-    t = 'fooack'
-    @t.subscribe(t, u, true)
-    
-    m1 = MessageMock.new(t, 'foomsg')
-    @t.sendmsg(m1)
-    assert_equal(m1.data, u.data)
-    assert_equal('MESSAGE', m1.command)
-    @t.disconnect(u)
-
-    u2 = UserMock.new
-    @t.subscribe(t, u2)
-    assert_equal(m1.data, u2.data)
-  end
 end

data/test/test_stomp_frame.rb

@@ -1,10 +1,9 @@
-require 'stomp_frame'
+require 'stomp_server/stomp_frame'
 require 'test/unit' unless defined? $ZENTEST and $ZENTEST
-require 'tesly'
 
 class TestStompFrame < Test::Unit::TestCase
   def setup
-    @sfr = StompFrameRecognizer.new
+    @sfr = StompServer::StompFrameRecognizer.new
   end
   
   def test_simpleframe
@@ -57,20 +56,8 @@ FRAME
     assert_equal("bar2", f.headers["foo2"])
     assert_equal("message body 2\n", f.body)
   end
-
-  def test_double2
-    data = "SEND\ndestination:/queue/f\ncontent-length: 33\ncontent-type: text/plain; charset=UTF-8\n\n1: Tue Oct 24 12:19:52 -0400 2006\000SEND\ndestination:/queue/f\ncontent-length: 33\ncontent-type: text/plain; charset=UTF-8\n\n2: Tue Oct 24 12:19:52 -0400 2006\000"
-
-    @sfr << data
-    assert_equal(2, @sfr.frames.size)
-    f = @sfr.frames.shift
-    assert_equal(1, @sfr.frames.size)
-    assert_equal("SEND", f.command)
-    assert_equal("/queue/f", f.headers["destination"])
-    assert_match(/1: Tue/, f.body)
-  end
   
-  def test_partialframe
+    def test_partialframe
     @sfr << <<FRAME
 COMMAND
 name:value

data/test/test_topic_manager.rb

@@ -1,13 +1,12 @@
-require 'topic_manager'
+require 'stomp_server/topic_manager'
 require 'test/unit' unless defined? $ZENTEST and $ZENTEST
-require 'tesly'
 
 class TestTopics < Test::Unit::TestCase
 
   class UserMock
     attr_accessor :data
     def initialize ; @data = '' ; end
-    def send_data(data); @data += data ; end
+    def stomp_send_data(data); @data += data.to_s ; end
   end
   
   class MessageMock
@@ -20,7 +19,7 @@ class TestTopics < Test::Unit::TestCase
   end
   
   def setup
-    @t = TopicManager.new
+    @t = StompServer::TopicManager.new
   end
     
   def test_subscribe

data/{test → test_todo}/test_stomp_server.rb

@@ -1,5 +1,4 @@
 require 'stomp_server'
-require 'frame_journal'
 require 'fileutils'
 require 'test/unit' unless defined? $ZENTEST and $ZENTEST
 require 'tesly'
@@ -55,13 +54,8 @@ class TestStompServer < Test::Unit::TestCase
     assert(!ss.connected)
   end
   
-  FileUtils.rm Dir.glob(".test_journal/*") rescue nil
-  @@journal = FrameJournal.new(".test_journal")
-  StompServer.setup(@@journal)
   
   def setup
-    # be sure and delete anything in our journal directory
-    @@journal.clear
     @ss = MockStompServer.make_client
   end  
   
@@ -238,25 +232,4 @@ class TestStompServer < Test::Unit::TestCase
     ss2.stomp("SUBSCRIBE", {"destination" => '/queue/foo'})
     assert_match(/Hi Pat/, ss2.sent)
   end
-    
-  def test_ack_queue_message
-    ss1 = MockStompServer.make_client
-    ss1.stomp("SEND", {'destination' => '/queue/taqm'}, 
-       'Hi Pat')
-    ss1.stomp("DISCONNECT")
-
-    ss2 = MockStompServer.make_client
-    ss2.stomp("SUBSCRIBE", {"destination" => '/queue/taqm', 'ack' => 'client'})
-    assert_match(/Hi Pat/, ss2.sent)
-    ss2.unbind
-
-    ss3 = MockStompServer.make_client
-    ss3.stomp("SUBSCRIBE", {"destination" => '/queue/taqm'})
-    assert_match(/Hi Pat/, ss3.sent)
-    
-    assert_nothing_raised do
-      ss3.stomp("SUBSCRIBE", {"destination" => '/queue/taqm', 
-                "message-id" => "msg-cmastomp-1"})
-    end
-  end
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: stompserver
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
-date: 2006-11-02 00:00:00 -05:00
+  version: 0.9.8
+date: 2007-08-16 00:00:00 +02:00
 summary: A very light messaging server
 require_paths: 
 - lib
-- test
-email: phurley@gmail.com
-homepage: "    by Patrick Hurley"
+email: 
+- lionel-dev@bouton.name
+homepage: "    by Patrick Hurley, Lionel Bouton"
 rubyforge_project: stompserver
-description: "Don't want to install a JVM, but still want to use messaging? Me too, so I threw together this little server. All the hard work was done by Francis Cianfrocca (big thank you) in his event machine gem (which is required by this server).  == FEATURES/PROBLEMS:  Handles basic message queue processing Does not support any server to server messaging (although you could write a client to do this) Server Id is not being well initialized    Quite a bit of polish is still required to make into a daemon/service  And oh yeah, I need to write some docs (see the tests for now)"
+description: "Stomp messaging server with file/dbm/memory/activerecord based FIFO queues, queue monitoring, and basic authentication.  == SYNOPSYS:  Handles basic message queue processing"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -28,30 +28,54 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- Patrick Hurley
+- Lionel Bouton
 files: 
 - History.txt
 - Manifest.txt
 - README.txt
 - Rakefile
-- setup.rb
+- STATUS
 - bin/stompserver
-- lib/frame_journal.rb
-- lib/queue_manager.rb
-- lib/stomp_frame.rb
+- client/README.txt
+- client/both.rb
+- client/consume.rb
+- client/send.rb
+- config/stompserver.conf
+- etc/passwd.example
 - lib/stomp_server.rb
-- lib/topic_manager.rb
-- test/test_frame_journal.rb
+- lib/stomp_server/protocols/http.rb
+- lib/stomp_server/protocols/stomp.rb
+- lib/stomp_server/queue.rb
+- lib/stomp_server/queue/activerecord_queue.rb
+- lib/stomp_server/queue/ar_message.rb
+- lib/stomp_server/queue/dbm_queue.rb
+- lib/stomp_server/queue/file_queue.rb
+- lib/stomp_server/queue/memory_queue.rb
+- lib/stomp_server/queue_manager.rb
+- lib/stomp_server/stomp_auth.rb
+- lib/stomp_server/stomp_frame.rb
+- lib/stomp_server/stomp_id.rb
+- lib/stomp_server/stomp_user.rb
+- lib/stomp_server/test_server.rb
+- lib/stomp_server/topic_manager.rb
+- setup.rb
+- test/tesly.rb
 - test/test_queue_manager.rb
 - test/test_stomp_frame.rb
-- test/test_stomp_server.rb
 - test/test_topic_manager.rb
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: []
-
+- test_todo/test_stomp_server.rb
+test_files: 
+- test/test_queue_manager.rb
+- test/test_stomp_frame.rb
+- test/test_topic_manager.rb
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- client/README.txt
 executables: 
 - stompserver
 extensions: []
@@ -60,13 +84,13 @@ requirements: []
 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: madeleine
+  name: daemons
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.3
+        version: 1.0.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -77,3 +101,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.2
+    version: