jruby-scala-collections 0.1.3 → 0.1.4

data/README.md

@@ -14,8 +14,7 @@ With bundler:
 ```gem "jruby-scala-collections", ">=0.1.1", require: "jruby/scala_support"```
 
 Beware that you have to have ```scala-library.jar``` loaded before you 
-load ```jruby/scala_support```. In Rails this generally means it loading in
-```config/boot.rb```.
+load ```jruby/scala_support```. In Rails this generally means it loading in ```config/boot.rb```.
 
 ## How do you use it?
 
@@ -64,5 +63,17 @@ methods:
 ## Disclaimer
 
 This library was written by Artūras 'arturaz' Šlajus for personal
-usage. ```#to_scala``` should work pretty well, however Ruby wrappers 
+usage.
+
+## Contributing
+```#to_scala``` should work pretty well, however Ruby wrappers
 in ```#from_scala``` may be missing methods. Patches are welcome.
+jruby-scala-collections uses rubyspec and mspec to test that the behaviour
+of the Ruby wrappers is correct.
+Currently only a part of those tests pass. You can contribute by grabbing
+any of the tests marked as `fails` in `rubyspec/tags/**/*_tags.txt`, marking it as
+`focus` and implement the needed behaviour.
+Guard is configured so that `bundle exec guard` runs all tests that have the focus tag.
+If you want to run all tests that should be working, use `bundle exec mspec -G fails rubyspec`.
+If you have implemented functionality, run `bundle exec mspec tag rubyspec` to update the list
+of failing tests and check with a `git diff` that you haven't broken other functionality.

data/lib/jruby/scala_support.rb

@@ -69,13 +69,32 @@ module JRuby::ScalaSupport
       end
 
       def keys
-        @raw.keys.toSeq.from_scala
+        @raw.keys.toSeq.from_scala.to_a
       end
 
+      def values
+        @raw.values.toSeq.from_scala.to_a
+      end
+
+      def value?(v)
+        values.include?(v)
+      end
+
+      alias_method :has_value?, :value?
+
       def has_key?(key)
         @raw.contains(key)
       end
 
+      alias_method :key?, :has_key?
+      alias_method :member?, :has_key?
+      alias_method :include?, :has_key?
+
+      def key(val)
+        kv = find {|_,v| v == val }
+        kv && kv.first
+      end
+
       def each
         if block_given?
           @raw.foreach do |tuple|
@@ -93,19 +112,57 @@ module JRuby::ScalaSupport
         end
       end
 
+      alias_method :each_pair, :each
+
       def to_s
         first = true
         each_with_object("{") do |(key, value), str|
           first ? first = false : str << ", "
-          str << "#{key}=>#{value}"
+          str << "#{key.inspect}=>#{value.inspect}"
         end << "}"
       end
 
+      alias_method :inspect, :to_s
+
       def as_json(options=nil)
         each_with_object({}) do |(key, value), hash|
           hash[key.as_json(options)] = value.as_json(options)
         end
       end
+
+      def eql?(other)
+        return true if self.equal? other
+
+        unless other.kind_of? Hash
+          return false unless other.respond_to? :to_hash
+          return other.eql?(self)
+        end
+
+        return false unless other.size == size
+
+        other.each do |k,v|
+
+          return false unless (entry = real_map.send(:findEntry,k)) && (entry.key.from_scala.eql?(k)) && (item = entry.value)
+
+          # Order of the comparison matters! We must compare our value with
+          # the other Hash's value and not the other way around.
+          return false unless item.eql?(v)
+        end
+
+        true
+      end
+
+      alias_method :==, :eql?
+
+      alias_method :length, :size
+
+      private
+      def real_map
+        case @raw
+        when scala.collection.Map::WithDefault then @raw.send(:underlying)
+        else @raw
+        end
+      end
     end
 
     class Immutable
@@ -122,6 +179,49 @@ module JRuby::ScalaSupport
       include Common
       JRuby::ScalaSupport::Common.fake_identity self, Hash
 
+      class << self
+        alias_method :previous_new, :new
+
+        def [](*args)
+          hash = new
+          if args.size == 1
+            obj = args.first
+            case obj
+            when Array, Hash then obj.each {|k,v| hash[k] = v}
+            else
+              raise "Don't yet know what to do with a #{obj.inspect}"
+            end
+            return hash
+          end
+
+          return new if args.empty?
+
+          if args.size & 1 == 1
+            raise ArgumentError, "Expected an even number, got #{args.length}"
+          end
+
+          i = 0
+          total = args.size
+
+          while i < total
+            hash[args[i]] = args[i+1]
+            i += 2
+          end
+
+          hash
+        end
+
+        def new(default_value=nil, &default_block)
+          raise ArgumentError, "You can only provide either a default value or a block" if default_value && default_block
+          h = scala.collection.mutable.HashMap.new
+          if default_block
+            h = h.with_default {|k| default_block.call(h,k) }
+          end
+          h = h.with_default_value(default_value) if default_value
+          previous_new(h)
+        end
+      end
+
       def []=(key, value)
         @raw.update(key, value.to_scala)
       end
@@ -365,6 +465,8 @@ class Object
       JRuby::ScalaSupport::Set::Mutable.new(self)
     when Java::scala.collection.Set, Java::scala.collection.immutable.Set,
       JRuby::ScalaSupport::Set::Immutable.new(self)
+    when Java::scala.Symbol
+      self.name.to_sym
     else
       self
     end

metadata

@@ -1,18 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: jruby-scala-collections
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
+  prerelease:
 platform: ruby
 authors:
 - Artūras Šlajus
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
-dependencies: []
-description: Interoperability layer for passing JRuby & Scala collections back and
-  forth. See README.md for more info.
+date: 2013-08-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: mspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard-rspec-jruby
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard-shell
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+description: Interoperability layer for passing JRuby & Scala collections back and forth. See README.md for more info.
 email: arturas.slajus@gmail.com
 executables: []
 extensions: []
@@ -23,26 +118,26 @@ files:
 - ext/dist/collections.jar
 homepage: http://github.com/arturaz/jruby-scala-collections
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.21
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
-summary: Compiled against JRuby 1.6.7/Scala 2.9.2
+summary: Compiled against JRuby 1.6.7/Scala 2.10.2
 test_files: []