opal · Oct 31, 2014 · Oct 31, 2014
Showing with 5 additions and 3 deletions.

+1 −1 opal.gemspec

+4 −0 opal/corelib/hash.rb

+0 −2 spec/filters/bugs/hash.rb
diff --git a/opal.gemspec b/opal.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   required_ruby_version = '>= 1.9.3'
 
   s.add_dependency 'sourcemap', '~> 0.1.0'
-  s.add_dependency 'sprockets', '>= 2.2.1', '< 4.0.0'
+  s.add_dependency 'sprockets', '>= 2.2.3', '< 4.0.0'
   s.add_dependency 'hike', '~> 1.2'
   s.add_dependency 'tilt', '~> 1.4'
 

diff --git a/opal/corelib/hash.rb b/opal/corelib/hash.rb
@@ -695,6 +695,10 @@ def to_a
 
   def to_h
     %x{
+      if (self.$$class === Opal.Hash) {
+        return self
+      }
+
       var hash   = new Opal.Hash.$$alloc,
           cloned = #{clone};
 

diff --git a/spec/filters/bugs/hash.rb b/spec/filters/bugs/hash.rb
@@ -99,8 +99,6 @@
   fails "Hash#sort works when some of the keys are themselves arrays"
   fails "Hash#sort uses block to sort array if passed a block"
 
-  fails "Hash#to_h returns self for Hash instances"
-
   fails "Hash.try_convert does not rescue exceptions raised by #to_hash"
   fails "Hash.try_convert sends #to_hash to the argument and raises TypeError if it's not a kind of Hash"
   fails "Hash.try_convert sends #to_hash to the argument and returns the result if it's a kind of Hash"