transit-ruby 0.8.572-java → 0.8.586-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd9efa9d2e7a8bda1da0e2e5070ad44075049766
-  data.tar.gz: bf3e8d7779391c62a6558015e4663efa214cc145
+  metadata.gz: 8ba4c772139a74b3be6f8ce528034e96fb1cb0d3
+  data.tar.gz: d3908376d545f35d67a9c4cc368fc1301ea9dafc
 SHA512:
-  metadata.gz: 404a8b0a1b058825ebc0bd1f181823f977d9c9818dd05923331e3a2e6041caeb8c8a04ffd12f70aba0fd35d1e8c0815b79b8b67aaf422d8c08bbda254f82d989
-  data.tar.gz: a365ea8f732d373ad6bb323bba1a5541da81d071dc44da584b389b6a4380dc063ba670c1766ec0d37c1efa8b7a08c72780e6544833fd460b90fcee80e6c7f393
+  metadata.gz: d2a10f2cbe42c671eead5cdfddbde8e404a4f21b899f0a82aee1be460a0008a56066f2b1dbb18cecc7742c1abad0295620d3b0c5b067aebb9df5f0a96d8f3d0b
+  data.tar.gz: 7a3e044915d97cda616ac1ad445a6b320b04536155b900ec88647bf21578a99ff7e3b0b0d5abe96148f1083f1bdb57c2a5cf85bc9e71a278e52b1a4b998d3c69

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/Jarfile

@@ -3,7 +3,7 @@
 # dependency to transit-java
 # this setup uses maven central for the repository
 
-jar "com.cognitect:transit-java:0.8.269"
+jar "com.cognitect:transit-java:0.8.285"
 
 group 'development' do
   jar "org.jruby:jruby-complete:1.7.13"

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/jruby/json.rb

@@ -15,11 +15,10 @@
 module Transit
   module Marshaler
 
+    # @api private
     module JsonBase
-      def default_opts
-        {:prefer_strings => true,
-          :max_int       => JSON_MAX_INT,
-          :min_int       => JSON_MIN_INT}
+      def initialize(io, opts)
+        parse_options(opts)
       end
     end
 
@@ -27,20 +26,13 @@ module Transit
     class Json
       include Transit::Marshaler::Base
       include Transit::Marshaler::JsonBase
-
-      def initialize(io, opts)
-        parse_options(default_opts.merge(opts))
-      end
     end
 
     # @api private
     class VerboseJson
       include Transit::Marshaler::Base
       include Transit::Marshaler::JsonBase
-
-      def initialize(io, opts)
-        parse_options(default_opts.merge(opts))
-      end
+      include Transit::Marshaler::VerboseHandlers
     end
   end
 end

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

@@ -17,14 +17,8 @@ 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)
-        parse_options(default_opts.merge(opts))
+        parse_options(opts)
       end
     end
   end

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: java
 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
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,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
@@ -162,6 +163,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