englishext 0.1.1 → 0.1.2

data/lib/englishext.rb

@@ -1,6 +1,6 @@
 # A collection of English-language specific utility methods.
 module EnglishExtensions
-	Version = '0.1.1'
+	Version = '0.1.2'
 end
 
 class String
@@ -54,25 +54,33 @@ class String
 	#   "macedonia, the former yugoslav republic of".proper_noun ->
 	#     "Macedonia, the Former Yugoslav Republic of"
 	#   "virgin islands, u.s.".proper_noun -> "Virgin Islands, U.S."	
-	def proper_noun
-		proper_noun = ""
-		str = self.clone
-		while(matchIndex = str =~ /[\. \-\']/)
-			if matchIndex == 0
-				proper_noun += $&
-				str = str[matchIndex+1..str.length]
-			else
-				word = str[0..matchIndex-1]
-				word = word.capitalize unless [ 'and', 'the', 'of' ].index(word) != nil
-				proper_noun += word + $&
-				str = str[matchIndex+1..str.length]
-			end
-		end
-		word = str
-		word = word.capitalize unless [ 'and', 'the', 'of' ].index(word) != nil
-		proper_noun += word
-		proper_noun
-	end
+  def proper_noun
+    proper_noun = ""
+    quote_seen = false
+    str = self.clone
+    while(matchIndex = str =~ /[\. \-\']/)
+      if matchIndex == 0
+        proper_noun += $&
+        str = str[matchIndex+1..str.length]
+      else
+        word = str[0..matchIndex-1]
+        unless [ 'and', 'the', 'of' ].include?(word) or
+               (quote_seen and word == 's')
+          word = word.capitalize
+        end
+        quote_seen = $& == "'"
+        proper_noun += word + $&
+        str = str[matchIndex+1..str.length]
+      end
+    end
+    word = str
+    unless [ 'and', 'the', 'of' ].include?(word) or
+           (quote_seen and word == 's')
+      word = word.capitalize
+    end
+    proper_noun += word
+    proper_noun
+  end
 
 	def singular
 		if self =~ /(.*)ies/

data/lib/englishext.rb~

@@ -1,6 +1,6 @@
 # A collection of English-language specific utility methods.
 module EnglishExtensions
-	Version = '0.1.0'
+	Version = '0.1.1'
 end
 
 class String
@@ -53,15 +53,20 @@ class String
 	#   "bosnia and herzegovina".proper_noun -> "Bosnia and Herzegovina"
 	#   "macedonia, the former yugoslav republic of".proper_noun ->
 	#     "Macedonia, the Former Yugoslav Republic of"
-	#   "virgin islands, u.s.".proper_noun -> "Virgin Islands, U.S."
+	#   "virgin islands, u.s.".proper_noun -> "Virgin Islands, U.S."	
 	def proper_noun
 		proper_noun = ""
 		str = self.clone
-		while(matchIndex = str =~ /[\. ]/)
-			word = str[0..matchIndex-1]
-			word = word.capitalize unless [ 'and', 'the', 'of' ].index(word) != nil
-			proper_noun += word + $&
-			str = str[matchIndex+1..str.length]
+		while(matchIndex = str =~ /[\. \-\']/)
+			if matchIndex == 0
+				proper_noun += $&
+				str = str[matchIndex+1..str.length]
+			else
+				word = str[0..matchIndex-1]
+				word = word.capitalize unless [ 'and', 'the', 'of' ].index(word) != nil
+				proper_noun += word + $&
+				str = str[matchIndex+1..str.length]
+			end
 		end
 		word = str
 		word = word.capitalize unless [ 'and', 'the', 'of' ].index(word) != nil

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: englishext
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-08-20 00:00:00 -04:00
+  version: 0.1.2
+date: 2008-05-02 00:00:00 -04:00
 summary: EnglishExtensions contains a few convenience methods for String.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Francis Hwang
 files: