transit-ruby 0.8.572 → 0.8.586

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fbd02765bf5e56918772bd7f95227aaa3a93d2a
-  data.tar.gz: 6a4c50abf34ccb4b3b8a7968d3e0284041a5cb81
+  metadata.gz: d01cddb9a52ad5f336423f8bad2a06bd46483886
+  data.tar.gz: abbc67aed1cde0c0a2e3abedd3b35b8f5644c11e
 SHA512:
-  metadata.gz: 86c8d24ffa6d87f8327fdb530b5a47e332eb81cbcb0dcf92debb145caef32ee03d259d9ad1dda826435fa125d55dcc505989eb5d30bb8c2b36ebd04290290695
-  data.tar.gz: 4b5198fda8bf5016cf94c2a8399a7be5786ba89b9b2a7c609c1fe81ebb15ef0ab505814defe2adf0c5d91e0f691a8fd653da58ecdc2d6549b2a61a7089b19c0b
+  metadata.gz: 484fe240df8ee5cdde7b0daa55957f50e06a8689e5470fe4c306afb7924c3dfe826fb8d7bc7888e9fec48e4c84df71580b4aeba86c618da9cb97e4fb15f94fef
+  data.tar.gz: 2f8ae4b32c5a95e0af41840cd816227503b5a59657d6ca404e7d3978ddfdac7c27d39c1027427306f632755ea124660d87fa343290e09cc7d425904bd47f0203

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 0.8.586 / 2015-03-13
+
+* Add handler caching for MRI
+* Bump to transit-java-0.8.285 for handler caching in JRuby
+
+### 0.8.572 / 2015-01-15
+
+* Marshal int map keys as ints in msgpack
+
 ### 0.8.569 / 2014-12-03
 
 * ByteArray#to_s forces default encoding for platform

data/lib/transit/decoder.rb

@@ -16,6 +16,9 @@ module Transit
   # Converts a transit value to an instance of a type
   # @api private
   class Decoder
+    MUTEX = Mutex.new
+    HANDLER_CACHE = {}
+
     ESC_ESC  = "#{ESC}#{ESC}"
     ESC_SUB  = "#{ESC}#{SUB}"
     ESC_RES  = "#{ESC}#{RES}"
@@ -27,7 +30,14 @@ module Transit
     def initialize(options={})
       custom_handlers = options[:handlers] || {}
       custom_handlers.each {|k,v| validate_handler(k,v)}
-      @handlers = ReadHandlers::DEFAULT_READ_HANDLERS.merge(custom_handlers)
+      MUTEX.synchronize do
+        if HANDLER_CACHE.has_key?(custom_handlers)
+          @handlers = HANDLER_CACHE[custom_handlers]
+        else
+          @handlers = ReadHandlers::DEFAULT_READ_HANDLERS.merge(custom_handlers)
+        end
+
+      end
       @default_handler = options[:default_handler] || ReadHandlers::DEFAULT_READ_HANDLER
     end
 

data/lib/transit/marshaler/base.rb

@@ -17,21 +17,49 @@ module Transit
   # @see https://github.com/cognitect/transit-format
   module Marshaler
 
+    HANDLER_CACHE = {}
+    VERBOSE_HANDLER_CACHE = {}
+    MUTEX = Mutex.new
+
+    # @api private
+    # Included in VerboseJson subclasses. Defined here to make it
+    # available in CRuby and JRuby environments.
+    module VerboseHandlers
+      def build_handlers(custom_handlers)
+        if VERBOSE_HANDLER_CACHE.has_key?(custom_handlers)
+          VERBOSE_HANDLER_CACHE[custom_handlers]
+        else
+          handlers = super(custom_handlers).reduce({}) do |h, (k,v)|
+            if v.respond_to?(:verbose_handler) && vh = v.verbose_handler
+              h.store(k, vh)
+            else
+              h.store(k, v)
+            end
+            h
+          end
+          VERBOSE_HANDLER_CACHE[custom_handlers] = handlers
+          handlers
+        end
+      end
+    end
+
     # @api private
     module Base
       def parse_options(opts)
-        @cache_enabled  = !opts[:verbose]
-        @prefer_strings = opts[:prefer_strings]
-        @max_int        = opts[:max_int]
-        @min_int        = opts[:min_int]
-
-        handlers = WriteHandlers::DEFAULT_WRITE_HANDLERS.dup
-        handlers = handlers.merge!(opts[:handlers]) if opts[:handlers]
-        @handlers = (opts[:verbose] ? verbose_handlers(handlers) : handlers)
-        @handlers.values.each do |h|
-          if h.respond_to?(:handlers=)
-            h.handlers=(@handlers)
-          end
+        MUTEX.synchronize do
+          @handlers = build_handlers(opts[:handlers])
+        end
+        @handlers.values.each { |h| h.handlers=(@handlers) if h.respond_to?(:handlers=) }
+      end
+
+      def build_handlers(custom_handlers)
+        if HANDLER_CACHE.has_key?(custom_handlers)
+          HANDLER_CACHE[custom_handlers]
+        else
+          handlers = WriteHandlers::DEFAULT_WRITE_HANDLERS.dup
+          handlers.merge!(custom_handlers) if custom_handlers
+          HANDLER_CACHE[custom_handlers] = handlers
+          handlers
         end
       end
 
@@ -44,15 +72,6 @@ module Transit
         nil
       end
 
-      def verbose_handlers(handlers)
-        handlers.each do |k, v|
-          if v.respond_to?(:verbose_handler) && vh = v.verbose_handler
-            handlers.store(k, vh)
-          end
-        end
-        handlers
-      end
-
       def escape(s)
         if s.start_with?(SUB,ESC,RES) && s != "#{SUB} "
           "#{ESC}#{s}"
@@ -67,7 +86,7 @@ module Transit
 
       def emit_string(prefix, tag, value, as_map_key, cache)
         encoded = "#{prefix}#{tag}#{value}"
-        if @cache_enabled && cache.cacheable?(encoded, as_map_key)
+        if cache.cacheable?(encoded, as_map_key)
           emit_value(cache.write(encoded), as_map_key)
         else
           emit_value(encoded, as_map_key)

data/lib/transit/marshaler/cruby/json.rb

@@ -19,16 +19,13 @@ module Transit
     class BaseJson
       include Transit::Marshaler::Base
 
-      def default_opts
-        {:prefer_strings => true,
-          :max_int       => JSON_MAX_INT,
-          :min_int       => JSON_MIN_INT}
-      end
-
       def initialize(io, opts)
         @oj = Oj::StreamWriter.new(io,opts.delete(:oj_opts) || {})
-        parse_options(default_opts.merge(opts))
         @state = []
+        @max_int = JSON_MAX_INT
+        @min_int = JSON_MIN_INT
+        @prefer_strings = true
+        parse_options(opts)
       end
 
       def emit_array_start(size)
@@ -87,6 +84,8 @@ module Transit
 
     # @api private
     class VerboseJson < BaseJson
+      include Transit::Marshaler::VerboseHandlers
+
       def emit_string(prefix, tag, value, as_map_key, cache)
         emit_value("#{prefix}#{tag}#{value}", as_map_key)
       end

data/lib/transit/marshaler/cruby/messagepack.rb

@@ -19,16 +19,13 @@ module Transit
     class MessagePack
       include Transit::Marshaler::Base
 
-      def default_opts
-        {:prefer_strings => false,
-          :max_int       => MAX_INT,
-          :min_int       => MIN_INT}
-      end
-
       def initialize(io, opts)
         @io = io
         @packer = ::MessagePack::Packer.new(io)
-        parse_options(default_opts.merge(opts))
+        @max_int = MAX_INT
+        @min_int = MIN_INT
+        @prefer_strings = false
+        parse_options(opts)
       end
 
       def emit_array_start(size)

data/lib/transit/writer.rb

@@ -39,21 +39,12 @@ module Transit
     def initialize(format, io, opts={})
       @marshaler = case format
                    when :json
-                     Marshaler::Json.new(io,
-                                       {:prefer_strings => true,
-                                        :verbose        => false,
-                                        :handlers       => {},
-                                        :oj_opts        => {:indent => -1}}.merge(opts))
+                     Marshaler::Json.new(io, {:handlers => {},
+                                              :oj_opts => {:indent => -1}}.merge(opts))
                    when :json_verbose
-                     Marshaler::VerboseJson.new(io,
-                                                {:prefer_strings => true,
-                                                  :verbose        => true,
-                                                  :handlers       => {}}.merge(opts))
+                     Marshaler::VerboseJson.new(io, {:handlers => {}}.merge(opts))
                    else
-                     Marshaler::MessagePack.new(io,
-                                                {:prefer_strings => false,
-                                                  :verbose        => false,
-                                                  :handlers       => {}}.merge(opts))
+                     Marshaler::MessagePack.new(io, {:handlers => {}}.merge(opts))
                    end
     end
 

data/spec/transit/marshaler_spec.rb

@@ -0,0 +1,30 @@
+module Transit
+  describe Marshaler do
+    it "caches non-verbose handlers" do
+      io = StringIO.new
+      first  = Transit::Marshaler::Json.new(io,{}).instance_variable_get("@handlers")
+      second = Transit::Marshaler::Json.new(io,{}).instance_variable_get("@handlers")
+      third  = Transit::Marshaler::MessagePack.new(io,{}).instance_variable_get("@handlers")
+      assert { first }
+      assert { first.equal?(second) }
+      assert { second.equal?(third) }
+    end
+
+    it "caches verbose handlers" do
+      io = StringIO.new
+      first  = Transit::Marshaler::VerboseJson.new(io,{}).instance_variable_get("@handlers")
+      second = Transit::Marshaler::VerboseJson.new(io,{}).instance_variable_get("@handlers")
+      assert { first }
+      assert { first.equal?(second) }
+    end
+
+    it "caches verbose and non-verbose handlers separately" do
+      io = StringIO.new
+      first  = Transit::Marshaler::Json.new(io,{}).instance_variable_get("@handlers")
+      second = Transit::Marshaler::VerboseJson.new(io,{}).instance_variable_get("@handlers")
+      assert { first }
+      assert { second }
+      assert { !first.equal?(second) }
+    end
+  end
+end

data/spec/transit/reader_spec.rb

@@ -47,7 +47,12 @@ module Transit
         writer = Transit::Writer.new(type, io)
         inputs.each {|i| writer.write(i)}
         reader = Transit::Reader.new(type, StringIO.new(io.string))
-        reader.read {|val| outputs << val}
+        if Transit::jruby?
+          # Ignore expected EOFException raised after the StringIO is exhausted
+          reader.read {|val| outputs << val} rescue nil
+        else
+          reader.read {|val| outputs << val}
+        end
 
         assert { outputs == inputs }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transit-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.572
+  version: 0.8.586
 platform: ruby
 authors:
 - Russ Olsen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -170,6 +170,7 @@ files:
 - spec/transit/date_time_util_spec.rb
 - spec/transit/decoder_spec.rb
 - spec/transit/exemplar_spec.rb
+- spec/transit/marshaler_spec.rb
 - spec/transit/reader_spec.rb
 - spec/transit/rolling_cache_spec.rb
 - spec/transit/round_trip_spec.rb
@@ -204,6 +205,7 @@ test_files:
 - spec/transit/date_time_util_spec.rb
 - spec/transit/decoder_spec.rb
 - spec/transit/exemplar_spec.rb
+- spec/transit/marshaler_spec.rb
 - spec/transit/reader_spec.rb
 - spec/transit/rolling_cache_spec.rb
 - spec/transit/round_trip_spec.rb