funl 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7052cdcfcfbc11611386090111ff18932e150dc
-  data.tar.gz: 8d406bc8f898c87a82240a689fec27dc2fe6bf3d
+  metadata.gz: 2b9cbf42dd9f7a6813d6a0fcd2882d677c1d72fa
+  data.tar.gz: 1ad336d8811f9effcb413610177a374383431164
 SHA512:
-  metadata.gz: a69cb87e3c8960f9c354d3ab5bfbe561d54e07088bbcf3f22e479789e17a8bca00b29fde36ecc9a8872a6dec8e9c65bac1bc6b13c8c3a3f115cc96e4c188d4a6
-  data.tar.gz: 2b1fd03f61eb10df1f4f0b71e72991b7b75469f286c08991605a8c7aaccb962ef4045c7b5869f2e667be768ebb445eca6ad3fe0164b8c26f25fe04bb4c58119c
+  metadata.gz: e037b7343642c8d08fc0d45c10c06e032ddd7054ba47fc06d60fecf107ee7aac3c74d641063875c522b4fa7de98ebcd1ab71a5a5b9508781cab678a219f97b5a
+  data.tar.gz: 23fdd84f5d8146083979031de31d6a4a309b17a30c573afc07787df98d46c15d386ad43e18f94b6203d8d6687469fd4f92c55bbcccaaeeedb65b8d3edd88c42c

data/lib/funl/blobber.rb

@@ -6,23 +6,55 @@ module Funl
     YAML_TYPE     = ObjectStream::YAML_TYPE
     JSON_TYPE     = ObjectStream::JSON_TYPE
     MSGPACK_TYPE  = ObjectStream::MSGPACK_TYPE
+
+    module JSON_SYM
+      def self.load arg
+        JSON.parse arg, symbolize_keys: true
+      end
+
+      def self.dump arg
+        JSON.dump arg
+      end
+    end
+
+    module MessagePack_SYM
+      def self.load arg
+        MessagePack.load arg, symbolize_keys: true
+      end
+
+      def self.dump arg
+        MessagePack.dump arg
+      end
+    end
     
     # Returns something which responds to #dump(obj) and #load(str).
-    def self.for type
+    def self.for type, symbolize_keys: false
       case type
       when MARSHAL_TYPE
         Marshal
+
       when YAML_TYPE
         require 'yaml'
         YAML
+
       when JSON_TYPE
         require 'yajl'
         require 'yajl/json_gem'
         ## would 'json' conflict with yajl required from other libs?
-        JSON
+        if symbolize_keys
+          JSON_SYM
+        else
+          JSON
+        end
+
       when MSGPACK_TYPE
         require 'msgpack'
-        MessagePack
+        if symbolize_keys
+          MessagePack_SYM
+        else
+          MessagePack
+        end
+
       else
         raise ArgumentError, "unknown type: #{type.inspect}"
       end

data/lib/funl/client.rb

@@ -21,15 +21,18 @@ module Funl
     attr_reader :start_tick
     attr_reader :blob_type
     attr_reader :blobber
+    attr_reader :symbolize_keys
 
     def initialize(seq: seq!, cseq: cseq!, arc: nil,
           log: Logger.new($stderr),
           stream_type: ObjectStream::MSGPACK_TYPE,
-          message_class: Message)
+          message_class: Message,
+          symbolize_keys: false)
 
       @log = log
       @stream_type = stream_type ## discover this thru connections
       @message_class = message_class
+      @symbolize_keys = symbolize_keys
 
       @seq = client_stream_for(seq)
       @cseq = client_stream_for(cseq)
@@ -109,7 +112,7 @@ module Funl
       log.info "start_tick = #{start_tick}"
       @blob_type = greeting["blob"]
       log.info "blob_type = #{blob_type}"
-      @blobber = Blobber.for(blob_type)
+      @blobber = Blobber.for(blob_type, symbolize_keys: symbolize_keys)
       seq.expect message_class
 
       @arc = @arcio && client_stream_for(@arcio, type: blob_type)

data/lib/funl/stream.rb

@@ -8,15 +8,15 @@ module Funl
 
   # Mixin depends on stream_type, log, client_id, message_class.
   module Stream
-    def client_stream_for io, type: stream_type
-      ObjectStreamWrapper.new(io, type: type).tap do |stream|
+    def client_stream_for io, type: stream_type, **opts
+      ObjectStreamWrapper.new(io, type: type, **opts).tap do |stream|
         stream.write_to_outbox {{"client_id" => client_id}}
           # client_id will be nil in the case of cseq, but that's ok.
       end
     end
 
-    def server_stream_for io, type: stream_type
-      ObjectStreamWrapper.new(io, type: type).tap do |stream|
+    def server_stream_for io, type: stream_type, **opts
+      ObjectStreamWrapper.new(io, type: type, **opts).tap do |stream|
         stream.consume do |h|
           raise StreamError, "bad handshake: #{h.class}" unless h.kind_of? Hash
           client_id = h["client_id"]
@@ -26,8 +26,8 @@ module Funl
       end
     end
     
-    def message_server_stream_for io, type: stream_type
-      ObjectStreamWrapper.new(io, type: type).tap do |stream|
+    def message_server_stream_for io, type: stream_type, **opts
+      ObjectStreamWrapper.new(io, type: type, **opts).tap do |stream|
         stream.consume do |h|
           raise StreamError, "bad handshake: #{h.class}" unless h.kind_of? Hash
           client_id = h["client_id"]

data/lib/funl/version.rb

@@ -1,3 +1,3 @@
 module Funl
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

data/test/test-blobber.rb

@@ -0,0 +1,58 @@
+require 'funl/blobber'
+
+require 'minitest/autorun'
+
+class TestBlobber < Minitest::Test
+  OBJECTS = [
+    [ {a: 1, b: 2}, {"a" => 1, "b" => 2} ]
+  ]
+
+  def test_marshal
+    blobber = Funl::Blobber.for ObjectStream::MARSHAL_TYPE
+    OBJECTS.each do |sym_obj, str_obj|
+      assert_equal sym_obj, blobber.load(blobber.dump(sym_obj))
+      assert_equal str_obj, blobber.load(blobber.dump(str_obj))
+    end
+  end
+
+  def test_yaml
+    blobber = Funl::Blobber.for ObjectStream::YAML_TYPE
+    OBJECTS.each do |sym_obj, str_obj|
+      assert_equal sym_obj, blobber.load(blobber.dump(sym_obj))
+      assert_equal str_obj, blobber.load(blobber.dump(str_obj))
+    end
+  end
+
+  def test_json_string_keys
+    blobber = Funl::Blobber.for ObjectStream::JSON_TYPE
+    OBJECTS.each do |sym_obj, str_obj|
+      assert_equal str_obj, blobber.load(blobber.dump(sym_obj))
+      assert_equal str_obj, blobber.load(blobber.dump(str_obj))
+    end
+  end
+
+  def test_json_symbol_keys
+    blobber = Funl::Blobber.for ObjectStream::JSON_TYPE, symbolize_keys: true
+    OBJECTS.each do |sym_obj, str_obj|
+      assert_equal sym_obj, blobber.load(blobber.dump(sym_obj))
+      assert_equal sym_obj, blobber.load(blobber.dump(str_obj))
+    end
+  end
+
+  def test_msgpack_string_keys
+    blobber = Funl::Blobber.for ObjectStream::MSGPACK_TYPE
+    OBJECTS.each do |sym_obj, str_obj|
+      assert_equal str_obj, blobber.load(blobber.dump(sym_obj))
+      assert_equal str_obj, blobber.load(blobber.dump(str_obj))
+    end
+  end
+
+  def test_msgpack_symbol_keys
+    blobber = Funl::Blobber.for ObjectStream::MSGPACK_TYPE, symbolize_keys: true
+    OBJECTS.each do |sym_obj, str_obj|
+      assert_equal sym_obj, blobber.load(blobber.dump(sym_obj))
+      assert_equal sym_obj, blobber.load(blobber.dump(str_obj))
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funl
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: object-stream
@@ -63,6 +63,7 @@ files:
 - lib/funl/stream.rb
 - lib/funl/subscription-tracker.rb
 - lib/funl/version.rb
+- test/test-blobber.rb
 - test/test-client-sequencer.rb
 - test/test-client.rb
 - test/test-message-sequencer.rb
@@ -97,16 +98,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sequences messages
 test_files:
-- test/test-stream.rb
-- test/test-message.rb
-- test/test-client.rb
+- test/test-message-sequencer.rb
 - test/test-client-sequencer.rb
-- test/test-subscribe.rb
 - test/test-reflect.rb
-- test/test-message-sequencer.rb
+- test/test-message.rb
+- test/test-stream.rb
+- test/test-subscribe.rb
+- test/test-client.rb
+- test/test-blobber.rb
 has_rdoc: