transit-ruby 0.8.467 → 0.8.539

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858abe150e0ef0a4aff5aac2c6c51634c64c6ed5
-  data.tar.gz: 2f008bd4e87acdb2486ebd26f46f65f2db024d53
+  metadata.gz: 4c90ad9b7561aaa1ad18f56cc7ed90af38d7d70d
+  data.tar.gz: fbeacd5a32fbe9ce5030a5d0f341c0e895269d1c
 SHA512:
-  metadata.gz: 43cfd91c10e42ccc8c6d347a3164cfbe752acf4f23416c484227ecf1bcb61d3249ac0af49e1fb9aec8f23be08e8b749a7e3df8bb66b7b10fbf7ee1257be40e55
-  data.tar.gz: 3e2b9036f53e01ebafb276cd115429eb898c7b86d02b9aba0672b288cfcefaadb8bee508c38d235e346f3b5d5c6fc499f30bf10a61dca93f56e5390f19cf3421
+  metadata.gz: c959bd7c9532b09cdae9edf20bb657ef0232b3b7220e5cc97af2ff2027f60bcce14e049e026fd23936620a5d3a150c13b482fbf52ab49f8b6959e6ed5d94f5af
+  data.tar.gz: 12609c53e17740223bc6a485a8de42d5f45faa67a145e741606a7bd79b24414d3597f71e9edbd2a40016860db0556c197310194a05fe31ae9fc22947346f8bf6

checksums.yaml.gz.sig

@@ -1 +1 @@
-�����
Drpa�
+��B��骐�A3Y�o�bS�1���A�X(�\���iX�i�ʖ�`"X:�(� =�Ͼ�Ɓ=�_ ��ٝY*��,��#��"��8��nlj��[@��PҔ� Ű�`�S��4�M�Т����

���𤡬���w�N�*h��Pa�ӷdt��#��J�jw�����%���t� �5�5�*�0�؁,������I�_j"}�7����(XXmTF����l1��(�g�É�pX �6,�Ӟf%z��`NR��

data/README.md

@@ -18,6 +18,10 @@ between applications, it should not yet be used for storing data
 durably over time. This recommendation will change when the
 specification is complete._
 
+### Contributing
+
+This library is open source, developed internally by Cognitect. We welcome discussions of potential problems and enhancement suggestions on the [transit-format mailing list](https://groups.google.com/forum/#!forum/transit-format). Issues can be filed using GitHub [issues](https://github.com/cognitect/transit-ruby/issues) for this project. Because transit is incorporated into products and client projects, we prefer to do development internally and are not accepting pull requests or patches.
+
 ## Releases and Dependency Information
 
 See https://rubygems.org/gems/transit-ruby
@@ -140,15 +144,16 @@ for more info.
 |bytes|Transit::ByteArray|Transit::ByteArray|Transit::ByteArray.new("base64")|base64|
 |link|Transit::Link|Transit::Link|Transit::Link.new(Addressable::URI.parse("http://example.org/search"), "search")|`#<Transit::Link:0x007f81c405b7f0 @values={"href"=>#<Addressable::URI:0x3fc0e202dfb8 URI:http://example.org/search>, "rel"=>"search", "name"=>nil, "render"=>nil, "prompt"=>nil}>`|
 
+### Additional types (not required by the [transit-format](https://github.com/cognitect/transit-format) spec)
+
+|Semantic type|Write accepts|Read returns|Example(write)|Example(read)|
+|------------|-------------|------------|--------------|-------------|
+|ratio|Rational|Rational|Rational(1, 3)|Rational(1, 3)|
 
 ## Supported Rubies
 
 * MRI 1.9.3, 2.0.0, 2.1.0, 2.1.1, 2.1.2
 
-## Contributing
-
-This library is open source, developed internally by Cognitect. We welcome discussions of potential problems and enhancement suggestions on the [transit-format mailing list](https://groups.google.com/forum/#!forum/transit-format). Issues can be filed using GitHub [issues](https://github.com/cognitect/transit-ruby/issues) for this project. Because transit is incorporated into products and client projects, we prefer to do development internally and are not accepting pull requests or patches.
-
 ## Copyright and License
 
 Copyright © 2014 Cognitect

data/lib/transit.rb

@@ -66,6 +66,11 @@ module Transit
 
   JSON_MAX_INT = 2**53 - 1
   JSON_MIN_INT = -JSON_MAX_INT
+
+  def jruby?
+    defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+  end
+  module_function :jruby?
 end
 
 require 'set'
@@ -81,6 +86,23 @@ require 'transit/transit_types'
 require 'transit/rolling_cache'
 require 'transit/write_handlers'
 require 'transit/read_handlers'
+require 'transit/marshaler/base'
 require 'transit/writer'
 require 'transit/decoder'
 require 'transit/reader'
+
+if Transit::jruby?
+  require 'lock_jar'
+  LockJar.lock(File.join(File.dirname(__FILE__), "..", "Jarfile"))
+  LockJar.load
+  require 'transit.jar'
+  require 'jruby'
+  com.cognitect.transit.ruby.TransitService.new.basicLoad(JRuby.runtime)
+  require 'transit/marshaler/jruby/json'
+  require 'transit/marshaler/jruby/messagepack'
+else
+  require 'transit/marshaler/cruby/json'
+  require 'transit/marshaler/cruby/messagepack'
+  require 'transit/unmarshaler/cruby/json'
+  require 'transit/unmarshaler/cruby/messagepack'
+end

data/lib/transit/date_time_util.rb

@@ -22,11 +22,11 @@ module Transit
       when Date
         t = Time.gm(v.year, v.month, v.day)
       when Time
-        t = v.getutc
+        t = v
       else
         raise "Don't know how to get millis from #{t.inspect}"
       end
-      (t.to_i * 1000) + (t.usec / 1000)
+      (t.to_i * 1000) + (t.usec / 1000.0).round
     end
 
     def from_millis(millis)

data/lib/transit/marshaler/base.rb

@@ -0,0 +1,179 @@
+# 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.
+
+module Transit
+  # Transit::Writer marshals Ruby objects as transit values to an output stream.
+  # @see https://github.com/cognitect/transit-format
+  module Marshaler
+
+    # @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
+        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
+  end
+end

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

@@ -0,0 +1,94 @@
+# 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 Marshaler
+    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)
+        parse_options(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 Json < BaseJson
+      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 VerboseJson < BaseJson
+      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
+  end
+end

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

@@ -0,0 +1,60 @@
+# 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 Marshaler
+    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))
+      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
+  end
+end

data/lib/transit/read_handlers.rb

@@ -42,6 +42,16 @@ module Transit
     class BigDecimalHandler
       def from_rep(v) BigDecimal.new(v) end
     end
+    class SpecialNumbersHandler
+      def from_rep(v)
+        case v
+        when "NaN"  then  Float::NAN
+        when "INF"  then  Float::INFINITY
+        when "-INF" then -Float::INFINITY
+        else raise ArgumentError.new("Don't know how to handle #{v.inspect} for the \"z\" tag")
+        end
+      end
+    end
     class IdentityHandler
       def from_rep(v) v end
     end
@@ -69,6 +79,9 @@ module Transit
     class CmapHandler
       def from_rep(v) Hash[*v] end
     end
+    class RatioHandler
+      def from_rep(v) Rational(v[0], v[1]) end
+    end
 
     DEFAULT_READ_HANDLERS = {
       "_" => NilHandler.new,
@@ -86,10 +99,12 @@ module Transit
       "u" => UuidHandler.new,
       "r" => UriHandler.new,
       "'" => IdentityHandler.new,
+      "z" => SpecialNumbersHandler.new,
       "set"     => SetHandler.new,
       "link"    => LinkHandler.new,
       "list"    => IdentityHandler.new,
-      "cmap"    => CmapHandler.new
+      "cmap"    => CmapHandler.new,
+      "ratio"   => RatioHandler.new
     }.freeze
 
     DEFAULT_READ_HANDLER = Default.new