transit-ruby 0.8.467 → 0.8.539

data/lib/transit/reader.rb

@@ -17,56 +17,6 @@ module Transit
   # values/objects in Ruby.
   # @see https://github.com/cognitect/transit-format
   class Reader
-    # @api private
-    class JsonUnmarshaler
-      class ParseHandler
-        def each(&block) @yield_v = block end
-        def add_value(v) @yield_v[v] if @yield_v end
-
-        def hash_start()      {} end
-        def hash_set(h,k,v)   h.store(k,v) end
-        def array_start()     [] end
-        def array_append(a,v) a << v end
-
-        def error(message, line, column)
-          raise Exception.new(message, line, column)
-        end
-      end
-
-      def initialize(io, opts)
-        @io = io
-        @decoder = Transit::Decoder.new(opts)
-        @parse_handler = ParseHandler.new
-      end
-
-      # @see Reader#read
-      def read
-        if block_given?
-          @parse_handler.each {|v| yield @decoder.decode(v)}
-        else
-          @parse_handler.each {|v| return @decoder.decode(v)}
-        end
-        Oj.sc_parse(@parse_handler, @io)
-      end
-    end
-
-    # @api private
-    class MessagePackUnmarshaler
-      def initialize(io, opts)
-        @decoder = Transit::Decoder.new(opts)
-        @unpacker = MessagePack::Unpacker.new(io)
-      end
-
-      # @see Reader#read
-      def read
-        if block_given?
-          @unpacker.each {|v| yield @decoder.decode(v)}
-        else
-          @decoder.decode(@unpacker.read)
-        end
-      end
-    end
-
     extend Forwardable
 
     # @!method read
@@ -106,11 +56,9 @@ module Transit
     def initialize(format, io, opts={})
       @reader = case format
                 when :json, :json_verbose
-                  require 'oj'
-                  JsonUnmarshaler.new(io, opts)
+                  Unmarshaler::Json.new(io, opts)
                 else
-                  require 'msgpack'
-                  MessagePackUnmarshaler.new(io, opts)
+                  Unmarshaler::MessagePack.new(io, opts)
                 end
     end
   end

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

@@ -0,0 +1,55 @@
+# Copyright 2014 Cognitect. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS-IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'oj'
+
+module Transit
+  module Unmarshaler
+    # Transit::Reader::MessagePackUnmarshaler is responsible to read data on CRuby
+    # @see https://github.com/cognitect/transit-format
+
+    # @api private
+    class Json
+      class ParseHandler
+        def each(&block) @yield_v = block end
+        def add_value(v) @yield_v[v] if @yield_v end
+
+        def hash_start()      {} end
+        def hash_set(h,k,v)   h.store(k,v) end
+        def array_start()     [] end
+        def array_append(a,v) a << v end
+
+        def error(message, line, column)
+          raise Exception.new(message, line, column)
+        end
+      end
+
+      def initialize(io, opts)
+        @io = io
+        @decoder = Transit::Decoder.new(opts)
+        @parse_handler = ParseHandler.new
+      end
+
+      # @see Reader#read
+      def read
+        if block_given?
+          @parse_handler.each {|v| yield @decoder.decode(v)}
+        else
+          @parse_handler.each {|v| return @decoder.decode(v)}
+        end
+        Oj.sc_parse(@parse_handler, @io)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# Copyright 2014 Cognitect. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS-IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'msgpack'
+
+module Transit
+  module Unmarshaler
+    # Transit::Reader::MessagePackUnmarshaler is responsible to read data on CRuby
+    # @see https://github.com/cognitect/transit-format
+
+    # @api private
+    class MessagePack
+      def initialize(io, opts)
+        @decoder = Transit::Decoder.new(opts)
+        @unpacker = ::MessagePack::Unpacker.new(io)
+      end
+
+      # @see Reader#read
+      def read
+        if block_given?
+          @unpacker.each {|v| yield @decoder.decode(v)}
+        else
+          @decoder.decode(@unpacker.read)
+        end
+      end
+    end
+  end
+end

data/lib/transit/write_handlers.rb

@@ -237,9 +237,26 @@ module Transit
     end
 
     class FloatHandler
-      def tag(_) "d" end
-      def rep(f) f end
-      def string_rep(f) f.to_s end
+      def tag(f)
+        return "z" if f.nan?
+        case f
+        when Float::INFINITY, -Float::INFINITY
+          "z"
+        else
+          "d"
+        end
+      end
+
+      def rep(f)
+        return "NaN" if f.nan?
+        case f
+        when  Float::INFINITY then "INF"
+        when -Float::INFINITY then "-INF"
+        else f
+        end
+      end
+
+      def string_rep(f) rep(f).to_s end
     end
 
     class BigDecimalHandler
@@ -248,6 +265,12 @@ module Transit
       def string_rep(f) rep(f) end
     end
 
+    class RationalHandler
+      def tag(_) "ratio" end
+      def rep(r) [r.numerator, r.denominator] end
+      def string_rep(_) nil end
+    end
+
     # TimeHandler, DateTimeHandler, and DateHandler all have different
     # implementations of string_rep. Here is the rationale:
     #
@@ -330,7 +353,15 @@ module Transit
 
     class ByteArrayHandler
       def tag(_) "b" end
-      def rep(b) b.to_base64 end
+      if Transit::jruby?
+        def rep(b)
+          b.value.to_java_bytes
+        end
+      else
+        def rep(b)
+          b.to_base64
+        end
+      end
       def string_rep(b) rep(b) end
     end
 
@@ -388,6 +419,7 @@ module Transit
       Bignum           => IntHandler.new,
       Float            => FloatHandler.new,
       BigDecimal       => BigDecimalHandler.new,
+      Rational         => RationalHandler.new,
       Time             => TimeHandler.new,
       DateTime         => DateTimeHandler.new,
       Date             => DateHandler.new,

data/lib/transit/writer.rb

@@ -17,279 +17,6 @@ module Transit
   # @see https://github.com/cognitect/transit-format
   class Writer
 
-    # @api private
-    class Marshaler
-      def initialize(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
-        end
-      end
-
-      def find_handler(obj)
-        obj.class.ancestors.each do |a|
-          if handler = @handlers[a]
-            return handler
-          end
-        end
-        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}"
-        else
-          s
-        end
-      end
-
-      def emit_nil(as_map_key, cache)
-        as_map_key ? emit_string(ESC, "_", nil, true, cache) : emit_value(nil)
-      end
-
-      def emit_string(prefix, tag, value, as_map_key, cache)
-        encoded = "#{prefix}#{tag}#{value}"
-        if @cache_enabled && cache.cacheable?(encoded, as_map_key)
-          emit_value(cache.write(encoded), as_map_key)
-        else
-          emit_value(encoded, as_map_key)
-        end
-      end
-
-      def emit_boolean(handler, b, as_map_key, cache)
-        as_map_key ? emit_string(ESC, "?", handler.string_rep(b), true, cache) : emit_value(b)
-      end
-
-      def emit_int(tag, i, as_map_key, cache)
-        if as_map_key || i > @max_int || i < @min_int
-          emit_string(ESC, tag, i, as_map_key, cache)
-        else
-          emit_value(i, as_map_key)
-        end
-      end
-
-      def emit_double(d, as_map_key, cache)
-        as_map_key ? emit_string(ESC, "d", d, true, cache) : emit_value(d)
-      end
-
-      def emit_array(a, cache)
-        emit_array_start(a.size)
-        a.each {|e| marshal(e, false, cache)}
-        emit_array_end
-      end
-
-      def emit_map(m, cache)
-        emit_map_start(m.size)
-        m.each do |k,v|
-          marshal(k, true, cache)
-          marshal(v, false, cache)
-        end
-        emit_map_end
-      end
-
-      def emit_tagged_value(tag, rep, cache)
-        emit_array_start(2)
-        emit_string(ESC, "#", tag, false, cache)
-        marshal(rep, false, cache)
-        emit_array_end
-      end
-
-      def emit_encoded(handler, tag, obj, as_map_key, cache)
-        if tag.length == 1
-          rep = handler.rep(obj)
-          if String === rep
-            emit_string(ESC, tag, rep, as_map_key, cache)
-          elsif as_map_key || @prefer_strings
-            if str_rep = handler.string_rep(obj)
-              emit_string(ESC, tag, str_rep, as_map_key, cache)
-            else
-              raise "Cannot be encoded as String: " + {:tag => tag, :rep => rep, :obj => obj}.to_s
-            end
-          else
-            emit_tagged_value(tag, handler.rep(obj), cache)
-          end
-        elsif as_map_key
-          raise "Cannot be used as a map key: " + {:tag => tag, :rep => rep, :obj => obj}.to_s
-        else
-          emit_tagged_value(tag, handler.rep(obj), cache)
-        end
-      end
-
-      def marshal(obj, as_map_key, cache)
-        handler = find_handler(obj)
-        tag = handler.tag(obj)
-        case tag
-        when "_"
-          emit_nil(as_map_key, cache)
-        when "?"
-          emit_boolean(handler, obj, as_map_key, cache)
-        when "s"
-          emit_string(nil, nil, escape(handler.rep(obj)), as_map_key, cache)
-        when "i"
-          emit_int(tag, handler.rep(obj), as_map_key, cache)
-        when "d"
-          emit_double(handler.rep(obj), as_map_key, cache)
-        when "'"
-          emit_tagged_value(tag, handler.rep(obj), cache)
-        when "array"
-          emit_array(handler.rep(obj), cache)
-        when "map"
-          emit_map(handler.rep(obj), cache)
-        else
-          emit_encoded(handler, tag, obj, as_map_key, cache)
-        end
-      end
-
-      def marshal_top(obj, cache=RollingCache.new)
-        if handler = find_handler(obj)
-          if tag = handler.tag(obj)
-            if tag.length == 1
-              marshal(TaggedValue.new(QUOTE, obj), false, cache)
-            else
-              marshal(obj, false, cache)
-            end
-            flush
-          else
-            raise "Handler must provide a non-nil tag: #{handler.inspect}"
-          end
-        else
-          raise "Can not find a Write Handler for #{obj.inspect}."
-        end
-      end
-    end
-
-    # @api private
-    class BaseJsonMarshaler < Marshaler
-      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)
-        super(default_opts.merge(opts))
-        @state = []
-      end
-
-      def emit_array_start(size)
-        @state << :array
-        @oj.push_array
-      end
-
-      def emit_array_end
-        @state.pop
-        @oj.pop
-      end
-
-      def emit_map_start(size)
-        @state << :map
-        @oj.push_object
-      end
-
-      def emit_map_end
-        @state.pop
-        @oj.pop
-      end
-
-      def emit_value(obj, as_map_key=false)
-        if @state.last == :array
-          @oj.push_value(obj)
-        else
-          as_map_key ? @oj.push_key(obj) : @oj.push_value(obj)
-        end
-      end
-
-      def flush
-        # no-op
-      end
-    end
-
-    # @api private
-    class JsonMarshaler < BaseJsonMarshaler
-      def emit_map(m, cache)
-        emit_array_start(-1)
-        emit_value("^ ", false)
-        m.each do |k,v|
-          marshal(k, true, cache)
-          marshal(v, false, cache)
-        end
-        emit_array_end
-      end
-    end
-
-    # @api private
-    class VerboseJsonMarshaler < BaseJsonMarshaler
-      def emit_string(prefix, tag, value, as_map_key, cache)
-        emit_value("#{prefix}#{tag}#{value}", as_map_key)
-      end
-
-      def emit_tagged_value(tag, rep, cache)
-        emit_map_start(1)
-        emit_string(ESC, "#", tag, true, cache)
-        marshal(rep, false, cache)
-        emit_map_end
-      end
-    end
-
-    # @api private
-    class MessagePackMarshaler < Marshaler
-      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)
-        super(default_opts.merge(opts))
-      end
-
-      def emit_array_start(size)
-        @packer.write_array_header(size)
-      end
-
-      def emit_array_end
-        # no-op
-      end
-
-      def emit_map_start(size)
-        @packer.write_map_header(size)
-      end
-
-      def emit_map_end
-        # no-op
-      end
-
-      def emit_value(obj, as_map_key=:ignore)
-        @packer.write(obj)
-      end
-
-      def flush
-        @packer.flush
-        @io.flush
-      end
-    end
-
     # @param [Symbol] format required :json, :json_verbose, or :msgpack
     # @param [IO]     io required
     # @param [Hash]   opts optional
@@ -312,23 +39,21 @@ module Transit
     def initialize(format, io, opts={})
       @marshaler = case format
                    when :json
-                     require 'oj'
-                     JsonMarshaler.new(io,
+                     Marshaler::Json.new(io,
                                        {:prefer_strings => true,
                                         :verbose        => false,
-                                        :handlers       => {}}.merge(opts))
+                                        :handlers       => {},
+                                        :oj_opts        => {:indent => -1}}.merge(opts))
                    when :json_verbose
-                     require 'oj'
-                     VerboseJsonMarshaler.new(io,
-                                              {:prefer_strings => true,
-                                               :verbose        => true,
-                                               :handlers       => {}}.merge(opts))
+                     Marshaler::VerboseJson.new(io,
+                                                {:prefer_strings => true,
+                                                  :verbose        => true,
+                                                  :handlers       => {}}.merge(opts))
                    else
-                     require 'msgpack'
-                     MessagePackMarshaler.new(io,
-                                              {:prefer_strings => false,
-                                               :verbose        => false,
-                                               :handlers       => {}}.merge(opts))
+                     Marshaler::MessagePack.new(io,
+                                                {:prefer_strings => false,
+                                                  :verbose        => false,
+                                                  :handlers       => {}}.merge(opts))
                    end
     end
 
@@ -339,8 +64,14 @@ module Transit
     # @example
     #   writer = Transit::Writer.new(:json, io)
     #   writer.write(Date.new(2014,7,22))
-    def write(obj)
-      @marshaler.marshal_top(obj)
+    if Transit::jruby?
+      def write(obj)
+        @marshaler.write(obj)
+      end
+    else
+      def write(obj)
+        @marshaler.marshal_top(obj)
+      end
     end
   end
 end