transit-ruby 0.8.467 → 0.8.539

data/spec/spec_helper.rb

@@ -37,11 +37,25 @@ require 'wrong/adapters/rspec'
 require 'transit'
 require 'spec_helper-local' if File.exist?(File.expand_path('../spec_helper-local.rb', __FILE__))
 
+if Transit::jruby?
+  require 'transit/unmarshaler/jruby/messagepack'
+end
+
 RSpec.configure do |c|
   c.alias_example_to :fit, :focus => true
   c.filter_run_including :focus => true, :focused => true
+  c.filter_run_excluding :jruby => true
   c.run_all_when_everything_filtered = true
   c.mock_with :nothing
+
+  c.before(:suite) do
+    # TODO: make it work later
+    #if Transit::jruby?
+    #  require 'rake'
+    #  load File.expand_path("Rakefile")
+    #  Rake::Task['compile'].invoke
+    #end
+  end
 end
 
 ALPHA_NUM = 'abcdefghijklmnopqrstuvwxyzABCDESFHIJKLMNOPQRSTUVWXYZ_0123456789'

data/spec/transit/exemplar_spec.rb

@@ -112,7 +112,8 @@ EXEMPLARS = [
   Exemplar.new("vector_unrecognized_vals", ["~Unrecognized"]),
   Exemplar.new("vector_1935_keywords_repeated_twice", array_of_symbols(1935, 3870)),
   Exemplar.new("vector_1936_keywords_repeated_twice", array_of_symbols(1936, 3872)),
-  Exemplar.new("vector_1937_keywords_repeated_twice", array_of_symbols(1937, 3874))
+  Exemplar.new("vector_1937_keywords_repeated_twice", array_of_symbols(1937, 3874)),
+  Exemplar.new("vector_special_numbers", [Float::NAN, Float::INFINITY, -Float::INFINITY])
   ]
 
 [10, 1935, 1936, 1937].each do |i|

data/spec/transit/reader_spec.rb

@@ -115,12 +115,20 @@ module Transit
         end
       end
 
+      describe 'Dates/Times' do
+        it "delivers a UTC DateTime for a non-UTC date string" do
+          io = StringIO.new(["~t2014-04-14T12:20:50.152-05:00"].to_json)
+          reader = Reader.new(:json, io)
+          expect(Transit::DateTimeUtil.to_millis(reader.read.first)).to eq(Transit::DateTimeUtil.to_millis(DateTime.new(2014,4,14,17,20,50.152,"Z")))
+        end
+      end
+
       describe 'edge cases found in generative testing' do
-        it 'supports ...' do
-          io = StringIO.new(["~#cmap",[["~#ratio",["~n10","~n11"]],"~:foobar",["^1",["~n10","~n13"]],"^2"]].to_json)
+        it 'caches nested structures correctly' do
+          io = StringIO.new(["~#cmap",[["~#point",["~n10","~n11"]],"~:foobar",["^1",["~n10","~n13"]],"^2"]].to_json)
           reader = Reader.new(:json, io)
-          expected = {TaggedValue.new("ratio",[10,11]) => :foobar,
-                      TaggedValue.new("ratio",[10,13]) => :foobar}
+          expected = {TaggedValue.new("point", [10,11]) => :foobar,
+                      TaggedValue.new("point", [10,13]) => :foobar}
           assert { reader.read == expected }
         end
       end

data/spec/transit/round_trip_spec.rb

@@ -14,6 +14,10 @@
 
 require 'spec_helper'
 
+def nan?(obj)
+  obj.respond_to?(:nan?) and obj.nan?
+end
+
 def round_trip(obj, type, opts={})
   obj_before = obj
 
@@ -22,63 +26,48 @@ def round_trip(obj, type, opts={})
   writer.write(obj)
 
   # ensure that we don't modify the object being written
-  assert { obj == obj_before }
+  if nan?(obj_before)
+    assert { obj.nan? }
+  else
+    assert { obj == obj_before }
+  end
   reader = Transit::Reader.new(type, StringIO.new(io.string), :handlers => opts[:read_handlers])
   reader.read
 end
 
 def assert_equal_times(actual,expected)
+  return false unless expected.is_a?(Date) || expected.is_a?(Time) || expected.is_a?(DateTime)
   assert { Transit::DateTimeUtil.to_millis(actual) == Transit::DateTimeUtil.to_millis(expected) }
   assert { actual.zone == expected.zone }
 end
 
+def assert_nan(actual,expected)
+  return false unless nan?(expected)
+  expect(actual.respond_to?(:nan?)).to eq(true)
+  expect(actual.nan?).to eq(true)
+end
+
+def validate(expected, actual)
+  assert_equal_times(actual, expected) || assert_nan(actual, expected) || (expect(actual).to eq(expected))
+end
+
 def round_trips(label, obj, type, opts={})
   expected = opts[:expected] || obj
 
   it "round trips #{label} at top level", :focus => !!opts[:focus], :pending => opts[:pending] do
-    case obj
-    when Date, Time, DateTime
-      assert_equal_times(round_trip(obj, type), expected)
-    else
-      actual = round_trip(obj, type, opts)
-      expect(actual).to eq(expected)
-    end
+    validate(expected, round_trip(obj, type, opts))
   end
 
-  case obj
-  when Date, Time, DateTime
-    it "round trips #{label} as a map key", :focus => !!opts[:focus], :pending => opts[:pending] do
-      after = round_trip({obj => 0}, type)
-      assert_equal_times(after.keys.first, expected)
-    end
-  else
-    it "round trips #{label} as a map key", :focus => !!opts[:focus], :pending => opts[:pending] do
-      actual = round_trip({obj => 0}, type, opts)
-      wrapped_expected = {expected => 0}
-      assert { actual == wrapped_expected }
-    end
+  it "round trips #{label} as a map key", :focus => !!opts[:focus], :pending => opts[:pending] do
+    validate(expected, round_trip({obj => 0}, type, opts).keys.first)
   end
 
   it "round trips #{label} as a map value", :focus => !!opts[:focus], :pending => opts[:pending] do
-    case obj
-    when Date, Time, DateTime
-      after = round_trip({:a => obj}, type)
-      assert_equal_times(after.values.first, expected)
-    else
-      actual = round_trip({a: obj}, type, opts)
-      assert { actual == {a: expected} }
-    end
+    validate(expected, round_trip({a: obj}, type, opts).values.first)
   end
 
   it "round trips #{label} as an array value", :focus => !!opts[:focus], :pending => opts[:pending] do
-    case obj
-    when Date, Time, DateTime
-      after = round_trip([obj], type)
-      assert_equal_times(after.first, expected)
-    else
-      actual = round_trip([obj], type, opts)
-      assert { actual == [expected] }
-    end
+    validate(expected, round_trip([obj], type, opts).first)
   end
 end
 
@@ -118,6 +107,9 @@ module Transit
     round_trips("a big int", 123456789012345, type)
     round_trips("a very big int", 123456789012345679012345678890, type)
     round_trips("a float", 1234.56, type)
+    round_trips("NaN", Float::NAN, type)
+    round_trips("Infinity", Float::INFINITY, type)
+    round_trips("-Infinity", -Float::INFINITY, type)
     round_trips("a bigdec", BigDecimal.new("123.45"), type)
     round_trips("an instant (DateTime local)", DateTime.new(2014,1,2,3,4,5, "-5"), type,
                 :expected => DateTime.new(2014,1,2, (3+5) ,4,5, "+00:00"))
@@ -163,6 +155,7 @@ module Transit
     round_trips("a nested structure (map on top)", {a: [1, [{b: "~c"}]]}, type)
     round_trips("a nested structure (array on top)", [37, {a: [1, [{b: "~c"}]]}], type)
     round_trips("a map that looks like transit data", [{"~#set"=>[1,2,3]},{"~#set"=>[4,5,6]}], type)
+    round_trips("a ratio of big value", [{"~#ratio"=>["~n36893488147419103231","~n73786976294838206463"]}], type)
   end
 
   describe "Transit using json" do

data/spec/transit/writer_spec.rb

@@ -46,7 +46,16 @@ module Transit
       marshals_scalar("a Fixnum", 9007199254740999, "~i9007199254740999")
       marshals_scalar("a Bignum", 9223372036854775806, "~i9223372036854775806")
       marshals_scalar("a Very Bignum", 4256768765123454321897654321234567, "~n4256768765123454321897654321234567")
-      marshals_scalar("a ByteArray", ByteArray.new(bytes), "~b#{ByteArray.new(bytes).to_base64}")
+      # Ruby's base64 encoding adds line feed in every 60 encoded
+      # characters, while Java,
+      # org.apache.commons.codec.binary.Base64, doesn't add any. Java
+      # method has option to add line feed, but every 76 characters.
+      # this divergence may be inevitable
+      if Transit::jruby?
+        marshals_scalar("a ByteArray", ByteArray.new(bytes), "~b#{ByteArray.new(bytes).to_base64}".gsub(/\n/, ""))
+      else
+        marshals_scalar("a ByteArray", ByteArray.new(bytes), "~b#{ByteArray.new(bytes).to_base64}")
+      end
       marshals_scalar("an URI", Addressable::URI.parse("http://example.com/search"), "~rhttp://example.com/search")
       marshals_structure("a link",
                          Link.new(Addressable::URI.parse("http://example.com/search"), "search", nil, "link", nil),
@@ -57,6 +66,8 @@ module Transit
                              "render" => "link",
                              "prompt" => nil}})
       marshals_structure("a TaggedValue", TaggedValue.new("tag", "value"), {"~#tag" => "value"})
+      marshals_structure("a ratio by Rational class", Rational(1, 3), {"~#ratio" => [1, 3]})
+      marshals_structure("a Rational with big number", Rational(4953778853208128465, 636801457410081246), {"~#ratio" => ["~i4953778853208128465", "~i636801457410081246"]})
     end
 
     describe "custom handlers" do
@@ -65,7 +76,13 @@ module Transit
           def tag(_) nil end
         end
         writer = Writer.new(:json_verbose, io, :handlers => {Date => handler.new})
-        assert { rescuing { writer.write(Date.today) }.message =~ /must provide a non-nil tag/ }
+        # transit-java returns the error message "Not supported:
+        # 2014-08-20". JRuby tests the error will be raised
+        if Transit::jruby?
+          assert { rescuing { writer.write(Date.today) }.is_a?(RuntimeError) }
+        else
+          assert { rescuing { writer.write(Date.today) }.message =~ /must provide a non-nil tag/ }
+        end
       end
 
       it "supports custom handlers for core types" do
@@ -204,17 +221,19 @@ module Transit
       describe "MESSAGE_PACK" do
         let(:writer) { Writer.new(:msgpack, io) }
 
-        it "writes a single-char tagged-value as a 2-element array" do
+        # JRuby skips these 3 examples since they use raw massage pack
+        # api. Also, JRuby doesn't hava good counterpart.
+        it "writes a single-char tagged-value as a 2-element array", :jruby => Transit::jruby? do
           writer.write(TaggedValue.new("a","bc"))
           assert { MessagePack::Unpacker.new(StringIO.new(io.string)).read == ["~#'", "~abc"] }
         end
 
-        it "writes a multi-char tagged-value as a 2-element array" do
+        it "writes a multi-char tagged-value as a 2-element array", :jruby => Transit::jruby? do
           writer.write(TaggedValue.new("abc","def"))
           assert { MessagePack::Unpacker.new(StringIO.new(io.string)).read == ["~#abc", "def"] }
         end
 
-        it "writes a top-level scalar as a quote-tagged value" do
+        it "writes a top-level scalar as a quote-tagged value", :jruby => Transit::jruby? do
           writer.write("this")
           assert { MessagePack::Unpacker.new(StringIO.new(io.string)).read == ["~#'", "this"] }
         end
@@ -269,7 +288,14 @@ module Transit
         it 'raises when there is no handler for the type' do
           type = Class.new
           obj = type.new
-          assert { rescuing { writer.write(obj) }.message =~ /Can not find a Write Handler/ }
+          # transit-java returns the error message "Not supported:
+          # #<#<Class:0x12d40609>:0x76437e9b>". JRuby tests error will
+          # be raised.
+          if Transit::jruby?
+            assert { rescuing { writer.write(obj) }.is_a?(RuntimeError) }
+          else
+            assert { rescuing { writer.write(obj) }.message =~ /Can not find a Write Handler/ }
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transit-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.467
+  version: 0.8.539
 platform: ruby
 authors:
 - Russ Olsen
@@ -33,28 +33,22 @@ cert_chain:
   jTUiQ3C5kyy08BEMP/x+MtvWcT2dmub6YZ7uYGfNsYcuGKXLIs5Ew95ebzWGJ16M
   PSs4XGS0
   -----END CERTIFICATE-----
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.6
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 2.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.6
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 2.10.1
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -62,9 +56,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.8
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,29 +63,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.8
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.8
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.9.9
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.9.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.9.9
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.9.9
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -102,9 +70,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7.4
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,9 +77,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7.4
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.7.4
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -122,9 +84,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,9 +91,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: yard-redcarpet-ext
   requirement: !ruby/object:Gem::Requirement
@@ -142,9 +98,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -152,9 +105,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
-    - - ">="
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 2.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -190,9 +154,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -200,9 +161,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
 description: Transit marshalling for Ruby
 email:
 - russ@cognitect.com
@@ -219,10 +177,15 @@ files:
 - lib/transit.rb
 - lib/transit/date_time_util.rb
 - lib/transit/decoder.rb
+- lib/transit/marshaler/base.rb
+- lib/transit/marshaler/cruby/json.rb
+- lib/transit/marshaler/cruby/messagepack.rb
 - lib/transit/read_handlers.rb
 - lib/transit/reader.rb
 - lib/transit/rolling_cache.rb
 - lib/transit/transit_types.rb
+- lib/transit/unmarshaler/cruby/json.rb
+- lib/transit/unmarshaler/cruby/messagepack.rb
 - lib/transit/write_handlers.rb
 - lib/transit/writer.rb
 - spec/spec_helper.rb

metadata.gz.sig

@@ -1 +1,3 @@
-7=*KB)�?ɇ�c��|_;'�/�]rDy�u�7��@"�S��|O��֭G�+�'�f�O�\��:���fK��p0>��s
��k5��G*3&����mMT`�V
�g�Tiv�`^%�������k�[�,�&��@_��^��]o��
+�Rą#U�2�V�=c.�w
+�[5O3�,��MqK��Q}���׊�Ni
ТU)I����HW�&|5����<�����n�91g>K�H��Z��Q�4H�,\��a�ʹz(h���tR�`'��P�m�V�]����m�RU/��n ����x7�p��U��1�qS�v LW��I����
+�h&?y~}����M6���
c�����)