string_language 0.0.804 → 0.0.805

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42555180e99cd23cc538b43574de5af408648e3f
-  data.tar.gz: 64b9902acde76918dfaddfd7c1910cdce36732d7
+  metadata.gz: 253cfbc45fdd4f0309f1ae9cbe6bf33963fdfd9d
+  data.tar.gz: 817e4b02bff7ab9dfdc82ec165a92c6eac762f09
 SHA512:
-  metadata.gz: 760f6ba5453d8d483723dfd1847f3dac6e3eff4cdc8249a92ff4278fbab7dea04d3a739071651d53fef55fac8b686d770d84c8831d7ab2ccc7309197644e34d4
-  data.tar.gz: 5ec0f42d8fac89a0a811b2399a26d21920ba954c1cc86f0f8237d9eabf524268e69358dbdfcad44dc98ce538e6ab8a29ca12b415612cd2c3399d3b4154e02c9e
+  metadata.gz: f88abec9c7e00f3a46a35872b462e5a80df1183624582503818661fefe85800193ff8c79478084cc7cc27c034c530c5aed3048bf7017098b2f3efba76b8f7ee2
+  data.tar.gz: 47620bd58032d3e9b2717cbc230bc5a6a4ab25c1c673a7333ecf428e38dc3db4512d9b437c8389fa3b8a1432959dd260877e8ec29f2835cb334791608b048dda

data/lib/string_helpers.rb

@@ -35,27 +35,52 @@ module StringHelpers
 		prefix + middle + suffix
 	end
 
+	# Return stringA with spacing around its interpunction equal to that in StringB
+	#
+	# @example
+	#    equalize_interpunction( "A test  , succes ! ", "Comma, then exclamation!" ) => "A test, succes!"
+	#
 	def self.equalize_interpunction stringA, stringB
 
-		interpunction = "!?.,:;'@|$%^&*-+={()}\/\\\\\#\"\\\[\\\]"
-		regex = /(\s*[#{interpunction}]\s*)/
+		punctuation_marks = "!?.,:;'@|$%^&*-+={()}\/\\\\\#\"\\\[\\\]"
+		space_mark_space  = /(\s*[#{punctuation_marks}]\s*)/
+		get_mark          = /\s*([#{punctuation_marks}])\s*/
+
+		splitA = stringA.split( space_mark_space ) # "'a' ( bla )  (c    )" => ["", "'", "a", "' ", "", "( ", "bla )", "  (", "c    )"]
+		splitB = stringB.split( space_mark_space )
 
-		splitA = stringA.split( regex ) # "'a' ( bla )  (c    )" => ["", "'", "a", "' ", "", "( ", "bla )", "  (", "c    )"]
-		splitB = stringB.split( regex )
+		splitB.each_with_index do |b,indexB|
 
-		splitA.each_with_index do |item,index|
+			next unless b.match( space_mark_space )
 
-			a = splitA[ index ] ; b = splitB[ index ]
-		   
-			if a != nil and b != nil and a.match( regex ) and b.match( regex )
+			markB = b.gsub( get_mark, '\1' );
 
-				splitA[ index ] = b
-			end
+			indexA = corresponding_index( splitA, markB, indexB )
+
+			splitA[ indexA ] = b unless indexA == nil
 		end
 
 		splitA.join('')
 	end
 
+	private
+
+	# Return index of string in list that contains given mark. Starting search
+	# at start_index. Return nil if search fails.
+	def self.corresponding_index( strings, mark, start_index )
+
+		regexp = /#{Regexp.quote( mark )}/
+
+		tail = strings[ start_index .. -1 ]
+
+		return nil if tail == nil
+
+		tail_index = tail.index { |item| item.match( regexp ) }
+
+		return nil if tail_index == nil
+
+		start_index + tail_index
+	end
 end
 
 # Quick Testing
@@ -63,6 +88,9 @@ end
 	a = " Hallo (Dit is een, enigzins, wel (test) 'van' de spacing)!"
 	b = " hallo (   Deze was niet goed gespaced, en zelfs , zoals (  test) ' van ' dittum) !  "
 
+	a = "Choose this item if you want to add videos, slideshows and weblinks to the publication."
+	b = "Kies dit item als u video's  , slideshows en weblinks wilt toe voegen aan de publicatie ."
+
 	puts "correct: >#{a}<"
 	puts "wrong:   >#{b}<"
 	puts "test:    >#{StringHelpers::equalize( b, a )}<"

metadata

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