rubyfox-sfsobject 0.7.0-java → 0.8.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 951a3ae2c4685874984d864d8180e718aaafd244bb86568ad4559e98462e88f3
-  data.tar.gz: 440f5a23113e6b4e97293b6f918021fe8c5de6d48be8bb69e38cc18fed66e652
+  metadata.gz: 9cbc395e880b6c8a4b07636b49e7266169200db71ce46d8b27f83324c03af15d
+  data.tar.gz: 17d13b29741f0448e2e2a261a48d68cfd9fe84b7db69f3a68d211dbfcc554194
 SHA512:
-  metadata.gz: 80c53e96107964aa455c2524fe3f1f943481d8c593feaaa387a09f039cca807e13613d8f254c4084ac970290468c80b9c05897be7c65162478173c0ddf566884
-  data.tar.gz: 9270e00d175de0b25dfcba579b724d5fe823429113438ae5d424ac9fef2e2c86be5a2c2e3e77e5ee77ebe1fb98411355fdf9ca5374b37bb7811c8068043b4334
+  metadata.gz: 366d114a0955eb824bc1aaf9531689db1652b5f1e4810a8fa09d1c2be29bb9bfb317731e3dfcf575506254d7cd1ca478482213a94a8fd880314a65fb1192b1e3
+  data.tar.gz: 53252d8adcf99713d9bb2d17ee8259df89dcaf2de339f6accfe40350edf5ab05a0b3cb4629cb3849747246759cd8884d10c1dfc1cb8cb473f9b1d57db337ada7

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - jruby-9.1.13.0
+  - jruby-9.2.0.0
+  - jruby-9.1.17.0
   - jruby-1.7.27
 env:
   global:

data/README.md

@@ -20,7 +20,7 @@ Converts between SmartFox's SFSObjects and Ruby Hashes.
 
 Add this line to your application's Gemfile:
 
-    gem 'rubyfox-sfsobject', '~> 0.7.0'
+    gem 'rubyfox-sfsobject', '~> 0.8.0'
 
 And then execute:
 
@@ -28,7 +28,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install rubyfox-sfsobject -v 0.7.0
+    $ gem install rubyfox-sfsobject -v 0.8.0
 
 ## Usage
 

data/lib/rubyfox/sfsobject/bulk.rb

@@ -1,4 +1,4 @@
-require 'rubyfox/sfsobject/java'
+require "rubyfox/sfsobject/java"
 
 module Rubyfox
   module SFSObject
@@ -6,24 +6,24 @@ module Rubyfox
       extend self
 
       TO_SFS = {
-        NilClass      =>  proc { |o, k, _| o.putNull(k) },
-        String        =>  :putUtfString,
-        TrueClass     =>  :putBool,
-        FalseClass    =>  :putBool,
-        Fixnum        =>  :putInt,
-        Float         =>  :putDouble,
-        Hash          =>  proc { |o, k, v| o.putSFSObject(k, to_sfs(v)) },
+        NilClass => proc { |o, k, _| o.putNull(k) },
+        String => :putUtfString,
+        TrueClass => :putBool,
+        FalseClass => :putBool,
+        Integer => :putInt,
+        Float => :putDouble,
+        Hash => proc { |o, k, v| o.putSFSObject(k, to_sfs(v)) },
         Java::SFSObject => :putSFSObject,
-        [String]      =>  :putUtfStringArray,
-        [TrueClass]   =>  :putBoolArray,
-        [FalseClass]  =>  :putBoolArray,
-        [Fixnum]      =>  proc do |o, k, v|
+        [String] => :putUtfStringArray,
+        [TrueClass] => :putBoolArray,
+        [FalseClass] => :putBoolArray,
+        [Integer] => proc do |o, k, v|
           collection = Java::ArrayList.new
           v.each { |e| collection.add(e.to_java(:int)) }
           o.putIntArray(k, collection)
         end,
-        [Float]       =>  :putDoubleArray,
-        [Hash]        =>  proc do |o, k, v|
+        [Float] => :putDoubleArray,
+        [Hash] => proc do |o, k, v|
           ary = Java::SFSArray.new
           v.each { |e| ary.addSFSObject(to_sfs(e)) }
           o.putSFSArray(k, ary)
@@ -32,29 +32,29 @@ module Rubyfox
           ary = Java::SFSArray.new
           v.each { |e| ary.addSFSObject(e) }
           o.putSFSArray(k, ary)
-        end
+        end,
       }
 
       TO_HASH = {
-        "NULL"              =>  proc { |k, v| nil },
-        "UTF_STRING"        =>  :getUtfString,
-        "BOOL"              =>  :getBool,
-        "INT"               =>  :getInt,
-        "DOUBLE"            =>  :getDouble,
-        "FLOAT"             =>  :getFloat,
-        "UTF_STRING_ARRAY"  =>  :getUtfStringArray,
-        "BOOL_ARRAY"        =>  :getBoolArray,
+        "NULL" => proc { |k, v| nil },
+        "UTF_STRING" => :getUtfString,
+        "BOOL" => :getBool,
+        "INT" => :getInt,
+        "DOUBLE" => :getDouble,
+        "FLOAT" => :getFloat,
+        "UTF_STRING_ARRAY" => :getUtfStringArray,
+        "BOOL_ARRAY" => :getBoolArray,
         #"INT_ARRAY"         =>  :getIntArray,
-        "INT_ARRAY"         =>  proc { |k, v| v.object.to_a },
-        "LONG_ARRAY"        =>  :getLongArray,
-        "DOUBLE_ARRAY"      =>  :getDoubleArray,
-        "FLOAT_ARRAY"      =>   :getFloatArray,
-        "SFS_OBJECT"        =>  proc { |k, v| to_hash(v.object) },
-        "SFS_ARRAY"         =>  proc { |k, v| to_array(v.object) }
+        "INT_ARRAY" => proc { |k, v| v.object.to_a },
+        "LONG_ARRAY" => :getLongArray,
+        "DOUBLE_ARRAY" => :getDoubleArray,
+        "FLOAT_ARRAY" => :getFloatArray,
+        "SFS_OBJECT" => proc { |k, v| to_hash(v.object) },
+        "SFS_ARRAY" => proc { |k, v| to_array(v.object) },
       }
 
       # hash -> object
-      def to_sfs(hash={})
+      def to_sfs(hash = {})
         object = Java::SFSObject.new
         hash.each do |key, value|
           wrap_value!(object, key, value)
@@ -78,7 +78,14 @@ module Rubyfox
       def _wrapper(value)
         case value
         when Array
-          TO_SFS[[value.first.class]]
+          case value = value.first
+          when Integer # This is necessary to support ruby < 2.4.
+            TO_SFS[[Integer]]
+          else
+            TO_SFS[[value.class]]
+          end
+        when Integer # See above.
+          TO_SFS[Integer]
         else
           TO_SFS[value.class]
         end

data/lib/rubyfox/sfsobject/schema.rb

@@ -17,12 +17,12 @@ module Rubyfox
       TO_SFS = {
         String    => proc { |o, s, k, v| o.put_utf_string(k, v) },
         Boolean   => proc { |o, s, k, v| o.put_bool(k, v) },
-        Fixnum    => proc { |o, s, k, v| o.put_int(k, v) },
+        Integer   => proc { |o, s, k, v| o.put_int(k, v) },
         Float     => proc { |o, s, k, v| o.put_double(k, v) },
         Hash      => proc { |o, s, k, v| o.put_sfs_object(k, to_sfs(s, v)) },
         [String]  => proc { |o, s, k, v| o.put_utf_string_array(k, v) },
         [Boolean] => proc { |o, s, k, v| o.put_bool_array(k, v) },
-        [Fixnum]  =>  proc do |o, s, k, v|
+        [Integer] =>  proc do |o, s, k, v|
           collection = Java::ArrayList.new(v.size)
           v.each { |e| collection.add(e.to_java(:int)) }
           o.put_int_array(k, collection)
@@ -39,12 +39,12 @@ module Rubyfox
       TO_HASH = {
         String    => proc { |o, s, k| o.get_utf_string(k) },
         Boolean   => proc { |o, s, k| o.get_bool(k) },
-        Fixnum    => proc { |o, s, k| o.get_int(k) },
+        Integer   => proc { |o, s, k| o.get_int(k) },
         Float     => proc { |o, s, k| o.get_double(k) },
         Hash      => proc { |o, s, k| to_hash(s, o.get_sfs_object(k)) },
         [String]  => proc { |o, s, k| o.get_utf_string_array(k).to_a },
         [Boolean] => proc { |o, s, k| o.get_bool_array(k).to_a },
-        [Fixnum]  => proc { |o, s, k| o.get_int_array(k).to_a },
+        [Integer] => proc { |o, s, k| o.get_int_array(k).to_a },
         [Float]   => proc { |o, s, k| o.get_double_array(k).to_a },
         [Hash]    => proc { |o, s, k|
           sfs_ary = o.get_sfs_array(k)

data/lib/rubyfox/sfsobject/version.rb

@@ -1,5 +1,5 @@
 module Rubyfox
   module SFSObject
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/test/rubyfox/sfsobject/accessor_test.rb

@@ -18,9 +18,9 @@ class RubyfoxSFSObjectAccessorTest < RubyfoxCase
 
   context "SFSObject[]" do
     test "sets hash" do
-      object = Rubyfox::SFSObject[:string => "value", :sub => { :fixnum => 23 }]
+      object = Rubyfox::SFSObject[:string => "value", :sub => { :integer => 23 }]
       assert_equal "value", object[:string]
-      assert_equal 23, object[:sub][:fixnum]
+      assert_equal 23, object[:sub][:integer]
     end
   end
 
@@ -51,21 +51,21 @@ class RubyfoxSFSObjectAccessorTest < RubyfoxCase
       assert_accessor :true => true, :false => false
     end
 
-    test "fixnum" do
-      assert_accessor :fixnum => 1
-      assert_accessor :fixnum => (2 ** 31 - 1)
-      assert_accessor :fixnum => -(2 ** 31)
+    test "integer" do
+      assert_accessor :integer => 1
+      assert_accessor :integer => (2 ** 31 - 1)
+      assert_accessor :integer => -(2 ** 31)
     end
 
-    test "fixnum too big for int" do
+    test "integer too big for int" do
       assert_raises RangeError, :message => /too big for int/ do
-        assert_accessor :fixnum => (2 ** 31)
+        assert_accessor :integer => (2 ** 31)
       end
     end
 
     test "cannot handle bignum" do
-      assert_raises ArgumentError, :message => /Bignum/ do
-        assert_accessor :fixnum => (2 ** 63)
+      assert_raises RangeError, :message => /bignum too big/ do
+        assert_accessor :integer => (2 ** 63)
       end
     end
 
@@ -92,8 +92,8 @@ class RubyfoxSFSObjectAccessorTest < RubyfoxCase
       assert_accessor :bool => [ true, false ]
     end
 
-    test "fixnum" do
-      assert_accessor :fixnum => [ 1, 2, 3 ]
+    test "integer" do
+      assert_accessor :integer => [ 1, 2, 3 ]
     end
 
     test "float" do

data/test/rubyfox/sfsobject/bulk_test.rb

@@ -1,7 +1,7 @@
-# encoding: utf-8 
+# encoding: utf-8
 
-require 'helper'
-require 'rubyfox/sfsobject/bulk'
+require "helper"
+require "rubyfox/sfsobject/bulk"
 
 class RubyfoxSFSObjectBulkTest < RubyfoxCase
   test "empty" do
@@ -9,7 +9,7 @@ class RubyfoxSFSObjectBulkTest < RubyfoxCase
   end
 
   test "converts keys to symbols" do
-    assert_conversion({ "key" => nil }, { :key => nil })
+    assert_conversion({"key" => nil}, {:key => nil})
   end
 
   test "raise ArgumentError for nil values" do
@@ -33,21 +33,21 @@ class RubyfoxSFSObjectBulkTest < RubyfoxCase
       assert_conversion :true => true, :false => false
     end
 
-    test "fixnum" do
-      assert_conversion :fixnum => 1
-      assert_conversion :fixnum => (2 ** 31 - 1)
-      assert_conversion :fixnum => -(2 ** 31)
+    test "integer" do
+      assert_conversion :integer => 1
+      assert_conversion :integer => (2 ** 31 - 1)
+      assert_conversion :integer => -(2 ** 31)
     end
 
-    test "fixnum too big for int" do
+    test "integer too big for int" do
       assert_raises RangeError, :message => /too big for int/ do
-        assert_conversion :fixnum => (2 ** 31)
+        assert_conversion :integer => (2 ** 31)
       end
     end
 
     test "cannot handle bignum" do
-      assert_raises ArgumentError, :message => /Bignum/ do
-        assert_conversion :fixnum => (2 ** 63)
+      assert_raises RangeError, :message => /bignum too big/ do
+        assert_conversion :integer => (2 ** 63)
       end
     end
 
@@ -73,12 +73,12 @@ class RubyfoxSFSObjectBulkTest < RubyfoxCase
     end
 
     test "sub hashes" do
-      assert_conversion :sub => { :key => "value" }
-      assert_conversion :sub => { :deep => { :key => "value" } }
+      assert_conversion :sub => {:key => "value"}
+      assert_conversion :sub => {:deep => {:key => "value"}}
     end
 
     test "sfsobject" do
-      assert_conversion({ :sfsobject => Rubyfox::SFSObject.new }, { :sfsobject => {} })
+      assert_conversion({:sfsobject => Rubyfox::SFSObject.new}, {:sfsobject => {}})
     end
   end
 
@@ -91,15 +91,15 @@ class RubyfoxSFSObjectBulkTest < RubyfoxCase
     end
 
     test "boolean" do
-      assert_conversion :bool => [ true, false ]
+      assert_conversion :bool => [true, false]
     end
 
-    test "fixnum" do
-      assert_conversion :fixnum => [ 1, 2, 3 ]
+    test "integer" do
+      assert_conversion :integer => [1, 2, 3]
     end
 
     test "float" do
-      assert_conversion :float => [ 1.0, 1.0 / 3 ]
+      assert_conversion :float => [1.0, 1.0 / 3]
     end
 
     test "converts Java's double array to Ruby's Float array" do
@@ -119,12 +119,12 @@ class RubyfoxSFSObjectBulkTest < RubyfoxCase
     end
 
     test "sub hashes" do
-      assert_conversion :sub => [{ :key => "value" }]
-      assert_conversion :sub => [{ :deep => [{ :key => "value" }] }]
+      assert_conversion :sub => [{:key => "value"}]
+      assert_conversion :sub => [{:deep => [{:key => "value"}]}]
     end
 
     test "sfsobject" do
-      assert_conversion({ :sfsobject => [Rubyfox::SFSObject.new]}, { :sfsobject => [{}] })
+      assert_conversion({:sfsobject => [Rubyfox::SFSObject.new]}, {:sfsobject => [{}]})
     end
 
     test "loads mixed arrays" do
@@ -137,7 +137,7 @@ class RubyfoxSFSObjectBulkTest < RubyfoxCase
         }
       ]}')
       expected = {
-       :mixed => ["foo", true, 1.0, {:deep => ["Föhn", "BÄR"]}]
+        :mixed => ["foo", true, 1.0, {:deep => ["Föhn", "BÄR"]}],
       }
       assert_equal expected, Rubyfox::SFSObject::Bulk.to_hash(object)
     end
@@ -145,7 +145,7 @@ class RubyfoxSFSObjectBulkTest < RubyfoxCase
 
   private
 
-  def assert_conversion(input, output=input)
+  def assert_conversion(input, output = input)
     object = Rubyfox::SFSObject::Bulk.to_sfs(input)
     assert_equal output, Rubyfox::SFSObject::Bulk.to_hash(object)
   end

data/test/rubyfox/sfsobject/schema_test.rb

@@ -26,15 +26,15 @@ class RubyfoxSFSObjectSchemaTest < RubyfoxCase
       assert_schema({ :bool => Boolean }, { :bool => false })
     end
 
-    test "fixnum" do
-      assert_schema({ :fixnum => Fixnum }, { :fixnum => 1 })
-      assert_schema({ :fixnum => Fixnum }, { :fixnum => (2 ** 31 - 1) })
-      assert_schema({ :fixnum => Fixnum }, { :fixnum => -(2 ** 31) })
+    test "integer" do
+      assert_schema({ :integer => Integer }, { :integer => 1 })
+      assert_schema({ :integer => Integer }, { :integer => (2 ** 31 - 1) })
+      assert_schema({ :integer => Integer }, { :integer => -(2 ** 31) })
     end
 
-    test "fixnum too big for int" do
+    test "integer too big for int" do
       assert_raises RangeError, :message => /too big for int/ do
-        assert_schema({ :fixnum => Fixnum }, { :fixnum => (2 ** 31) })
+        assert_schema({ :integer => Integer }, { :integer => (2 ** 31) })
       end
     end
 
@@ -69,9 +69,9 @@ class RubyfoxSFSObjectSchemaTest < RubyfoxCase
       assert_schema({ :bool => [Boolean] }, { :bool => [true, 23] }) # strange?
     end
 
-    test "fixnum" do
-      assert_schema({ :fixnum => [Fixnum] }, { :fixnum => [1, 2] })
-      assert_schema({ :fixnum => [Fixnum] }, { :fixnum => [(2 ** 31 - 1), -(2 ** 31)] })
+    test "integer" do
+      assert_schema({ :integer => [Integer] }, { :integer => [1, 2] })
+      assert_schema({ :integer => [Integer] }, { :integer => [(2 ** 31 - 1), -(2 ** 31)] })
     end
 
     test "float" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyfox-sfsobject
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: java
 authors:
 - Peter Suschlik
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: ''