bumped version

check uncountables against the lower-cased string

.travis.yml

@@ -4,9 +4,9 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-24.0.2
+    - build-tools-24.0.3
     - extra-android-m2repository
-    - android-24
+    - android-25
 
 jdk:
   - oraclejdk8

README.md

@@ -3,7 +3,7 @@
 
 **kotlin extension** to **pluralize** and **singularize** strings
 
-[![Build Status](https://travis-ci.org/cesarferreira/kotlin-pluralizer.svg?branch=master)](https://travis-ci.org/cesarferreira/kotlin-pluralizer) [![Release](https://jitpack.io/v/cesarferreira/kotlin-pluralizer.svg)](https://jitpack.io/#cesarferreira/kkotlin-pluralizer)
+[![Build Status](https://travis-ci.org/cesarferreira/kotlin-pluralizer.svg?branch=master)](https://travis-ci.org/cesarferreira/kotlin-pluralizer) [![Release](https://jitpack.io/v/cesarferreira/kotlin-pluralizer.svg)](https://jitpack.io/#cesarferreira/kotlin-pluralizer)
 
 ### Show some love
 [![GitHub followers](https://img.shields.io/github/followers/cesarferreira.svg?style=social&label=Follow)](https://github.com/cesarferreira/kotlin-pluralizer)   [![Twitter Follow](https://img.shields.io/twitter/follow/cesarmcferreira.svg?style=social)](https://twitter.com/cesarmcferreira)
@@ -43,7 +43,7 @@ repositories {
     maven { url "https://jitpack.io" }
  }
  dependencies {
-    compile 'com.github.cesarferreira:kotlin-pluralizer:0.2.6'
+    compile 'com.github.cesarferreira:kotlin-pluralizer:0.2.9'
  }
  ```
 

android-sample/build.gradle

@@ -12,19 +12,18 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "24.0.3"
     defaultConfig {
-        applicationId "com.cesarferreira.supposedlibrary"
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
     lintOptions {
         abortOnError false
     }
-    
+
     buildTypes {
         release {
             minifyEnabled false
@@ -39,8 +38,8 @@ android {
 dependencies {
     compile project(':library')
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    compile 'com.android.support:design:24.2.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:design:25.1.0'
 }
 repositories {
     mavenCentral()

build.gradle

@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.0.3'
+    ext.kotlin_version = '1.0.6'
 
     ext {
       ext_groupId = 'com.cesarferreira'
       ext_artifactId = 'kotlin-pluralizer'
-      ext_version = '0.2.4'
+      ext_version = '0.2.9'
       ext_url = 'https://github.com/cesarferreira/kotlin-pluralizer'
       ext_vcsUrl = 'https://github.com/cesarferreira/kotlin-pluralizer.git'
       ext_description = 'Kotlin extension to pluralize and singularize strings'
@@ -16,7 +16,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

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

@@ -25,34 +25,48 @@ fun String.singularize(plurality: Plurality = Plurality.Plural): String {
 
     if (this.pluralizer() != this && this + "s" != this.pluralizer() &&
             this.pluralizer().singularize() == this && this.singularizer() != this)
-        return this;
+        return this
 
     return this.singularize()
 }
 
+fun String.pluralize(count: Int): String {
+    if (count > 1)
+        return this.pluralize(Plurality.Plural)
+    else
+        return this.pluralize(Plurality.Singular)
+}
+
+fun String.singularize(count: Int): String {
+    if (count > 1)
+        return this.singularize(Plurality.Plural)
+    else
+        return this.singularize(Plurality.Singular)
+}
+
 private fun String.pluralizer(): String {
-    if (unCountable().contains(this)) return this
+    if (unCountable().contains(this.toLowerCase())) return this
     val rule = pluralizeRules().last { Pattern.compile(it.component1(), Pattern.CASE_INSENSITIVE).matcher(this).find() }
     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 excep = exceptions().firstOrNull() { this.equals(it.component1()) }
-    if (excep != null) found = excep.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()) }
+    if (exception != null) found = exception.component2()
     return found
 }
 
 private fun String.singularizer(): String {
-    if (unCountable().contains(this)) {
+    if (unCountable().contains(this.toLowerCase())) {
         return this
     }
-    val excepions = exceptions().firstOrNull() { this.equals(it.component2()) }
+    val exceptions = exceptions().firstOrNull() { this.equals(it.component2()) }
 
-    if (excepions != null) {
-        return excepions.component1()
+    if (exceptions != null) {
+        return exceptions.component1()
     }
-    val endswith = exceptions().firstOrNull { this.endsWith(it.component2()) }
+    val endsWith = exceptions().firstOrNull { this.endsWith(it.component2()) }
 
-    if (endswith != null) return this.replace(endswith.component2(), endswith.component1())
+    if (endsWith != null) return this.replace(endsWith.component2(), endsWith.component1())
 
     try {
         if (singularizeRules().count {
@@ -200,5 +214,3 @@ fun singularizeRules(): List<Pair<String, String>> {
             "i$" to "us",
             "ae$" to "a")
 }
-
-