lafcadio 0.7.3 → 0.7.4

data/lib/lafcadio/test.rb

@@ -9,7 +9,7 @@ class LafcadioTestCase < Test::Unit::TestCase
 	include Lafcadio
 
   def setup
-  	context = Context.instance
+  	context = ContextualService::Context.instance
   	context.flush
     @mockObjectStore = MockObjectStore.new
 		ObjectStore.set_object_store @mockObjectStore

data/lib/lafcadio/test.rb~

@@ -13,7 +13,12 @@ class LafcadioTestCase < Test::Unit::TestCase
   	context.flush
     @mockObjectStore = MockObjectStore.new
 		ObjectStore.set_object_store @mockObjectStore
-		LafcadioConfig.set_filename 'lafcadio/test/testConfig.dat'
+		LafcadioConfig.set_values(
+			'classDefinitionDir' => '../test/testData', 'dbhost' => 'localhost',
+			'dbname' => 'test', 'dbpassword' => 'password', 'dbuser' => 'test',
+			'domainFiles' => %w( ../test/mock/domain ),
+			'logdir' => '../test/testOutput/', 'logSql' => 'n'
+		)
   end
 	
 	def default_test; end

data/lib/lafcadio/util.rb

@@ -1,220 +1,8 @@
 require 'delegate'
+require 'lafcadio/depend'
 require 'singleton'
 
 module Lafcadio
-	# The Context is a singleton object that manages ContextualServices. Each 
-	# ContextualService is a service that connects in some way to external 
-	# resources: ObjectStore connects to the database; Emailer connects to SMTP, 
-	# etc.
-	#
-	# Context makes it easy to ensure that each ContextualService is only 
-	# instantiated once, which can be quite useful for services with expensive 
-	# creation.
-	#
-	# Furthermore, Context allows you to explicitly set instances for a given 
-	# service, which can be quite useful in testing. For example, once 
-	# LafcadioTestCase#setup has an instance of MockObjectStore, it calls 
-	#   context.setObjectStore @mockObjectStore
-	# which ensures that any future calls to ObjectStore.getObjectStore will 
-	# return @mockObjectStore, instead of an instance of ObjectStore connecting 
-	# test code to a live database.
-	class Context
-		include Singleton
-
-		def initialize
-			flush
-			@init_procs = {}
-		end
-		
-		def create_instance( service_class, *init_args ) #:nodoc:
-			if ( proc = @init_procs[service_class] )
-				proc.call( *init_args )
-			else
-				service_class.new( *init_args )
-			end
-		end
-		
-		# Flushes all cached ContextualServices.
-		def flush
-			@resources_by_class = Hash.new { |hash, key| hash[key] = {} }
-		end
-
-		def get_resource( service_class, *init_args ) #:nodoc:
-			resource = @resources_by_class[service_class][init_args]
-			unless resource
-				resource = create_instance( service_class, *init_args )
-				set_resource( service_class, resource, *init_args )
-			end
-			resource
-		end
-		
-		def set_init_proc( service_class, proc )
-			@init_procs[service_class] = proc
-		end
-		
-		def set_resource( service_class, resource, *init_args ) #:nodoc:
-			@resources_by_class[service_class][init_args] = resource
-		end
-	end
-
-	# A ContextualService is a service that is managed by the Context. 
-	# ContextualServices are not instantiated normally. Instead, the instance of 
-	# such a service may be retrieved by calling the method
-	#   < class name >.get< class name >
-	#
-	# For example: ObjectStore.getObjectStore
-	class ContextualService
-		def self.flush; Context.instance.set_resource( self, nil ); end
-
-		def self.method_missing( symbol, *args )
-			method_name = symbol.id2name
-			target = nil
-			if method_name =~ /^get_(.*)/
-				target = :get_resource if $1.underscore_to_camel_case == basename
-			elsif method_name =~ /^set_(.*)/
-				target = :set_resource if $1.underscore_to_camel_case == basename
-			end
-			if target
-				Context.instance.send( target, self, *args )
-			else
-				super
-			end
-		end
-
-		def self.set_init_proc
-			proc = proc { yield }
-			Context.instance.set_init_proc( self, proc )
-		end
-
-		# ContextualServices can only be initialized through the Context instance.
-		# Note that if you're writing your own initialize method in a child class,
-		# you should make sure to call super() or you'll overwrite this behavior.
-		def initialize
-			regexp = %r{lafcadio/util\.rb.*create_instance}
-			unless caller.any? { |line| line =~ regexp }
-				raise ArgumentError,
-				"#{ self.class.name.to_s } should be instantiated by calling " +
-				    self.class.name.to_s + ".get_" + self.class.name.camel_case_to_underscore,
-				caller
-			end
-		end
-	end
-
-	# A collection of English-language specific utility methods.
-	class English
-		# Turns a camel-case string ("camel_case_to_english") to plain English ("camel 
-		# case to english"). Each word is decapitalized.
-		def self.camel_case_to_english(camelCaseStr)
-			words = []
-			nextCapIndex =(camelCaseStr =~ /[A-Z]/)
-			while nextCapIndex != nil
-				words << $` if $`.size > 0
-				camelCaseStr = $& + $'
-				camelCaseStr[0] = camelCaseStr[0..0].downcase
-				nextCapIndex =(camelCaseStr =~ /[A-Z]/)
-			end
-			words << camelCaseStr
-			words.join ' '
-		end
-
-		# Turns an English language string into camel case.
-		def self.english_to_camel_case(englishStr)
-			cc = ""
-			englishStr.split.each { |word|
-				word = word.capitalize unless cc == ''
-				cc = cc += word
-			}
-			cc
-		end
-
-		# Given a singular noun, returns the plural form.
-		def self.plural(singular)
-			consonantYPattern = Regexp.new("([^aeiou])y$", Regexp::IGNORECASE)
-			if singular =~ consonantYPattern
-				singular.gsub consonantYPattern, '\1ies'
-			elsif singular =~ /[xs]$/
-				singular + "es"
-			else
-				singular + "s"
-			end
-		end
-
-		# Returns the proper noun form of a string by capitalizing most of the 
-		# words.
-		#
-		# Examples:
-		#   English.proper_noun("bosnia and herzegovina") ->
-		#     "Bosnia and Herzegovina"
-		#   English.proper_noun("macedonia, the former yugoslav republic of") ->
-		#     "Macedonia, the Former Yugoslav Republic of"
-		#   English.proper_noun("virgin islands, u.s.") ->
-		#     "Virgin Islands, U.S."
-		def self.proper_noun(string)
-			proper_noun = ""
-			while(matchIndex = string =~ /[\. ]/)
-				word = string[0..matchIndex-1]
-				word = word.capitalize unless [ 'and', 'the', 'of' ].index(word) != nil
-				proper_noun += word + $&
-				string = string[matchIndex+1..string.length]
-			end
-			word = string
-			word = word.capitalize unless [ 'and', 'the', 'of' ].index(word) != nil
-			proper_noun += word
-			proper_noun
-		end
-
-		# Given a format for a template sentence, generates the sentence while 
-		# accounting for details such as pluralization and whether to use "a" or 
-		# "an".
-		# [format] The format string. Format codes are:
-		#          * %num: Number
-		#          * %is: Transitive verb. This will be turned into "is" or "are", 
-		#            depending on <tt>number</tt>.
-		#          * %nam: Name. This will be rendered as either singular or 
-		#            plural, depending on <tt>number</tt>.
-		#          * %a: Indefinite article. This will be turned into "a" or "an", 
-		#            depending on <tt>name</tt>.
-		# [name] The name of the object being described.
-		# [number] The number of the objects being describes.
-		#
-		# Examples:
-		#   English.sentence("There %is currently %num %nam", "product category",
-		#                        0) -> "There are currently 0 product categories"
-		#   English.sentence("There %is currently %num %nam", "product category",
-		#                        1) -> "There is currently 1 product category"
-		#   English.sentence("Add %a %nam", "invoice") -> "Add an invoice"	
-		def self.sentence(format, name, number = 1)
-			sentence = format
-			sentence.gsub!( /%num/, number.to_s )
-			isVerb = number == 1 ? "is" : "are"
-			sentence.gsub!( /%is/, isVerb )
-			name = English.plural name if number != 1
-			sentence.gsub!( /%nam/, name )
-			article = starts_with_vowel_sound(name) ? 'an' : 'a'
-			sentence.gsub!( /%a/, article )
-			sentence
-		end
-		
-		def self.singular(plural)
-			if plural =~ /(.*)ies/
-				$1 + 'y'
-			elsif plural =~ /(.*s)es/
-				$1
-			else
-				plural =~ /(.*)s/
-				$1
-			end
-		end
-		
-		# Does this word start with a vowel sound? "User" and "usury" don't, but 
-		# "ugly" does.
-		def self.starts_with_vowel_sound(word)
-			uSomethingUMatch = word =~ /^u[^aeiuo][aeiou]/
-			# 'user' and 'usury' don't start with a vowel sound
-			word =~ /^[aeiou]/ && !uSomethingUMatch
-		end
-	end
-
 	# LafcadioConfig is a Hash that takes its data from the config file. You'll 
 	# have to set the location of that file before using it: Use 
 	# LafcadioConfig.set_filename.
@@ -246,80 +34,16 @@ module Lafcadio
 
 	class MissingError < RuntimeError
 	end
+end
 
-	# An ordered hash: Keys are ordered according to when they were inserted.
-	class QueueHash < DelegateClass( Array )
-		# Creates a QueueHash with all the elements in <tt>array</tt> as keys, and 
-		# each value initially set to be the same as the corresponding key.
-		def self.new_from_array(array)
-			new( *( ( array.map { |elt| [ elt, elt ] } ).flatten ) )
-		end
+class String
+	unless method_defined?( :camel_case_to_underscore )
 
-		# Takes an even number of arguments, and sets each odd-numbered argument to 
-		# correspond to the argument immediately afterward. For example:
-		#   queueHash = QueueHash.new (1, 2, 3, 4)
-		#   queueHash[1] => 2
-		#   queueHash[3] => 4
-		def initialize(*values)
-			@pairs = []
-			0.step(values.size-1, 2) { |i| @pairs << [ values[i], values[i+1] ] }
-			super( @pairs )
+		# Returns the underscored version of a camel-case string.
+		def camel_case_to_underscore
+			( gsub( /(.)([A-Z])/ ) { $1 + '_' + $2.downcase } ).downcase
 		end
 		
-		def ==( otherObj )
-			if otherObj.class == QueueHash && otherObj.size == size
-				( 0..size ).all? { |i|
-					keys[i] == otherObj.keys[i] && values[i] == otherObj.values[i]
-				}
-			else
-				false
-			end
-		end
-
-		def [](key)
-			( pair = @pairs.find { |pair| pair[0] == key } ) ? pair.last : nil
-		end
-
-		def []=(key, value); @pairs << [key, value]; end
-
-		def each; @pairs.each { |pair| yield pair[0], pair[1] }; end
-
-		def keys; @pairs.map { |pair| pair[0] }; end
-
-		def values; @pairs.map { |pair| pair[1] }; end
-	end
-
-	class UsStates
-		# Returns a QueueHash of states, with two-letter postal codes as keys and 
-		# state names as values.
-		def self.states
-			QueueHash.new( 'AL', 'Alabama', 'AK', 'Alaska', 'AZ', 'Arizona',
-			               'AR', 'Arkansas', 'CA', 'California', 'CO', 'Colorado',
-			               'CT', 'Connecticut', 'DE', 'Delaware',
-			               'DC', 'District of Columbia', 'FL', 'Florida',
-			               'GA', 'Georgia', 'HI', 'Hawaii', 'ID', 'Idaho',
-			               'IL', 'Illinois', 'IN', 'Indiana', 'IA', 'Iowa',
-			               'KS', 'Kansas', 'KY', 'Kentucky', 'LA', 'Louisiana',
-			               'ME', 'Maine', 'MD', 'Maryland', 'MA', 'Massachusetts',
-			               'MI', 'Michigan', 'MN', 'Minnesota', 'MS', 'Mississippi',
-			               'MO', 'Missouri', 'MT', 'Montana', 'NE', 'Nebraska',
-			               'NV', 'Nevada', 'NH', 'New Hampshire', 'NJ', 'New Jersey',
-			               'NM', 'New Mexico', 'NY', 'New York',
-			               'NC', 'North Carolina', 'ND', 'North Dakota', 'OH', 'Ohio',
-			               'OK', 'Oklahoma', 'OR', 'Oregon', 'PA', 'Pennsylvania',
-			               'PR', 'Puerto Rico', 'RI', 'Rhode Island',
-			               'SC', 'South Carolina', 'SD', 'South Dakota',
-			               'TN', 'Tennessee', 'TX', 'Texas', 'UT', 'Utah',
-			               'VT', 'Vermont', 'VA', 'Virginia', 'WA', 'Washington',
-			               'WV', 'West Virginia', 'WI', 'Wisconsin', 'WY', 'Wyoming' )
-		end
-	end
-end
-
-class String
-	# Returns the underscored version of a camel-case string.
-	def camel_case_to_underscore
-		( gsub( /(.)([A-Z])/ ) { $1 + '_' + $2.downcase } ).downcase
 	end
 
 	# Returns the number of times that <tt>regexp</tt> occurs in the string.
@@ -352,17 +76,6 @@ class String
 		newString
 	end
 
-	# Turns a numeric string into U.S. format if it's not already formatted that
-	# way.
-	#
-	#   "10,00".numeric_string_to_us_format -> "10.00"
-	#   "10.00".numeric_string_to_us_format -> "10.00"
-	def numeric_string_to_us_format
-		numericString = clone
-		numericString.gsub!(/,/, '.') if numericString =~ /,\d{2}$/
-		numericString
-	end
-
 	# Left-pads a string with +fillChar+ up to +size+ size.
 	#
 	#   "a".pad( 10, "+") -> "+++++++++a"
@@ -374,8 +87,12 @@ class String
 		string
 	end
 	
-	# Returns the camel-case equivalent of an underscore-style string.
-	def underscore_to_camel_case
-		capitalize.gsub( /_([a-zA-Z0-9]+)/ ) { |s| s[1,s.size - 1].capitalize }
+	unless method_defined?( :underscore_to_camel_case )
+
+		# Returns the camel-case equivalent of an underscore-style string.
+		def underscore_to_camel_case
+			capitalize.gsub( /_([a-zA-Z0-9]+)/ ) { |s| s[1,s.size - 1].capitalize }
+		end
+	
 	end
 end

data/lib/lafcadio/util.rb~

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'lafcadio/depend'
 require 'singleton'
 
 module Lafcadio
@@ -22,28 +23,28 @@ module Lafcadio
 		include Singleton
 
 		def initialize
-			@resources = {}
+			flush
 			@init_procs = {}
 		end
 		
-		def create_instance( service_class ) #:nodoc:
+		def create_instance( service_class, *init_args ) #:nodoc:
 			if ( proc = @init_procs[service_class] )
-				proc.call
+				proc.call( *init_args )
 			else
-				service_class.new
+				service_class.new( *init_args )
 			end
 		end
 		
 		# Flushes all cached ContextualServices.
 		def flush
-			@resources = {}
+			@resources_by_class = Hash.new { |hash, key| hash[key] = {} }
 		end
 
-		def get_resource( service_class ) #:nodoc:
-			resource = @resources[service_class]
+		def get_resource( service_class, *init_args ) #:nodoc:
+			resource = @resources_by_class[service_class][init_args]
 			unless resource
-				resource = create_instance( service_class )
-				set_resource service_class, resource
+				resource = create_instance( service_class, *init_args )
+				set_resource( service_class, resource, *init_args )
 			end
 			resource
 		end
@@ -52,8 +53,8 @@ module Lafcadio
 			@init_procs[service_class] = proc
 		end
 		
-		def set_resource(service_class, resource) #:nodoc:
-			@resources[service_class] = resource
+		def set_resource( service_class, resource, *init_args ) #:nodoc:
+			@resources_by_class[service_class][init_args] = resource
 		end
 	end
 
@@ -100,121 +101,6 @@ module Lafcadio
 		end
 	end
 
-	# A collection of English-language specific utility methods.
-	class English
-		# Turns a camel-case string ("camel_case_to_english") to plain English ("camel 
-		# case to english"). Each word is decapitalized.
-		def self.camel_case_to_english(camelCaseStr)
-			words = []
-			nextCapIndex =(camelCaseStr =~ /[A-Z]/)
-			while nextCapIndex != nil
-				words << $` if $`.size > 0
-				camelCaseStr = $& + $'
-				camelCaseStr[0] = camelCaseStr[0..0].downcase
-				nextCapIndex =(camelCaseStr =~ /[A-Z]/)
-			end
-			words << camelCaseStr
-			words.join ' '
-		end
-
-		# Turns an English language string into camel case.
-		def self.english_to_camel_case(englishStr)
-			cc = ""
-			englishStr.split.each { |word|
-				word = word.capitalize unless cc == ''
-				cc = cc += word
-			}
-			cc
-		end
-
-		# Given a singular noun, returns the plural form.
-		def self.plural(singular)
-			consonantYPattern = Regexp.new("([^aeiou])y$", Regexp::IGNORECASE)
-			if singular =~ consonantYPattern
-				singular.gsub consonantYPattern, '\1ies'
-			elsif singular =~ /[xs]$/
-				singular + "es"
-			else
-				singular + "s"
-			end
-		end
-
-		# Returns the proper noun form of a string by capitalizing most of the 
-		# words.
-		#
-		# Examples:
-		#   English.proper_noun("bosnia and herzegovina") ->
-		#     "Bosnia and Herzegovina"
-		#   English.proper_noun("macedonia, the former yugoslav republic of") ->
-		#     "Macedonia, the Former Yugoslav Republic of"
-		#   English.proper_noun("virgin islands, u.s.") ->
-		#     "Virgin Islands, U.S."
-		def self.proper_noun(string)
-			proper_noun = ""
-			while(matchIndex = string =~ /[\. ]/)
-				word = string[0..matchIndex-1]
-				word = word.capitalize unless [ 'and', 'the', 'of' ].index(word) != nil
-				proper_noun += word + $&
-				string = string[matchIndex+1..string.length]
-			end
-			word = string
-			word = word.capitalize unless [ 'and', 'the', 'of' ].index(word) != nil
-			proper_noun += word
-			proper_noun
-		end
-
-		# Given a format for a template sentence, generates the sentence while 
-		# accounting for details such as pluralization and whether to use "a" or 
-		# "an".
-		# [format] The format string. Format codes are:
-		#          * %num: Number
-		#          * %is: Transitive verb. This will be turned into "is" or "are", 
-		#            depending on <tt>number</tt>.
-		#          * %nam: Name. This will be rendered as either singular or 
-		#            plural, depending on <tt>number</tt>.
-		#          * %a: Indefinite article. This will be turned into "a" or "an", 
-		#            depending on <tt>name</tt>.
-		# [name] The name of the object being described.
-		# [number] The number of the objects being describes.
-		#
-		# Examples:
-		#   English.sentence("There %is currently %num %nam", "product category",
-		#                        0) -> "There are currently 0 product categories"
-		#   English.sentence("There %is currently %num %nam", "product category",
-		#                        1) -> "There is currently 1 product category"
-		#   English.sentence("Add %a %nam", "invoice") -> "Add an invoice"	
-		def self.sentence(format, name, number = 1)
-			sentence = format
-			sentence.gsub!( /%num/, number.to_s )
-			isVerb = number == 1 ? "is" : "are"
-			sentence.gsub!( /%is/, isVerb )
-			name = English.plural name if number != 1
-			sentence.gsub!( /%nam/, name )
-			article = starts_with_vowel_sound(name) ? 'an' : 'a'
-			sentence.gsub!( /%a/, article )
-			sentence
-		end
-		
-		def self.singular(plural)
-			if plural =~ /(.*)ies/
-				$1 + 'y'
-			elsif plural =~ /(.*s)es/
-				$1
-			else
-				plural =~ /(.*)s/
-				$1
-			end
-		end
-		
-		# Does this word start with a vowel sound? "User" and "usury" don't, but 
-		# "ugly" does.
-		def self.starts_with_vowel_sound(word)
-			uSomethingUMatch = word =~ /^u[^aeiuo][aeiou]/
-			# 'user' and 'usury' don't start with a vowel sound
-			word =~ /^[aeiou]/ && !uSomethingUMatch
-		end
-	end
-
 	# LafcadioConfig is a Hash that takes its data from the config file. You'll 
 	# have to set the location of that file before using it: Use 
 	# LafcadioConfig.set_filename.
@@ -246,80 +132,16 @@ module Lafcadio
 
 	class MissingError < RuntimeError
 	end
+end
 
-	# An ordered hash: Keys are ordered according to when they were inserted.
-	class QueueHash < DelegateClass( Array )
-		# Creates a QueueHash with all the elements in <tt>array</tt> as keys, and 
-		# each value initially set to be the same as the corresponding key.
-		def self.new_from_array(array)
-			new( *( ( array.map { |elt| [ elt, elt ] } ).flatten ) )
-		end
+class String
+	unless method_defined?( :camel_case_to_underscore )
 
-		# Takes an even number of arguments, and sets each odd-numbered argument to 
-		# correspond to the argument immediately afterward. For example:
-		#   queueHash = QueueHash.new (1, 2, 3, 4)
-		#   queueHash[1] => 2
-		#   queueHash[3] => 4
-		def initialize(*values)
-			@pairs = []
-			0.step(values.size-1, 2) { |i| @pairs << [ values[i], values[i+1] ] }
-			super( @pairs )
+		# Returns the underscored version of a camel-case string.
+		def camel_case_to_underscore
+			( gsub( /(.)([A-Z])/ ) { $1 + '_' + $2.downcase } ).downcase
 		end
 		
-		def ==( otherObj )
-			if otherObj.class == QueueHash && otherObj.size == size
-				( 0..size ).all? { |i|
-					keys[i] == otherObj.keys[i] && values[i] == otherObj.values[i]
-				}
-			else
-				false
-			end
-		end
-
-		def [](key)
-			( pair = @pairs.find { |pair| pair[0] == key } ) ? pair.last : nil
-		end
-
-		def []=(key, value); @pairs << [key, value]; end
-
-		def each; @pairs.each { |pair| yield pair[0], pair[1] }; end
-
-		def keys; @pairs.map { |pair| pair[0] }; end
-
-		def values; @pairs.map { |pair| pair[1] }; end
-	end
-
-	class UsStates
-		# Returns a QueueHash of states, with two-letter postal codes as keys and 
-		# state names as values.
-		def self.states
-			QueueHash.new( 'AL', 'Alabama', 'AK', 'Alaska', 'AZ', 'Arizona',
-			               'AR', 'Arkansas', 'CA', 'California', 'CO', 'Colorado',
-			               'CT', 'Connecticut', 'DE', 'Delaware',
-			               'DC', 'District of Columbia', 'FL', 'Florida',
-			               'GA', 'Georgia', 'HI', 'Hawaii', 'ID', 'Idaho',
-			               'IL', 'Illinois', 'IN', 'Indiana', 'IA', 'Iowa',
-			               'KS', 'Kansas', 'KY', 'Kentucky', 'LA', 'Louisiana',
-			               'ME', 'Maine', 'MD', 'Maryland', 'MA', 'Massachusetts',
-			               'MI', 'Michigan', 'MN', 'Minnesota', 'MS', 'Mississippi',
-			               'MO', 'Missouri', 'MT', 'Montana', 'NE', 'Nebraska',
-			               'NV', 'Nevada', 'NH', 'New Hampshire', 'NJ', 'New Jersey',
-			               'NM', 'New Mexico', 'NY', 'New York',
-			               'NC', 'North Carolina', 'ND', 'North Dakota', 'OH', 'Ohio',
-			               'OK', 'Oklahoma', 'OR', 'Oregon', 'PA', 'Pennsylvania',
-			               'PR', 'Puerto Rico', 'RI', 'Rhode Island',
-			               'SC', 'South Carolina', 'SD', 'South Dakota',
-			               'TN', 'Tennessee', 'TX', 'Texas', 'UT', 'Utah',
-			               'VT', 'Vermont', 'VA', 'Virginia', 'WA', 'Washington',
-			               'WV', 'West Virginia', 'WI', 'Wisconsin', 'WY', 'Wyoming' )
-		end
-	end
-end
-
-class String
-	# Returns the underscored version of a camel-case string.
-	def camel_case_to_underscore
-		( gsub( /(.)([A-Z])/ ) { $1 + '_' + $2.downcase } ).downcase
 	end
 
 	# Returns the number of times that <tt>regexp</tt> occurs in the string.
@@ -352,17 +174,6 @@ class String
 		newString
 	end
 
-	# Turns a numeric string into U.S. format if it's not already formatted that
-	# way.
-	#
-	#   "10,00".numeric_string_to_us_format -> "10.00"
-	#   "10.00".numeric_string_to_us_format -> "10.00"
-	def numeric_string_to_us_format
-		numericString = clone
-		numericString.gsub!(/,/, '.') if numericString =~ /,\d{2}$/
-		numericString
-	end
-
 	# Left-pads a string with +fillChar+ up to +size+ size.
 	#
 	#   "a".pad( 10, "+") -> "+++++++++a"
@@ -374,8 +185,12 @@ class String
 		string
 	end
 	
-	# Returns the camel-case equivalent of an underscore-style string.
-	def underscore_to_camel_case
-		capitalize.gsub( /_([a-zA-Z0-9]+)/ ) { |s| s[1,s.size - 1].capitalize }
+	unless method_defined?( :underscore_to_camel_case )
+
+		# Returns the camel-case equivalent of an underscore-style string.
+		def underscore_to_camel_case
+			capitalize.gsub( /_([a-zA-Z0-9]+)/ ) { |s| s[1,s.size - 1].capitalize }
+		end
+	
 	end
 end