ipc_transit 0.0.2 → 0.0.3

data/bin/transitd

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'rubygems'
 require 'net/http'
 require 'uri'
 require 'ipc_transit'

data/bin/trlist

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'rubygems'
 require 'ipc_transit'
 
 

data/bin/trrecv

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'rubygems'
 require 'ipc_transit'
 require 'json'
 
@@ -10,6 +11,6 @@ nowait = ARGV[1]
 #puts message
 
 while ret = IPCTransit.receive('qname' => qname, 'nowait' => 1)
-    puts ret
+    puts JSON.pretty_generate(ret)
 end
 

data/bin/trsend

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'rubygems'
 require 'ipc_transit'
 require 'json'
 

data/bin/trserver

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'rubygems'
 require 'webrick'
 require 'ipc_transit'
 

data/lib/ipc_transit/compress.rb

@@ -0,0 +1,33 @@
+require 'zlib'
+
+def transit_deflate(args)
+    if args['c'].nil?
+        compression_type = 'none'
+    else
+        compression_type = args['c']
+    end
+    case compression_type
+    when 'none'
+        return args['frozen']
+    when 'zlib'
+        return Zlib::deflate(args['frozen'])
+    end
+end
+
+def transit_inflate(args)
+    if args['wire_headers'].nil?
+        compression_type = 'none'
+    else
+        if args['wire_headers']['c'].nil?
+            compression_type = 'none'
+        else
+            compression_type = args['wire_headers']['c']
+        end
+    end
+    case compression_type
+    when 'none'
+        return args['serialized_message']
+    when 'zlib'
+        return Zlib::inflate(args['serialized_message'])
+    end
+end

data/lib/ipc_transit/serialize.rb

@@ -0,0 +1,44 @@
+require 'rubygems'
+require 'json'
+require 'yaml'
+require 'ipc_transit/compress'
+
+def transit_freeze(args)
+    if args['e'].nil?
+        serialize_type = 'json'
+    else
+        serialize_type = args['e']
+    end
+    case serialize_type
+    when 'json'
+        args['frozen'] = args['message'].to_json
+    when 'yaml'
+        args['frozen'] = YAML.dump(args['message'])
+    end
+    return transit_deflate(args)
+end
+
+def transit_thaw(args)
+    if args['wire_headers'].nil?
+        serialize_type = 'json'
+    else
+        if args['wire_headers']['e'].nil?
+            serialize_type = 'json'
+        else
+            serialize_type = args['wire_headers']['e']
+        end
+    end
+    begin
+        inflated = transit_inflate(args)
+    rescue Exception => msg
+        puts "transit_thaw exception: #{e}"
+    end
+    case serialize_type
+    when 'json'
+        args['thawed'] = JSON.parse(inflated)
+    when 'yaml'
+        args['thawed'] = YAML.load(inflated)
+    end
+    return args['thawed']
+end
+

data/lib/ipc_transit/test.rb

@@ -0,0 +1,21 @@
+#kind of ghetto, but I don't have a better way right now
+def drain_test_queue
+    begin
+        while ret = IPCTransit.receive('qname' => 'test_qname', 'nowait' => 1)
+        end
+    rescue Exception => msg
+    end
+end
+
+def run_daemon(prog)
+    pid = fork
+    if pid.nil? #child
+        exec "bin/#{prog}"
+        exit
+    end
+    return pid
+end
+def kill_daemon(pid)
+    Process.kill(9, pid)
+end
+

data/lib/ipc_transit.rb

@@ -1,6 +1,8 @@
-require 'json'
+require 'rubygems'
 require 'SysVIPC'
 include SysVIPC
+require 'ipc_transit/serialize'
+
 
 ##
 # Fast, brokerless message queueing
@@ -89,7 +91,7 @@ class IPCTransit
             self.unpack_data(args)
             #at this point I need to see if this is a remote transit
             #if it is, then do not thaw the message proper
-            args['message'] = self.transit_thaw(args)
+            args['message'] = transit_thaw(args)
         rescue Exception => msg
 #            puts "Exception: #{msg}"
 #            need to do something smarter with this
@@ -184,7 +186,8 @@ class IPCTransit
         end
         begin
             self.lock_dir()
-            file = File.open("/tmp/transit/#{qname}", 'w')
+            File.umask(0000)
+            file = File.open("/tmp/transit/#{qname}", 'w', 0666)
             new_qid = get_next_id
             file.puts("qid=#{new_qid}")
             file.puts("qname=#{qname}")
@@ -199,6 +202,7 @@ class IPCTransit
     end
 
     def self.lock_dir()
+        File.umask(0000)
         File.open('/tmp/transit.lock', File::WRONLY|File::EXCL|File::CREAT, 0666)
     end
     def self.unlock_dir()
@@ -209,7 +213,7 @@ class IPCTransit
         self.mk_queue_dir()
         Dir.glob('/tmp/transit/*').each do |filename|
             info = {}
-            file = File.new(filename, 'r')
+            file = File.new(filename, 'r', 0666)
             while (line = file.gets)
                 line.chomp!
                 (key, value) = line.split('=')
@@ -234,16 +238,6 @@ class IPCTransit
     end
 
 
-    def self.transit_freeze(args)
-        return args['message'].to_json
-    end
-
-    def self.transit_thaw(args)
-        return JSON.parse(args['serialized_message'])
-    end
-
-
-
 #returns a scalar, ready to be sent on the wire
 #it takes message and wire_meta_data
     def self.pack_message(args)
@@ -253,7 +247,7 @@ class IPCTransit
             next if @@ipc_transit_std_args[k]
             args['message']['.ipc_transit_meta'][k] = args[k]
         end
-        args['serialized_message'] = self.transit_freeze(args)
+        args['serialized_message'] = transit_freeze(args)
         self.serialize_wire_meta(args)
         l = args['serialized_wire_meta_data'].length
         args['serialized_wire_data'] = "#{l}:#{args['serialized_wire_meta_data']}#{args['serialized_message']}"

data/test/tc_transit_remote.rb

@@ -1,28 +1,15 @@
 require 'test/unit'
 require 'ipc_transit'
+require 'ipc_transit/test'
 
-#kind of ghetto, but I don't have a better way right now
-def drain_test_queue
-    begin
-        while ret = IPCTransit.receive('qname' => 'test_qname', 'nowait' => 1)
+class TestIPCTransit < Test::Unit::TestCase
+    def teardown
+        if not @transitd_pid.nil?
+            kill_daemon(@transitd_pid)
+            kill_daemon(@trserver_pid)
         end
-    rescue Exception => msg
     end
-end
 
-def run_daemon(prog)
-    pid = fork
-    if pid.nil? #child
-        exec "bin/#{prog}"
-        exit
-    end
-    return pid
-end
-def kill_daemon(pid)
-    Process.kill(9, pid)
-end
-
-class TestIPCTransit < Test::Unit::TestCase
     def test_basic_remote
         drain_test_queue()
         IPCTransit.send('message' => { 'foo' => 'bar' }, 'qname' => 'test_qname', 'd' => '127.0.0.1')
@@ -34,18 +21,17 @@ class TestIPCTransit < Test::Unit::TestCase
     def test_full_remote
         drain_test_queue()
         begin
-            trserver_pid = run_daemon('trserver')
-            transitd_pid = run_daemon('transitd')
-            sleep 1
+            @trserver_pid = run_daemon('trserver')
+            @transitd_pid = run_daemon('transitd')
+            sleep 2
             IPCTransit.send('message' => { 'foo' => 'bar' }, 'qname' => 'test_qname', 'd' => '127.0.0.1')
+            sleep 2
             ret = IPCTransit.receive('qname' => 'test_qname', 'nowait' => 1)
-            assert(ret, 'IPCTransit.receive returned true')
-            assert_equal(ret['foo'], 'bar')
         rescue Exception => msg
             puts "Exception: #{msg}"
         end
-        kill_daemon(transitd_pid)
-        kill_daemon(trserver_pid)
+        assert(ret, 'IPCTransit.receive returned true')
+        assert_equal(ret['foo'], 'bar')
     end
 end
 

data/test/tc_transit_simple.rb

@@ -1,14 +1,6 @@
 require 'test/unit'
 require 'ipc_transit'
-
-#kind of ghetto, but I don't have a better way right now
-def drain_test_queue
-    begin
-        while ret = IPCTransit.receive('qname' => 'test_qname', 'nowait' => 1)
-        end
-    rescue Exception => msg
-    end
-end
+require 'ipc_transit/test'
 
 class TestIPCTransit < Test::Unit::TestCase
     def test_typical
@@ -36,7 +28,7 @@ class TestIPCTransit < Test::Unit::TestCase
                 'c' => 'none',
                 'something' => 'else',
                 'x' => { 'this' => 'that' },
-                'once' => ['more',2],
+                'once' => ['more',2]
         )
         ret = IPCTransit.receive('qname' => 'test_qname', 'nowait' => 1)
         assert(ret, 'IPCTransit.receive returned true')

data/test/tc_transit_yaml.rb

@@ -0,0 +1,43 @@
+require 'test/unit'
+require 'ipc_transit'
+require 'ipc_transit/test'
+
+class TestIPCTransit < Test::Unit::TestCase
+    def test_yaml_typical
+        drain_test_queue()
+        IPCTransit.send('message' => { 'foo' => 'bar' }, 'e' => 'yaml', 'qname' => 'test_qname')
+        ret = IPCTransit.receive('qname' => 'test_qname', 'nowait' => 1)
+        assert(ret, 'IPCTransit.receive returned true')
+        assert_equal(ret['foo'], 'bar')
+    end
+
+    def test_yaml_wire_raw
+        drain_test_queue()
+        IPCTransit.send('message' => { 'foo' => 'bar' }, 'qname' => 'test_qname', 'e' => 'yaml', 'c' => 'none')
+        ret = IPCTransit.receive('qname' => 'test_qname', 'raw' => 1, 'nowait' => 1)
+        assert(ret, 'IPCTransit.receive returned true')
+        assert(ret['serialized_message'] =~ /^---/, 'data verified as YAML')
+        assert_equal(ret['message']['foo'], 'bar')
+        assert_equal(ret['wire_headers']['e'], 'yaml')
+        assert_equal(ret['wire_headers']['c'], 'none')
+    end
+    def test_yaml_message_meta
+        drain_test_queue()
+        IPCTransit.send( 'qname' => 'test_qname',
+                'message' => { 'foo' => 'bar' },
+                'e' => 'json',
+                'c' => 'none',
+                'something' => 'else',
+                'x' => { 'this' => 'that' },
+                'once' => ['more',2]
+        )
+        ret = IPCTransit.receive('qname' => 'test_qname', 'e' => 'yaml', 'nowait' => 1)
+        assert(ret, 'IPCTransit.receive returned true')
+        assert_equal(ret['foo'], 'bar')
+        assert_equal(ret['.ipc_transit_meta']['something'], 'else')
+        assert_equal(ret['.ipc_transit_meta']['x']['this'], 'that')
+        assert_equal(ret['.ipc_transit_meta']['once'][0], 'more')
+        assert_equal(ret['.ipc_transit_meta']['once'][1], 2)
+    end
+end
+

data/test/tc_transit_zlib.rb

@@ -0,0 +1,41 @@
+require 'test/unit'
+require 'ipc_transit'
+require 'ipc_transit/test'
+
+class TestIPCTransit < Test::Unit::TestCase
+    def test_zlib_typical
+        drain_test_queue()
+        IPCTransit.send('message' => { 'foo' => 'bar' }, 'qname' => 'test_qname', 'c' => 'zlib', 'e' => 'json')
+        ret = IPCTransit.receive('qname' => 'test_qname', 'nowait' => 1)
+        assert(ret, 'IPCTransit.receive returned true')
+        assert_equal(ret['foo'], 'bar')
+    end
+
+    def test_zlib_wire_raw
+        drain_test_queue()
+        IPCTransit.send('message' => { 'foo' => 'bar' }, 'qname' => 'test_qname', 'c' => 'zlib')
+        ret = IPCTransit.receive('qname' => 'test_qname', 'raw' => 1, 'nowait' => 1)
+        assert(ret, 'IPCTransit.receive returned true')
+        assert_equal(ret['message']['foo'], 'bar')
+        assert_equal(ret['wire_headers']['c'], 'zlib')
+    end
+    def test_zlib_message_meta
+        drain_test_queue()
+        IPCTransit.send( 'qname' => 'test_qname',
+                'message' => { 'foo' => 'bar' },
+                'e' => 'json',
+                'c' => 'zlib',
+                'something' => 'else',
+                'x' => { 'this' => 'that' },
+                'once' => ['more',2]
+        )
+        ret = IPCTransit.receive('qname' => 'test_qname', 'nowait' => 1)
+        assert(ret, 'IPCTransit.receive returned true')
+        assert_equal(ret['foo'], 'bar')
+        assert_equal(ret['.ipc_transit_meta']['something'], 'else')
+        assert_equal(ret['.ipc_transit_meta']['x']['this'], 'that')
+        assert_equal(ret['.ipc_transit_meta']['once'][0], 'more')
+        assert_equal(ret['.ipc_transit_meta']['once'][1], 2)
+    end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipc_transit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yaml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: zlib
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: SysVIPC
   requirement: !ruby/object:Gem::Requirement
@@ -56,6 +88,9 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - lib/ipc_transit.rb
+- lib/ipc_transit/test.rb
+- lib/ipc_transit/serialize.rb
+- lib/ipc_transit/compress.rb
 - bin/trrecv
 - bin/trsend
 - bin/trlist
@@ -63,6 +98,8 @@ files:
 - bin/trserver
 - test/tc_transit_simple.rb
 - test/tc_transit_remote.rb
+- test/tc_transit_yaml.rb
+- test/tc_transit_zlib.rb
 homepage: http://rubygems.org/gems/ipc_transit
 licenses: []
 post_install_message: 
@@ -90,3 +127,5 @@ summary: Brokerless, cross-language, fast message queue library
 test_files:
 - test/tc_transit_simple.rb
 - test/tc_transit_remote.rb
+- test/tc_transit_yaml.rb
+- test/tc_transit_zlib.rb