Merge pull request #5 from ghost/improvements

Author: cesarferreira

README.md

@@ -20,7 +20,7 @@
 "foot".pluralize()          # => "feet"
 ```
 
-**Singuralization:**
+**Singularization:**
 
 ```kotlin
 "words".singularize()       # => "word"

library/build.gradle

@@ -15,6 +15,7 @@ apply plugin: 'maven-publish'
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    testCompile 'junit:junit:4.13'
 }
 repositories {
     mavenCentral()

library/src/main/kotlin/com/cesarferreira/pluralize/Pluralize.kt

@@ -50,7 +50,7 @@ private fun String.pluralizer(): String {
     var found = Pattern.compile(rule.component1(), Pattern.CASE_INSENSITIVE).matcher(this).replaceAll(rule.component2())
     val endsWith = exceptions().firstOrNull { this.endsWith(it.component1()) }
     if (endsWith != null) found = this.replace(endsWith.component1(), endsWith.component2())
-    val exception = exceptions().firstOrNull() { this.equals(it.component1()) }
+    val exception = exceptions().firstOrNull() { this.equals(it.component1(), true) }
     if (exception != null) found = exception.component2()
     return found
 }
@@ -59,7 +59,7 @@ private fun String.singularizer(): String {
     if (unCountable().contains(this.toLowerCase())) {
         return this
     }
-    val exceptions = exceptions().firstOrNull() { this.equals(it.component2()) }
+    val exceptions = exceptions().firstOrNull() { this.equals(it.component2(), true) }
 
     if (exceptions != null) {
         return exceptions.component1()
@@ -147,7 +147,8 @@ fun exceptions(): List<Pair<String, String>> {
             "noumenon" to "noumena",
             "organon" to "organa",
             "asyndeton" to "asyndeta",
-            "hyperbaton" to "hyperbata")
+            "hyperbaton" to "hyperbata",
+            "foot" to "feet")
 }
 
 fun pluralizeRules(): List<Pair<String, String>> {
@@ -176,7 +177,9 @@ fun pluralizeRules(): List<Pair<String, String>> {
             "f$" to "ves",
             "fe$" to "ves",
             "um$" to "a",
-            "on$" to "a")
+            "on$" to "a",
+            "tion" to "tions",
+            "sion" to "sions")
 }
 
 fun singularizeRules(): List<Pair<String, String>> {

library/src/test/kotlin/com/cesarferreira/pluralize/PluralizationTest.kt

@@ -0,0 +1,32 @@
+package com.cesarferreira.pluralize
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class PluralizationTest {
+
+    @Test
+    fun `Should add default "s" suffix`() {
+        assertEquals("posts", "post".pluralize())
+        assertEquals("descriptions", "description".pluralize())
+        assertEquals("colections", "colection".pluralize())
+        assertEquals("versions", "version".pluralize())
+    }
+
+    @Test
+    fun `Should handle unCountable words`() {
+        assertEquals("aircraft", "aircraft".pluralize())
+    }
+
+    @Test
+    fun `Should handle exception words`() {
+        assertEquals("men", "man".pluralize())
+        assertEquals("feet", "foot".pluralize())
+    }
+
+    @Test
+    fun `Should handle in case insensitive manner`() {
+        assertEquals("people", "Person".pluralize())
+    }
+
+}

library/src/test/kotlin/com/cesarferreira/pluralize/SingularizationTest.kt

@@ -0,0 +1,28 @@
+package com.cesarferreira.pluralize
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class SingularizationTest {
+
+    @Test
+    fun `Should remove default "s" suffix`() {
+        assertEquals("word", "words".singularize())
+    }
+
+    @Test
+    fun `Should handle unCountable words`() {
+        assertEquals("scissors", "scissors".singularize())
+    }
+
+    @Test
+    fun `Should handle exception words`() {
+        assertEquals("person", "people".singularize())
+    }
+
+    @Test
+    fun `Should handle in case insensitive manner`() {
+        assertEquals("goy", "Goyim".singularize())
+    }
+
+}