string_language 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49ed3266f212bed603081b98b6fa0112fd2cdec6
-  data.tar.gz: e955dfed0e10938a089254621dc6449d64094206
+  metadata.gz: a7f79d274fd5b4e0c819b7390b8aa6f29fa0cdd6
+  data.tar.gz: 61b51ec3f63a8ac7b9ee1b49718ca300f5e06c41
 SHA512:
-  metadata.gz: d110dc727ee65999c5fd31b3931689915801e25b048ff0d7a1fa06b68e4545c8fb6747cb1a34b71e4944c9669a33a9d54e2dbba83dcf45db1d39f90a7a6cf922
-  data.tar.gz: dfb0de7569f2bcffd2cc039b8c52b7407d36b25806e911f9f342c7fae4f25216acd1dec7b508e695a309b4e57688b4450430c4ba5a219cd154de7a0fb534f12d
+  metadata.gz: f7001e8ced170b53e154b3054203d36aea7aea5112311e2fbbc6d2d409e7a4b93cc654c63740d1f8fc040ea87057b331e5c04e7c72d12151f2ed5432132a580f
+  data.tar.gz: e80b05c84923311e90992767cac8982d34b33db9113b3373c1a5cba8079667afe99b53ebf0fa3f021b21fcc9503520aca83373894d16c2a0252c6bcbfd49984d

data/lib/google_translator.rb

@@ -24,7 +24,7 @@ class GoogleTranslator
 		ask_google
 
 		# return the untranslated input when it is translated to white space only
-		self.output = translation.match( /^\s*$/ ) ? input : StringHelpers::space_equally( translation, input )
+		self.output = translation.match( /^\s*$/ ) ? input : StringHelpers::equalize( translation, input )
 	end
 
 	def language input
@@ -75,9 +75,9 @@ class GoogleTranslator
 end
 
 # Quick Testing
-begin
+=begin
 	english     = "'none' and 'ad' Articles"
 	translator  = GoogleTranslator.new
 	translation = translator.translate english, 'en', 'nl'
 	puts translation
-end
+=end

data/lib/string_helpers.rb

@@ -1,12 +1,10 @@
 module StringHelpers
 
-	# Make the spacing around the i-th bracket/qoute in stringA equal to that around
-	# the i-th bracket/quote in stringB
-	def self.space_equally stringA, stringB
+	def self.equalize stringA, stringB
 
-		intermediateA = space_equally_quotes_and_brackets( stringA, stringB )
+		intermediateA = equalize_interpunction( stringA, stringB )
 
-		space_equally_surrounding( intermediateA, stringB )
+		equalize_surrounding_space( intermediateA, stringB )
 	end
 
 	private
@@ -15,7 +13,7 @@ module StringHelpers
 	# @example
 	# 	space_equally_surrounding( "gnu ", "   gnat  " ) => "   gnu  "
 	#
-	def self.space_equally_surrounding stringA, stringB
+	def self.equalize_surrounding_space stringA, stringB
 
 		prefix = stringB.match( /^\s*/ )[0]
 	   	suffix = stringB.match( /\s*$/ )[0]
@@ -24,49 +22,35 @@ module StringHelpers
 		prefix + middle + suffix
 	end
 
-	def self.space_equally_quotes_and_brackets stringA, stringB
+	def self.equalize_interpunction stringA, stringB
 
-		brackets_and_quotes   = "{(\['\"\])}"
-		regex = /(\s*[#{brackets_and_quotes}]\s*)/
+		interpunction = ".,:;'@|$%^&*-+={()}\/\\\\\#\"\\\[\\\]"
+		regex = /(\s*[#{interpunction}]\s*)/
 
 		splitA = stringA.split( regex ) # "'a' ( bla )  (c    )" => ["", "'", "a", "' ", "", "( ", "bla )", "  (", "c    )"]
 		splitB = stringB.split( regex )
 
-		i=0; while space_ith_match( splitA, splitB, regex, i ) do ; i+=1 ; end
+		splitA.each_with_index do |item,index|
 
-		splitA.join('')
-	end
-
-	def self.space_ith_match listA, listB, regex, i
+			a = splitA[ index ] ; b = splitB[ index ]
+		   
+			if a != nil and b != nil and a.match( regex ) and b.match( regex )
 
-		matchA, indexA = *ith_match( listA, regex, i )
-		matchB, indexB = *ith_match( listB, regex, i )
+				splitA[ index ] = b
+			end
+		end
 
-		return false if (matchA == nil or matchB == nil)
-
-		listA[ indexA ] = space_equally_surrounding( listA[ indexA ], listB[ indexB ] )
+		splitA.join('')
 	end
 
-	def self.ith_match list, regex, i
-
-		count = 0
-
-		list.each_with_index do |item,index|
-
-			count+=1 if item.match( regex )
-			return [item,index] if count == i
-		end	
-
-		return [nil,nil]
-	end
 end
 
 # Quick Testing
-=begin
-	a = "(Dit is een (test) 'van' de spacing)"
-	b = "(   Deze was niet goed gespaced, zoals (  test) ' van ' dittum)"
+begin
+	a = "(Dit is een, enigzins, wel (test) 'van' de spacing)"
+	b = " (   Deze was niet goed gespaced, en zelfs , zoals (  test) ' van ' dittum)  "
 
 	puts "correct: >#{a}<"
 	puts "wrong:   >#{b}<"
-	puts "test:    >#{StringHelpers::space_equally( b, a )}<"
-=end
+	puts "test:    >#{StringHelpers::equalize( b, a )}<"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: string_language
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Cornelis Adriaan Schippers