underscore-string-rails 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0fe03c79e0fe827f6c7997ec5b1dc377e4e09eef
+  data.tar.gz: bcee371bbeb18202063243fa762e0357579fa233
+SHA512:
+  metadata.gz: c4a9e608f3ea67c5accf2511dad01fbd5aa940c533401d01a9b1e571cf1b35179a87dfc0aa917e8733a6458c1cd3bfa076fc8330e9c4fe38b8483403a378b9d3
+  data.tar.gz: 0ce1c57b161fa9f241ef373bd1042d477d99067a520d5e103e765a75a32abdaed1cceacd1b9e6e697e74f766cfca0a93b385417dd3246c92f1c9e9c7bfd7930e

data/README.md

@@ -1,6 +1,6 @@
 # underscore-string-rails
 
-This includes the underscore string library in your application
+This includes the [underscore.string](https://github.com/epeli/underscore.string) library in your application
 
 ## Installation
 
@@ -8,9 +8,13 @@ Add this line to your application's Gemfile:
 
     gem 'underscore-string-rails'
 
+Optionally add a dependency on [underscore-rails](https://github.com/rweng/underscore-rails):
+
+    gem 'underscore-rails'
+
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -18,21 +22,11 @@ Or install it yourself as:
 
 ## Usage
 
-Optionally include underscore in your project:
-
-`//= require underscore`
-
-Minified version:
-
-`//= require underscore-min`
-
-In your application.js manifest:
+In any JavaScript file:
 
 `//= require underscore.string`
 
-For minimal compressed version:
-
-`//= require underscore.string.min`
+It will be minified/uglified/etc. as part of the asset pipeline.
 
 ## Contributing
 

data/lib/underscore-string-rails/version.rb

@@ -1,7 +1,7 @@
 module Underscore
   module String
     module Rails
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/underscore-string-rails.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["jaimie@jaimievansanten.nl"]
   gem.description   = %q{This includes the underscore string library in your application}
   gem.summary       = %q{asset pipline javascript underscore rails}
-  gem.homepage      = "https://github.com/jaimie-van-santen/underscore-string-rails"
+  gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/vendor/assets/javascript/underscore.string.js

@@ -1,45 +1,66 @@
-// Underscore.string
-// (c) 2010 Esa-Matti Suuronen <esa-matti aet suuronen dot org>
-// Underscore.strings is freely distributable under the terms of the MIT license.
-// Documentation: https://github.com/epeli/underscore.string
-// Some code is borrowed from MooTools and Alexandru Marasteanu.
-
-// Version 2.0.0
-
-(function(root){
+//  Underscore.string
+//  (c) 2010 Esa-Matti Suuronen <esa-matti aet suuronen dot org>
+//  Underscore.string is freely distributable under the terms of the MIT license.
+//  Documentation: https://github.com/epeli/underscore.string
+//  Some code is borrowed from MooTools and Alexandru Marasteanu.
+//  Version '2.3.3'
+
+!function(root, String){
   'use strict';
 
   // Defining helper functions.
 
   var nativeTrim = String.prototype.trim;
+  var nativeTrimRight = String.prototype.trimRight;
+  var nativeTrimLeft = String.prototype.trimLeft;
 
   var parseNumber = function(source) { return source * 1 || 0; };
 
-  var strRepeat = function(i, m) {
-    for (var o = []; m > 0; o[--m] = i) {}
-    return o.join('');
+  var strRepeat = function(str, qty){
+    if (qty < 1) return '';
+    var result = '';
+    while (qty > 0) {
+      if (qty & 1) result += str;
+      qty >>= 1, str += str;
+    }
+    return result;
   };
 
-  var slice = function(a){
-    return Array.prototype.slice.call(a);
+  var slice = [].slice;
+
+  var defaultToWhiteSpace = function(characters) {
+    if (characters == null)
+      return '\\s';
+    else if (characters.source)
+      return characters.source;
+    else
+      return '[' + _s.escapeRegExp(characters) + ']';
   };
 
-  var defaultToWhiteSpace = function(characters){
-    if (characters) {
-      return _s.escapeRegExp(characters);
+  // Helper for toBoolean
+  function boolMatch(s, matchers) {
+    var i, matcher, down = s.toLowerCase();
+    matchers = [].concat(matchers);
+    for (i = 0; i < matchers.length; i += 1) {
+      matcher = matchers[i];
+      if (!matcher) continue;
+      if (matcher.test && matcher.test(s)) return true;
+      if (matcher.toLowerCase() === down) return true;
     }
-    return '\\s';
-  };
+  }
 
-  var sArgs = function(method){
-    return function(){
-      var args = slice(arguments);
-      for(var i=0; i<args.length; i++)
-        args[i] = args[i] == null ? '' : '' + args[i];
-      return method.apply(null, args);
-    };
+  var escapeChars = {
+    lt: '<',
+    gt: '>',
+    quot: '"',
+    amp: '&',
+    apos: "'"
   };
 
+  var reversedEscapeChars = {};
+  for(var key in escapeChars) reversedEscapeChars[escapeChars[key]] = key;
+  reversedEscapeChars["'"] = '#39';
+
   // sprintf() for JavaScript 0.7-beta1
   // http://www.diveintojavascript.com/projects/javascript-sprintf
   //
@@ -73,7 +94,7 @@
             arg = argv[cursor];
             for (k = 0; k < match[2].length; k++) {
               if (!arg.hasOwnProperty(match[2][k])) {
-                throw(sprintf('[_.sprintf] property "%s" does not exist', match[2][k]));
+                throw new Error(sprintf('[_.sprintf] property "%s" does not exist', match[2][k]));
               }
               arg = arg[match[2][k]];
             }
@@ -85,7 +106,7 @@
           }
 
           if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) {
-            throw(sprintf('[_.sprintf] expecting number but found %s', get_type(arg)));
+            throw new Error(sprintf('[_.sprintf] expecting number but found %s', get_type(arg)));
           }
           switch (match[8]) {
             case 'b': arg = arg.toString(2); break;
@@ -134,12 +155,12 @@
                   field_list.push(field_match[1]);
                 }
                 else {
-                  throw('[_.sprintf] huh?');
+                  throw new Error('[_.sprintf] huh?');
                 }
               }
             }
             else {
-              throw('[_.sprintf] huh?');
+              throw new Error('[_.sprintf] huh?');
             }
             match[2] = field_list;
           }
@@ -147,12 +168,12 @@
             arg_names |= 2;
           }
           if (arg_names === 3) {
-            throw('[_.sprintf] mixing positional and named placeholders is not (yet) supported');
+            throw new Error('[_.sprintf] mixing positional and named placeholders is not (yet) supported');
           }
           parse_tree.push(match);
         }
         else {
-          throw('[_.sprintf] huh?');
+          throw new Error('[_.sprintf] huh?');
         }
         _fmt = _fmt.substring(match[0].length);
       }
@@ -167,226 +188,255 @@
   // Defining underscore.string
 
   var _s = {
-              
-    VERSION: '2.0.0',
 
-    isBlank: sArgs(function(str){
+    VERSION: '2.3.0',
+
+    isBlank: function(str){
+      if (str == null) str = '';
       return (/^\s*$/).test(str);
-    }),
-
-    stripTags: sArgs(function(str){
-      return str.replace(/<\/?[^>]+>/ig, '');
-    }),
-
-    capitalize : sArgs(function(str) {
-      return str.charAt(0).toUpperCase() + str.substring(1).toLowerCase();
-    }),
-
-    chop: sArgs(function(str, step){
-      step = parseNumber(step) || str.length;
-      var arr = [];
-      for (var i = 0; i < str.length;) {
-        arr.push(str.slice(i,i + step));
-        i = i + step;
-      }
-      return arr;
-    }),
-
-    clean: sArgs(function(str){
-      return _s.strip(str.replace(/\s+/g, ' '));
-    }),
-
-    count: sArgs(function(str, substr){
-      var count = 0, index;
-      for (var i=0; i < str.length;) {
-        index = str.indexOf(substr, i);
-        index >= 0 && count++;
-        i = i + (index >= 0 ? index : 0) + substr.length;
+    },
+
+    stripTags: function(str){
+      if (str == null) return '';
+      return String(str).replace(/<\/?[^>]+>/g, '');
+    },
+
+    capitalize : function(str){
+      str = str == null ? '' : String(str);
+      return str.charAt(0).toUpperCase() + str.slice(1);
+    },
+
+    chop: function(str, step){
+      if (str == null) return [];
+      str = String(str);
+      step = ~~step;
+      return step > 0 ? str.match(new RegExp('.{1,' + step + '}', 'g')) : [str];
+    },
+
+    clean: function(str){
+      return _s.strip(str).replace(/\s+/g, ' ');
+    },
+
+    count: function(str, substr){
+      if (str == null || substr == null) return 0;
+
+      str = String(str);
+      substr = String(substr);
+
+      var count = 0,
+        pos = 0,
+        length = substr.length;
+
+      while (true) {
+        pos = str.indexOf(substr, pos);
+        if (pos === -1) break;
+        count++;
+        pos += length;
       }
+
       return count;
-    }),
-
-    chars: sArgs(function(str) {
-      return str.split('');
-    }),
-
-    escapeHTML: sArgs(function(str) {
-      return str.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;')
-                            .replace(/"/g, '&quot;').replace(/'/g, "&apos;");
-    }),
-
-    unescapeHTML: sArgs(function(str) {
-      return str.replace(/&lt;/g, '<').replace(/&gt;/g, '>')
-                            .replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&amp;/g, '&');
-    }),
-
-    escapeRegExp: sArgs(function(str){
-      // From MooTools core 1.2.4
-      return str.replace(/([-.*+?^${}()|[\]\/\\])/g, '\\$1');
-    }),
-
-    insert: sArgs(function(str, i, substr){
-      var arr = str.split('');
-      arr.splice(parseNumber(i), 0, substr);
-      return arr.join('');
-    }),
+    },
 
-    include: sArgs(function(str, needle){
-      return str.indexOf(needle) !== -1;
-    }),
+    chars: function(str) {
+      if (str == null) return [];
+      return String(str).split('');
+    },
 
-    join: sArgs(function(sep) {
-      var args = slice(arguments);
-      return args.join(args.shift());
-    }),
+    swapCase: function(str) {
+      if (str == null) return '';
+      return String(str).replace(/\S/g, function(c){
+        return c === c.toUpperCase() ? c.toLowerCase() : c.toUpperCase();
+      });
+    },
 
-    lines: sArgs(function(str) {
-      return str.split("\n");
-    }),
+    escapeHTML: function(str) {
+      if (str == null) return '';
+      return String(str).replace(/[&<>"']/g, function(m){ return '&' + reversedEscapeChars[m] + ';'; });
+    },
 
-    reverse: sArgs(function(str){
-        return Array.prototype.reverse.apply(String(str).split('')).join('');
-    }),
+    unescapeHTML: function(str) {
+      if (str == null) return '';
+      return String(str).replace(/\&([^;]+);/g, function(entity, entityCode){
+        var match;
+
+        if (entityCode in escapeChars) {
+          return escapeChars[entityCode];
+        } else if (match = entityCode.match(/^#x([\da-fA-F]+)$/)) {
+          return String.fromCharCode(parseInt(match[1], 16));
+        } else if (match = entityCode.match(/^#(\d+)$/)) {
+          return String.fromCharCode(~~match[1]);
+        } else {
+          return entity;
+        }
+      });
+    },
 
-    splice: sArgs(function(str, i, howmany, substr){
-      var arr = str.split('');
-      arr.splice(parseNumber(i), parseNumber(howmany), substr);
+    escapeRegExp: function(str){
+      if (str == null) return '';
+      return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
+    },
+
+    splice: function(str, i, howmany, substr){
+      var arr = _s.chars(str);
+      arr.splice(~~i, ~~howmany, substr);
       return arr.join('');
-    }),
+    },
 
-    startsWith: sArgs(function(str, starts){
-      return str.length >= starts.length && str.substring(0, starts.length) === starts;
-    }),
+    insert: function(str, i, substr){
+      return _s.splice(str, i, 0, substr);
+    },
 
-    endsWith: sArgs(function(str, ends){
-      return str.length >= ends.length && str.substring(str.length - ends.length) === ends;
-    }),
+    include: function(str, needle){
+      if (needle === '') return true;
+      if (str == null) return false;
+      return String(str).indexOf(needle) !== -1;
+    },
 
-    succ: sArgs(function(str){
-      var arr = str.split('');
-      arr.splice(str.length-1, 1, String.fromCharCode(str.charCodeAt(str.length-1) + 1));
-      return arr.join('');
-    }),
-
-    titleize: sArgs(function(str){
-      var arr = str.split(' '),
-          word;
-      for (var i=0; i < arr.length; i++) {
-        word = arr[i].split('');
-        if(typeof word[0] !== 'undefined') word[0] = word[0].toUpperCase();
-        i+1 === arr.length ? arr[i] = word.join('') : arr[i] = word.join('') + ' ';
-      }
-      return arr.join('');
-    }),
+    join: function() {
+      var args = slice.call(arguments),
+        separator = args.shift();
 
-    camelize: sArgs(function(str){
-      return _s.trim(str).replace(/(\-|_|\s)+(.)?/g, function(match, separator, chr) {
-        return chr ? chr.toUpperCase() : '';
-      });
-    }),
+      if (separator == null) separator = '';
+
+      return args.join(separator);
+    },
+
+    lines: function(str) {
+      if (str == null) return [];
+      return String(str).split("\n");
+    },
+
+    reverse: function(str){
+      return _s.chars(str).reverse().join('');
+    },
+
+    startsWith: function(str, starts){
+      if (starts === '') return true;
+      if (str == null || starts == null) return false;
+      str = String(str); starts = String(starts);
+      return str.length >= starts.length && str.slice(0, starts.length) === starts;
+    },
+
+    endsWith: function(str, ends){
+      if (ends === '') return true;
+      if (str == null || ends == null) return false;
+      str = String(str); ends = String(ends);
+      return str.length >= ends.length && str.slice(str.length - ends.length) === ends;
+    },
+
+    succ: function(str){
+      if (str == null) return '';
+      str = String(str);
+      return str.slice(0, -1) + String.fromCharCode(str.charCodeAt(str.length-1) + 1);
+    },
+
+    titleize: function(str){
+      if (str == null) return '';
+      str  = String(str).toLowerCase();
+      return str.replace(/(?:^|\s|-)\S/g, function(c){ return c.toUpperCase(); });
+    },
+
+    camelize: function(str){
+      return _s.trim(str).replace(/[-_\s]+(.)?/g, function(match, c){ return c ? c.toUpperCase() : ""; });
+    },
 
     underscored: function(str){
-      return _s.trim(str).replace(/([a-z\d])([A-Z]+)/g, '$1_$2').replace(/\-|\s+/g, '_').toLowerCase();
+      return _s.trim(str).replace(/([a-z\d])([A-Z]+)/g, '$1_$2').replace(/[-\s]+/g, '_').toLowerCase();
     },
 
     dasherize: function(str){
-      return _s.trim(str).replace(/([a-z\d])([A-Z]+)/g, '$1-$2').replace(/^([A-Z]+)/, '-$1').replace(/\_|\s+/g, '-').toLowerCase();
+      return _s.trim(str).replace(/([A-Z])/g, '-$1').replace(/[-_\s]+/g, '-').toLowerCase();
+    },
+
+    classify: function(str){
+      return _s.titleize(String(str).replace(/[\W_]/g, ' ')).replace(/\s/g, '');
     },
 
     humanize: function(str){
-      return _s.capitalize(this.underscored(str).replace(/_id$/,'').replace(/_/g, ' '));
+      return _s.capitalize(_s.underscored(str).replace(/_id$/,'').replace(/_/g, ' '));
     },
 
-    trim: sArgs(function(str, characters){
-      if (!characters && nativeTrim) {
-        return nativeTrim.call(str);
-      }
+    trim: function(str, characters){
+      if (str == null) return '';
+      if (!characters && nativeTrim) return nativeTrim.call(str);
       characters = defaultToWhiteSpace(characters);
-      return str.replace(new RegExp('\^[' + characters + ']+|[' + characters + ']+$', 'g'), '');
-    }),
+      return String(str).replace(new RegExp('\^' + characters + '+|' + characters + '+$', 'g'), '');
+    },
 
-    ltrim: sArgs(function(str, characters){
+    ltrim: function(str, characters){
+      if (str == null) return '';
+      if (!characters && nativeTrimLeft) return nativeTrimLeft.call(str);
       characters = defaultToWhiteSpace(characters);
-      return str.replace(new RegExp('\^[' + characters + ']+', 'g'), '');
-    }),
+      return String(str).replace(new RegExp('^' + characters + '+'), '');
+    },
 
-    rtrim: sArgs(function(str, characters){
+    rtrim: function(str, characters){
+      if (str == null) return '';
+      if (!characters && nativeTrimRight) return nativeTrimRight.call(str);
       characters = defaultToWhiteSpace(characters);
-      return str.replace(new RegExp('[' + characters + ']+$', 'g'), '');
-    }),
+      return String(str).replace(new RegExp(characters + '+$'), '');
+    },
 
-    truncate: sArgs(function(str, length, truncateStr){
-      truncateStr = truncateStr || '...';
-      length = parseNumber(length);
-      return str.length > length ? str.slice(0,length) + truncateStr : str;
-    }),
+    truncate: function(str, length, truncateStr){
+      if (str == null) return '';
+      str = String(str); truncateStr = truncateStr || '...';
+      length = ~~length;
+      return str.length > length ? str.slice(0, length) + truncateStr : str;
+    },
 
     /**
      * _s.prune: a more elegant version of truncate
      * prune extra chars, never leaving a half-chopped word.
-     * @author github.com/sergiokas
+     * @author github.com/rwz
      */
-    prune: sArgs(function(str, length, pruneStr){
-      // Function to check word/digit chars including non-ASCII encodings. 
-      var isWordChar = function(c) { return ((c.toUpperCase() != c.toLowerCase()) || /[-_\d]/.test(c)); }
-      
-      var template = '';
-      var pruned = '';
-      var i = 0;
-      
-      // Set default values
-      pruneStr = pruneStr || '...';
-      length = parseNumber(length);
-      
-      // Convert to an ASCII string to avoid problems with unicode chars.
-      for (i in str) {
-        template += (isWordChar(str[i]))?'A':' ';
-      } 
-
-      // Check if we're in the middle of a word
-      if( template.substring(length-1, length+1).search(/^\w\w$/) === 0 )
-        pruned = _s.rtrim(template.slice(0,length).replace(/([\W][\w]*)$/,''));
-      else
-        pruned = _s.rtrim(template.slice(0,length));
+    prune: function(str, length, pruneStr){
+      if (str == null) return '';
+
+      str = String(str); length = ~~length;
+      pruneStr = pruneStr != null ? String(pruneStr) : '...';
 
-      pruned = pruned.replace(/\W+$/,'');
+      if (str.length <= length) return str;
 
-      return (pruned.length+pruneStr.length>str.length) ? str : str.substring(0, pruned.length)+pruneStr;
-    }),
+      var tmpl = function(c){ return c.toUpperCase() !== c.toLowerCase() ? 'A' : ' '; },
+        template = str.slice(0, length+1).replace(/.(?=\W*\w*$)/g, tmpl); // 'Hello, world' -> 'HellAA AAAAA'
+
+      if (template.slice(template.length-2).match(/\w\w/))
+        template = template.replace(/\s*\S+$/, '');
+      else
+        template = _s.rtrim(template.slice(0, template.length-1));
+
+      return (template+pruneStr).length > str.length ? str : str.slice(0, template.length)+pruneStr;
+    },
 
     words: function(str, delimiter) {
-      return String(str).split(delimiter || " ");
+      if (_s.isBlank(str)) return [];
+      return _s.trim(str, delimiter).split(delimiter || /\s+/);
     },
 
-    pad: sArgs(function(str, length, padStr, type) {
-      var padding = '',
-          padlen  = 0;
+    pad: function(str, length, padStr, type) {
+      str = str == null ? '' : String(str);
+      length = ~~length;
+
+      var padlen  = 0;
 
-      length = parseNumber(length);
+      if (!padStr)
+        padStr = ' ';
+      else if (padStr.length > 1)
+        padStr = padStr.charAt(0);
 
-      if (!padStr) { padStr = ' '; }
-      else if (padStr.length > 1) { padStr = padStr.charAt(0); }
       switch(type) {
         case 'right':
-          padlen = (length - str.length);
-          padding = strRepeat(padStr, padlen);
-          str = str+padding;
-          break;
+          padlen = length - str.length;
+          return str + strRepeat(padStr, padlen);
         case 'both':
-          padlen = (length - str.length);
-          padding = {
-            'left' : strRepeat(padStr, Math.ceil(padlen/2)),
-            'right': strRepeat(padStr, Math.floor(padlen/2))
-          };
-          str = padding.left+str+padding.right;
-          break;
+          padlen = length - str.length;
+          return strRepeat(padStr, Math.ceil(padlen/2)) + str
+                  + strRepeat(padStr, Math.floor(padlen/2));
         default: // 'left'
-          padlen = (length - str.length);
-          padding = strRepeat(padStr, padlen);;
-          str = padding+str;
+          padlen = length - str.length;
+          return strRepeat(padStr, padlen) + str;
         }
-      return str;
-    }),
+    },
 
     lpad: function(str, length, padStr) {
       return _s.pad(str, length, padStr);
@@ -408,41 +458,185 @@
     },
 
     toNumber: function(str, decimals) {
-      var num = parseNumber(parseNumber(str).toFixed(parseNumber(decimals)));
-      return (!(num === 0 && (str !== "0" && str !== 0))) ? num : Number.NaN;
+      if (!str) return 0;
+      str = _s.trim(str);
+      if (!str.match(/^-?\d+(?:\.\d+)?$/)) return NaN;
+      return parseNumber(parseNumber(str).toFixed(~~decimals));
     },
 
-    strRight: sArgs(function(sourceStr, sep){
-      var pos =  (!sep) ? -1 : sourceStr.indexOf(sep);
-      return (pos != -1) ? sourceStr.slice(pos+sep.length, sourceStr.length) : sourceStr;
-    }),
+    numberFormat : function(number, dec, dsep, tsep) {
+      if (isNaN(number) || number == null) return '';
 
-    strRightBack: sArgs(function(sourceStr, sep){
-      var pos =  (!sep) ? -1 : sourceStr.lastIndexOf(sep);
-      return (pos != -1) ? sourceStr.slice(pos+sep.length, sourceStr.length) : sourceStr;
-    }),
+      number = number.toFixed(~~dec);
+      tsep = typeof tsep == 'string' ? tsep : ',';
 
-    strLeft: sArgs(function(sourceStr, sep){
-      var pos = (!sep) ? -1 : sourceStr.indexOf(sep);
-      return (pos != -1) ? sourceStr.slice(0, pos) : sourceStr;
-    }),
+      var parts = number.split('.'), fnums = parts[0],
+        decimals = parts[1] ? (dsep || '.') + parts[1] : '';
 
-    strLeftBack: sArgs(function(sourceStr, sep){
-      var pos = sourceStr.lastIndexOf(sep);
-      return (pos != -1) ? sourceStr.slice(0, pos) : sourceStr;
-    }),
+      return fnums.replace(/(\d)(?=(?:\d{3})+$)/g, '$1' + tsep) + decimals;
+    },
+
+    strRight: function(str, sep){
+      if (str == null) return '';
+      str = String(str); sep = sep != null ? String(sep) : sep;
+      var pos = !sep ? -1 : str.indexOf(sep);
+      return ~pos ? str.slice(pos+sep.length, str.length) : str;
+    },
+
+    strRightBack: function(str, sep){
+      if (str == null) return '';
+      str = String(str); sep = sep != null ? String(sep) : sep;
+      var pos = !sep ? -1 : str.lastIndexOf(sep);
+      return ~pos ? str.slice(pos+sep.length, str.length) : str;
+    },
+
+    strLeft: function(str, sep){
+      if (str == null) return '';
+      str = String(str); sep = sep != null ? String(sep) : sep;
+      var pos = !sep ? -1 : str.indexOf(sep);
+      return ~pos ? str.slice(0, pos) : str;
+    },
+
+    strLeftBack: function(str, sep){
+      if (str == null) return '';
+      str += ''; sep = sep != null ? ''+sep : sep;
+      var pos = str.lastIndexOf(sep);
+      return ~pos ? str.slice(0, pos) : str;
+    },
+
+    toSentence: function(array, separator, lastSeparator, serial) {
+      separator = separator || ', ';
+      lastSeparator = lastSeparator || ' and ';
+      var a = array.slice(), lastMember = a.pop();
+
+      if (array.length > 2 && serial) lastSeparator = _s.rtrim(separator) + lastSeparator;
+
+      return a.length ? a.join(separator) + lastSeparator + lastMember : lastMember;
+    },
+
+    toSentenceSerial: function() {
+      var args = slice.call(arguments);
+      args[3] = true;
+      return _s.toSentence.apply(_s, args);
+    },
+
+    slugify: function(str) {
+      if (str == null) return '';
+
+      var from  = "ąàáäâãåæăćęèéëêìíïîłńòóöôõøśșțùúüûñçżź",
+          to    = "aaaaaaaaaceeeeeiiiilnoooooosstuuuunczz",
+          regex = new RegExp(defaultToWhiteSpace(from), 'g');
+
+      str = String(str).toLowerCase().replace(regex, function(c){
+        var index = from.indexOf(c);
+        return to.charAt(index) || '-';
+      });
+
+      return _s.dasherize(str.replace(/[^\w\s-]/g, ''));
+    },
+
+    surround: function(str, wrapper) {
+      return [wrapper, str, wrapper].join('');
+    },
+
+    quote: function(str, quoteChar) {
+      return _s.surround(str, quoteChar || '"');
+    },
+
+    unquote: function(str, quoteChar) {
+      quoteChar = quoteChar || '"';
+      if (str[0] === quoteChar && str[str.length-1] === quoteChar)
+        return str.slice(1,str.length-1);
+      else return str;
+    },
 
     exports: function() {
       var result = {};
 
       for (var prop in this) {
-        if (!this.hasOwnProperty(prop) || prop == 'include' || prop == 'contains' || prop == 'reverse') continue;
+        if (!this.hasOwnProperty(prop) || prop.match(/^(?:include|contains|reverse)$/)) continue;
         result[prop] = this[prop];
       }
 
       return result;
-    }
+    },
+
+    repeat: function(str, qty, separator){
+      if (str == null) return '';
+
+      qty = ~~qty;
+
+      // using faster implementation if separator is not needed;
+      if (separator == null) return strRepeat(String(str), qty);
+
+      // this one is about 300x slower in Google Chrome
+      for (var repeat = []; qty > 0; repeat[--qty] = str) {}
+      return repeat.join(separator);
+    },
+
+    naturalCmp: function(str1, str2){
+      if (str1 == str2) return 0;
+      if (!str1) return -1;
+      if (!str2) return 1;
+
+      var cmpRegex = /(\.\d+)|(\d+)|(\D+)/g,
+        tokens1 = String(str1).toLowerCase().match(cmpRegex),
+        tokens2 = String(str2).toLowerCase().match(cmpRegex),
+        count = Math.min(tokens1.length, tokens2.length);
+
+      for(var i = 0; i < count; i++) {
+        var a = tokens1[i], b = tokens2[i];
+
+        if (a !== b){
+          var num1 = parseInt(a, 10);
+          if (!isNaN(num1)){
+            var num2 = parseInt(b, 10);
+            if (!isNaN(num2) && num1 - num2)
+              return num1 - num2;
+          }
+          return a < b ? -1 : 1;
+        }
+      }
+
+      if (tokens1.length === tokens2.length)
+        return tokens1.length - tokens2.length;
+
+      return str1 < str2 ? -1 : 1;
+    },
 
+    levenshtein: function(str1, str2) {
+      if (str1 == null && str2 == null) return 0;
+      if (str1 == null) return String(str2).length;
+      if (str2 == null) return String(str1).length;
+
+      str1 = String(str1); str2 = String(str2);
+
+      var current = [], prev, value;
+
+      for (var i = 0; i <= str2.length; i++)
+        for (var j = 0; j <= str1.length; j++) {
+          if (i && j)
+            if (str1.charAt(j - 1) === str2.charAt(i - 1))
+              value = prev;
+            else
+              value = Math.min(current[j], current[j - 1], prev) + 1;
+          else
+            value = i + j;
+
+          prev = current[j];
+          current[j] = value;
+        }
+
+      return current.pop();
+    },
+
+    toBoolean: function(str, trueValues, falseValues) {
+      if (typeof str === "number") str = "" + str;
+      if (typeof str !== "string") return !!str;
+      str = _s.trim(str);
+      if (boolMatch(str, trueValues || ["true", "1"])) return true;
+      if (boolMatch(str, falseValues || ["false", "0"])) return false;
+    }
   };
 
   // Aliases
@@ -451,30 +645,29 @@
   _s.lstrip   = _s.ltrim;
   _s.rstrip   = _s.rtrim;
   _s.center   = _s.lrpad;
-  _s.ljust    = _s.lpad;
-  _s.rjust    = _s.rpad;
+  _s.rjust    = _s.lpad;
+  _s.ljust    = _s.rpad;
   _s.contains = _s.include;
+  _s.q        = _s.quote;
+  _s.toBool   = _s.toBoolean;
+
+  // Exporting
 
   // CommonJS module is defined
   if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      // Export module
+    if (typeof module !== 'undefined' && module.exports)
       module.exports = _s;
-    }
-    exports._s = _s;
 
-  // Integrate with Underscore.js
-  } else if (typeof root._ !== 'undefined') {
-    // root._.mixin(_s);
-    root._.string = _s;
-    root._.str = root._.string;
-
-  // Or define it
-  } else {
-    root._ = {
-      string: _s,
-      str: _s
-    };
+    exports._s = _s;
   }
 
-}(this || window));
+  // Register as a named module with AMD.
+  if (typeof define === 'function' && define.amd)
+    define('underscore.string', [], function(){ return _s; });
+
+
+  // Integrate with Underscore.js if defined
+  // or create our own underscore object.
+  root._ = root._ || {};
+  root._.string = root._.str = _s;
+}(this, String);