jruby-scala-collections 0.1.2 → 0.1.3

data/lib/jruby/scala_support.rb

@@ -46,7 +46,7 @@ module JRuby::ScalaSupport
       @raw
     end
 
-    def blank?
+    def empty?
       @raw.isEmpty
     end
 
@@ -68,6 +68,10 @@ module JRuby::ScalaSupport
         end
       end
 
+      def keys
+        @raw.keys.toSeq.from_scala
+      end
+
       def has_key?(key)
         @raw.contains(key)
       end
@@ -264,7 +268,7 @@ module JRuby::ScalaSupport
       @size
     end
 
-    def blank?
+    def empty?
       false
     end
 
@@ -291,11 +295,11 @@ module JRuby::ScalaSupport
 
     def [](index)
       if index < 0
-        @raw.send("_#{size + index + 1}")
+        @raw.send("_#{size + index + 1}").from_scala
       elsif index >= size
         nil
       else
-        @raw.send("_#{index + 1}")
+        @raw.send("_#{index + 1}").from_scala
       end
     end
 
@@ -341,7 +345,14 @@ class Object
     when Java::scala.collection.Seq, Java::scala.collection.immutable.Seq
       JRuby::ScalaSupport::Seq::Immutable.new(self)
     when Java::scala.Product
-      match = self.class.to_s.match(/^Java::Scala::Tuple(\d+)$/)
+      # Sometimes tuples have some wraping classes, like "#<Class:...>" on top
+      # of them. Some magic is needed to find actual tuple name.
+      match = nil
+      self.class.ancestors.find do |klass|
+        match = klass.to_s.match(/^Java::Scala::Tuple(\d+)$/)
+        ! match.nil?
+      end
+
       if match
         size = match[1].to_i
         JRuby::ScalaSupport::Tuple.new(self, size)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-scala-collections
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors: