Implement String#squeeze

opal · Dec 3, 2013 · e6c944e · e6c944e
1 parent dc98d0c
commit e6c944e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 0 deletions.
diff --git a/opal/corelib/string.rb b/opal/corelib/string.rb
@@ -661,6 +661,28 @@ def split(pattern = $; || ' ', limit = undefined)
     }
   end
 
+  def squeeze(*sets)
+    %x{
+      if (sets.length === 0) {
+        return self.replace(/(.)\\1+/g, '$1');
+      }
+    }
+
+    %x{
+      var set = #{Opal.coerce_to(`sets[0]`, String, :to_str).chars};
+
+      for (var i = 1, length = sets.length; i < length; i++) {
+        set = #{`set` & Opal.coerce_to(`sets[i]`, String, :to_str).chars};
+      }
+
+      if (set.length === 0) {
+        return self;
+      }
+
+      return self.replace(new RegExp("([" + #{Regexp.escape(`set`.join)} + "])\\\\1+", "g"), "$1");
+    }
+  end
+
   def start_with?(*prefixes)
     %x{
       for (var i = 0, length = prefixes.length; i < length; i++) {

diff --git a/spec/opal/filters/bugs/string.rb b/spec/opal/filters/bugs/string.rb
@@ -182,6 +182,10 @@
   fails "String#split with Regexp returns subclass instances based on self"
   fails "String#split with Regexp does not call constructor on created subclass instances"
 
+  fails "String#squeeze negates sets starting with ^"
+  fails "String#squeeze squeezes all chars in a sequence"
+  fails "String#squeeze raises an ArgumentError when the parameter is out of sequence"
+
   fails "String#start_with? ignores arguments not convertible to string"
   fails "String#start_with? converts its argument using :to_str"
 

diff --git a/spec/opal/filters/unsupported/immutable_strings.rb b/spec/opal/filters/unsupported/immutable_strings.rb
@@ -136,6 +136,11 @@
   fails "String#slice! with String returns a subclass instance when given a subclass instance"
   fails "String#slice! with String raises a RuntimeError if self is frozen"
 
+  fails "String#squeeze! modifies self in place and returns self"
+  fails "String#squeeze! returns nil if no modifications were made"
+  fails "String#squeeze! raises an ArgumentError when the parameter is out of sequence"
+  fails "String#squeeze! raises a RuntimeError when self is frozen"
+
   fails "String#strip! modifies self in place and returns self"
   fails "String#strip! returns nil if no modifications where made"
   fails "String#strip! modifies self removing trailing NULL bytes and whitespace"

diff --git a/spec/opal/filters/unsupported/string_subclasses.rb b/spec/opal/filters/unsupported/string_subclasses.rb
@@ -17,6 +17,7 @@
   fails "String#ljust with length, padding returns subclass instances when called on subclasses"
   fails "String#next returns subclass instances when called on a subclass"
   fails "String#rjust with length, padding returns subclass instances when called on subclasses"
+  fails "String#squeeze returns subclass instances when called on a subclass"
   fails "String#sub with pattern, replacement returns subclass instances when called on a subclass"
   fails "String#succ returns subclass instances when called on a subclass"
   fails "String#tr returns subclass instances when called on a subclass"

diff --git a/spec/opal/filters/unsupported/tainted.rb b/spec/opal/filters/unsupported/tainted.rb
@@ -119,6 +119,8 @@
   fails "String#split with Regexp taints an empty string if self is tainted"
   fails "String#split with Regexp doesn't taints the resulting strings if the Regexp is tainted"
 
+  fails "String#squeeze taints the result when self is tainted"
+
   fails "String#strip taints the result when self is tainted"
 
   fails "String#swapcase taints resulting string when self is tainted"

diff --git a/spec/opal/rubyspecs b/spec/opal/rubyspecs
@@ -298,6 +298,7 @@ core/string/rstrip_spec
 core/string/size_spec
 #core/string/slice_spec - fails to find a shared thing
 core/string/split_spec
+core/string/squeeze_spec
 core/string/start_with_spec
 core/string/strip_spec
 core/string/sub_spec