string_utils 1.0.7 → 1.0.8

data/.rvmrc

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p125@string_utils"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.10.3" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | grep -vE '^Using|Your bundle is complete'
+# fi

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source :rubygems
 
 # Specify your gem's dependencies in string_utils.gemspec
 gemspec

data/Gemfile.lock

@@ -1,30 +1,31 @@
 PATH
   remote: .
   specs:
-    string_utils (1.0.4)
+    string_utils (1.0.7)
       activesupport (>= 2.3.5)
       i18n
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.3)
-    diff-lcs (1.1.2)
-    i18n (0.5.0)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    multi_json (1.3.2)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 2.3.5)
-  i18n
   rspec (>= 2.0.0)
   string_utils!

data/lib/string_utils.rb

@@ -24,15 +24,28 @@ module StringUtils
   WHITESPACES        = /#{WHITESPACE_MATCHER}+/
 
   # Collapses spaces and commas
-  # Fixes spacing around the [,.;:]
+  # Fixes spacing around the following characters:
+  #   ,.;:&
+  # Removes consecutive character dupes
   # Removes trailing and leading commas
   def normalize_punctuation(str)
     s = str.dup
     s.gsub! /\s+/, ' '
-    s.gsub! /\s,/, ','
-    s.gsub! /,+/ , ','
-    s.gsub! /^\s*,|,\s*$/, ''
+
+    s.gsub(/\s*&,/)
+
+    # Collapse w/s around all
+    s.gsub! /\s*([:,&.;])\s*/, '\1'
+    # Collapse consecutive dupes
+    s.gsub! /([.,;&:])+/ , '\1'
+
+    # Collapse leading and trailing punctuation
+    s.gsub! /^\s*[,:&;.]|[.;&:,]\s*$/, ''
+
+    # Add whitespaces
     s.gsub! /([,.;:])(\S)/, '\1 \2'
+    s.gsub! /(\S)([&])(\S)/, '\1 \2 \3'
+
     s.strip!
     s
   end

data/lib/string_utils/version.rb

@@ -1,3 +1,3 @@
 module StringUtils
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/test/normalize_punctuation_spec.rb

@@ -1,20 +1,39 @@
 # -*- coding: utf-8 -*-
-require "string_utils"
+require 'string_utils'
 
-describe "StringUtils" do
-  describe "#normalize_punctuation" do
-
-    it 'collapses commas' do
-      StringUtils.normalize_punctuation("a,,b").should == "a, b"
+describe 'StringUtils' do
+  describe '#normalize_punctuation' do
+    describe 'removes trailing and leading:' do
+      it 'commas' do
+        StringUtils.normalize_punctuation(' , ab  ,  ').should == 'ab'
+      end
     end
-
-    it 'removes leading and trailing commas' do
-      StringUtils.normalize_punctuation(" , ab  ,  ").should == "ab"
+    
+    describe 'transforms whitespace to 0 left-side and 1 right-side whitespace characters'do
+      it 'commas' do
+        StringUtils.normalize_punctuation('a  ,    b').should == 'a, b'
+        StringUtils.normalize_punctuation('a ,b').should == 'a, b'
+        StringUtils.normalize_punctuation('a,b').should == 'a, b'
+      end
+      
+      it 'normalizes whitespace around semicolons (:)' do
+        StringUtils.normalize_punctuation('a  :    b').should == 'a: b'
+        StringUtils.normalize_punctuation('a :b').should == 'a: b'
+        StringUtils.normalize_punctuation('a:b').should == 'a: b'
+      end
+      
+      it 'normalizes whitespace around ampersands (&)' do
+        StringUtils.normalize_punctuation('a&b').should == 'a & b'
+        StringUtils.normalize_punctuation('a    &  b').should == 'a & b'
+        StringUtils.normalize_punctuation('a    &b').should == 'a & b'
+        StringUtils.normalize_punctuation('a&  b').should == 'a & b'
+      end
     end
 
-    it 'fixes spacing around commas' do
-      StringUtils.normalize_punctuation("a   ,    b").should == "a, b"
+    describe 'collapses consecutive:' do
+      it 'commas' do
+        StringUtils.normalize_punctuation('a,,b').should == 'a, b'
+      end
     end
-
   end
 end

metadata

@@ -1,70 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: string_utils
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.8
   prerelease: 
-  version: 1.0.7
 platform: ruby
-authors: 
+authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-11 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &6177300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *6177300
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &6176140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *6176140
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &6174960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id003
-description: |
-  Provides useful string utils like "truncate to word".
-  Compatible with ruby >= 1.8. Benefits from active_support if available on ruby < 1.9.
-  
-  Tested with:
-  
-    * ruby 1.8.7 (2010-04-19 patchlevel 253) [i686-linux], MBARI 0x8770, Ruby Enterprise Edition 2010.02
-    * 
-
-email: 
+  prerelease: false
+  version_requirements: *6174960
+description: ! "Provides useful string utils like \"truncate to word\".\nCompatible
+  with ruby >= 1.8. Benefits from active_support if available on ruby < 1.9.\n\nTested
+  with:\n\n  * ruby 1.8.7 (2010-04-19 patchlevel 253) [i686-linux], MBARI 0x8770,
+  Ruby Enterprise Edition 2010.02\n  * \n"
+email:
 - glex.spb@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - README
@@ -77,33 +68,28 @@ files:
 - test/normalize_punctuation_spec.rb
 - test/truncate_spec.rb
 - test/urlify_spec.rb
-has_rdoc: true
 homepage: http://github.com/glebm/string_utils
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: string_utils
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Provides useful string utils like "truncate to word"
 test_files: []
-