Merge pull request #98 from lopezca/97-active-rectord-inflector-test-…

…fail-fix

#97 fixes inflector test

src/Glorp-Unit-Tests/GlorpInflectorTest.class.st

@@ -21,7 +21,9 @@ GlorpInflectorTest >> camelToUnderscoreData [
     'SpecialGuest'          -> 'special_guest'.
     'ApplicationController' -> 'application_controller'.
     'Area51Controller'      -> 'area51_controller'.
-	 'UNIQUE' -> 'unique'
+	 'UNIQUE' -> 'unique'.
+	 'SumOfEVENTS' -> 'sum_of_events'.
+	 'BigRANDOMBag' -> 'big_random_bag'
   }
 
 
@@ -458,7 +460,7 @@ GlorpInflectorTest >> testCamelToUnderscore [
 
 { #category : #'tests-data' }
 GlorpInflectorTest >> testCamelToUnderscoreWithoutReverse [ 
-	<expectedFailure>
+
 	self camelToUnderscoreWithoutReverse do: [ :ea |
 		self 
 			assert: (inflector underscore: ea key) 

src/Glorp/ActiveRecordInflector.class.st

@@ -367,17 +367,22 @@ ActiveRecordInflector >> uncountableRegexFrom: aString [
 
 { #category : #accessing }
 ActiveRecordInflector >> underscore: aString [
-	^String streamContents: [:s || in c first |
-		in := ReadStream on: aString.
-		c := in next.
-		first := true.
-		[c notNil and: [c isUppercase]] whileTrue: [ 
-			(in atEnd not and: [in peek isLowercase and: [ first not ]]) ifTrue: [s nextPut: $_]. 
-			s nextPut: c asLowercase. c := in next. first := false].
-		[ c notNil ] whileTrue: [ 
-			c isUppercase ifTrue: [ s nextPut: $_ ]. 
-			s nextPut: c asLowercase.
-			c := in next]
-		]
-
+
+	^ String streamContents: [ :s | 
+		  | in c first prev |
+		  in := ReadStream on: aString.
+		  c := in next.
+		  first := true.
+		  prev := nil.
+
+		  [ c notNil ] whileTrue: [ 
+			  c isUppercase ifTrue: [ 
+				  (first not and: [ in atEnd not ]) ifTrue: [ 
+					  (in peek isLowercase or: [ prev isLowercase ]) ifTrue: [ 
+						  s nextPut: $_ ] ] ].
+
+			  prev := c.
+			  s nextPut: c asLowercase.
+			  c := in next.
+			  first := false ] ]
 ]