bitgirder-platform 0.1.12 → 0.1.15

data/lib/bitgirder/io.rb

@@ -359,7 +359,6 @@ module_function :read_full
 
 def can_connect?( *argv )
     
-    code( "In can_connect, argv: #{argv}" )
     raise "Need at least a port" if argv.empty?
 
     host = argv.first.is_a?( String ) ? argv.shift : "127.0.0.1"
@@ -371,12 +370,9 @@ def can_connect?( *argv )
     end
 
     begin
-        code( "Making connection" )
         TCPSocket::new( host, port ).close
-        code( "Got conn" )
         true
     rescue Errno::ECONNREFUSED
-        code( "No conn" )
         false
     end
 end

data/lib/doc-gen18.rb

@@ -1,5 +1,5 @@
 
-# Autogenerated docs on 2012-12-05 15:22:38 -0800
+# Autogenerated docs on 2012-12-31 12:15:13 -0800
 #
 
 # This code is only included for rdoc purposes and would not normally get

data/lib/doc-gen20.rb

@@ -1,5 +1,5 @@
 
-# Autogenerated docs on 2012-12-05 15:22:38 -0800
+# Autogenerated docs on 2012-12-31 12:15:14 -0800
 #
 
 # This code is only included for rdoc purposes and would not normally get

data/lib/mingle/bincodec.rb

@@ -5,26 +5,24 @@ require 'mingle/codec'
 
 module Mingle
 module BinCodec
-    
-TYPE_CODE_END = 0x00
-TYPE_CODE_BOOLEAN = 0x01
-TYPE_CODE_FLOAT64 = 0x03
-TYPE_CODE_ENUM = 0x04
-TYPE_CODE_FLOAT32 = 0x05
-TYPE_CODE_INT32 = 0x06
-TYPE_CODE_UINT32 = 0x07
-TYPE_CODE_INT64 = 0x08
-TYPE_CODE_UINT64 = 0x09
-TYPE_CODE_STRING = 0x0a
-TYPE_CODE_RFC3339_STR = 0x0b 
-TYPE_CODE_RFC3339_BIN = 0x0c
-TYPE_CODE_BUFFER = 0x0d
-TYPE_CODE_UTF8_STRING = 0x0e
-TYPE_CODE_LIST = 0x0f
-TYPE_CODE_STRUCT = 0x10
-TYPE_CODE_SYMBOL_MAP = 0x11
-TYPE_CODE_NULL = 0x012
-TYPE_CODE_FIELD = 0x13
+
+TYPE_CODE_NULL = 0x00
+TYPE_CODE_BOOLEAN = 0x0a
+TYPE_CODE_STRING = 0x0b
+TYPE_CODE_INT32 = 0x0c
+TYPE_CODE_INT64 = 0x0d
+TYPE_CODE_UINT32 = 0x0e
+TYPE_CODE_UINT64 = 0x0f
+TYPE_CODE_FLOAT32 = 0x10
+TYPE_CODE_FLOAT64 = 0x11
+TYPE_CODE_TIMESTAMP = 0x12
+TYPE_CODE_BUFFER = 0x13
+TYPE_CODE_ENUM = 0x14
+TYPE_CODE_SYMBOL_MAP = 0x15
+TYPE_CODE_FIELD = 0x16
+TYPE_CODE_STRUCT = 0x17
+TYPE_CODE_LIST = 0x19
+TYPE_CODE_END = 0x1a
 
 Io = BitGirder::Io
 
@@ -50,26 +48,14 @@ class MingleBinCodec < BitGirder::Core::BitGirderClass
         wr.write_buffer32( buf )
     end
 
-    private
-    def append_utf8( wr, str )
-
-        append_type_code( wr, TYPE_CODE_UTF8_STRING )
-
-#        str = BitGirder::Io.as_utf8( str )
-#        append_sized_buffer( wr, str.encode( "binary" ) )
-        wr.write_utf8( str )
-    end
-
     private
     def append_type_reference( wr, typ )
         BinWriter.as_bin_writer( wr ).write_type_reference( typ )
-#        append_utf8( wr, typ.external_form )
     end
 
     private
     def append_identifier( wr, id )
         BinWriter.as_bin_writer( wr ).write_identifier( id )
-#        append_utf8( wr, id.external_form )
     end
 
     private
@@ -83,7 +69,7 @@ class MingleBinCodec < BitGirder::Core::BitGirderClass
     def append_string( wr, str )
         
         append_type_code( wr, TYPE_CODE_STRING )
-        append_utf8( wr, str.to_s )
+        wr.write_utf8( str.to_s )
     end
 
     private
@@ -141,8 +127,9 @@ class MingleBinCodec < BitGirder::Core::BitGirderClass
     private
     def append_timestamp( wr, val )
         
-        append_type_code( wr, TYPE_CODE_RFC3339_STR )
-        append_utf8( wr, val.rfc3339 )
+        append_type_code( wr, TYPE_CODE_TIMESTAMP )
+        wr.write_int64( val.time.to_i )
+        wr.write_int32( val.time.nsec )
     end
 
     private
@@ -257,12 +244,13 @@ class MingleBinCodec < BitGirder::Core::BitGirderClass
     end
 
     private
-    def type_code_expect_raise( code_sym, code_act, pos )
-
-        code_val = BinCodec.const_get( code_sym )
+    def raise_unrecognized_value_code( tc, pos )
+        decode_raise( pos, sprintf( "Unrecognized value code: 0x%02x", tc ) )
+    end
 
-        codec_raise "Expected #{code_sym} (#{to_hex_byte( code_val )}) " \
-                    "but saw #{to_hex_byte( code_act )} at byte #{pos}"
+    private
+    def type_code_expect_raise( code_sym, code_act, pos )
+        raise_unrecognized_value_code( code_act, pos )
     end
 
     private
@@ -282,63 +270,14 @@ class MingleBinCodec < BitGirder::Core::BitGirderClass
         expect_type_code( scanner, :TYPE_CODE_END )
     end
 
-    private
-    def read_string_with_info( scanner )
-
-        # Only handling utf8 strings right now
-        expect_type_code( scanner, :TYPE_CODE_UTF8_STRING )
-
-        str = scanner.read_utf8
-        start_pos = scanner.pos - str.bytesize
-        [ str, { :string_start => start_pos } ]
-    end
-
-    private
-    def read_string( scanner )
-        read_string_with_info( scanner )[ 0 ]
-    end
-
-    private
-    def parse_string( opts )
-
-        scanner = has_key( opts, :scanner )
-        parser = has_key( opts, :parser )
-        parse_type = has_key( opts, :parse_type )
-        error_type = has_key( opts, :error_type )
-
-        str, info = read_string_with_info( scanner )
-
-        begin
-            parser.call( str )
-        rescue error_type => err
-            pos = has_key( info, :string_start )
-            decode_raise( pos, "Invalid #{parse_type}: #{err}" )
-        end
-    end
-
     private
     def read_type_reference( scanner )
-        
         return BinReader.as_bin_reader( scanner ).read_type_reference
-
-#        parse_string(
-#            :scanner => scanner,
-#            :parser => lambda { |str| MingleTypeReference.get( str ) },
-#            :parse_type => "type reference",
-#            :error_type => MingleParseError
-#        )
     end
 
     private
     def read_identifier( scanner )
-        
         return BinReader.as_bin_reader( scanner ).read_identifier
-#        parse_string(
-#            :scanner => scanner,
-#            :parser => lambda { |str| MingleIdentifier.get( str ) },
-#            :parse_type => "identifier",
-#            :error_type => MingleParseError
-#        )
     end
 
     private
@@ -379,7 +318,7 @@ class MingleBinCodec < BitGirder::Core::BitGirderClass
 
     private
     def read_mg_string( scanner )
-        MingleString.new( read_string( scanner ) )
+        MingleString.new( scanner.read_utf8 )
     end
 
     private
@@ -426,12 +365,10 @@ class MingleBinCodec < BitGirder::Core::BitGirderClass
     private
     def read_mg_timestamp( scanner )
         
-        parse_string(
-            :scanner => scanner,
-            :parser => lambda { |str| MingleTimestamp.rfc3339( str ) },
-            :parse_type => "rfc3339 timestamp",
-            :error_type => MingleTimestamp::Rfc3339FormatError
-        )
+        secs, nsec = scanner.read_int64, scanner.read_int32
+        t = Time.at( secs, nsec.to_f / 1000.0 )
+
+        MingleTimestamp.new( t, false )
     end
 
     private
@@ -462,15 +399,12 @@ class MingleBinCodec < BitGirder::Core::BitGirderClass
             when TYPE_CODE_STRING then read_mg_string( scanner )
             when TYPE_CODE_BUFFER then read_mg_buffer( scanner )
             when TYPE_CODE_ENUM then read_mg_enum( scanner )
-            when TYPE_CODE_RFC3339_STR then read_mg_timestamp( scanner )
+            when TYPE_CODE_TIMESTAMP then read_mg_timestamp( scanner )
             when TYPE_CODE_STRUCT then read_mg_struct( scanner )
             when TYPE_CODE_SYMBOL_MAP then read_fields( scanner )
             when TYPE_CODE_LIST then read_mg_list( scanner )
             when TYPE_CODE_NULL then MingleNull::INSTANCE
-
-            else 
-                decode_raise( 
-                    scanner, "Unexpected type code: #{to_hex_byte( typ )}" )
+            else raise_unrecognized_value_code( typ, scanner )
         end
     end
 
@@ -485,10 +419,7 @@ class MingleBinCodec < BitGirder::Core::BitGirderClass
         end
 
         unless ( tc = @conv.read_int8( buf[ 0, 1 ] ) ) == TYPE_CODE_STRUCT 
-
-            msg = "Saw type code #{to_hex_byte( tc )} but expected " +
-                to_hex_byte( TYPE_CODE_STRUCT )
-            decode_raise( 0, msg )
+            raise_unrecognized_value_code( tc, 0 )
         end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitgirder-platform
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies: []
 description: Contains core classes and interfaces for building event logger implementations.
   Also includes helper classes for incorporating assertions about event logging into