Merge pull request #19 from blocoio/fix-regex

Fix regex and add jvm annotations

lib/src/main/kotlin/io/bloco/faker/Faker.kt

@@ -28,27 +28,27 @@ import java.io.IOException
 import java.io.InputStream
 
 class Faker(val locale: String = DEFAULT_LOCALE) {
-    val address: Address
-    val app: App
-    val avatar: Avatar
-    val book: Book
-    val bool: Bool
-    val business: Business
-    val color: Color
-    val commerce: Commerce
-    val company: Company
-    val date: Date
-    val food: Food
-    val internet: Internet
-    val lorem: Lorem
-    val name: Name
-    val number: Number
-    val placeholdit: Placeholdit
-    val phoneNumber: PhoneNumber
-    val slackEmoji: SlackEmoji
-    val team: Team
-    val time: Time
-    val university: University
+    @JvmField val address: Address
+    @JvmField val app: App
+    @JvmField val avatar: Avatar
+    @JvmField val book: Book
+    @JvmField val bool: Bool
+    @JvmField val business: Business
+    @JvmField val color: Color
+    @JvmField val commerce: Commerce
+    @JvmField val company: Company
+    @JvmField val date: Date
+    @JvmField val food: Food
+    @JvmField val internet: Internet
+    @JvmField val lorem: Lorem
+    @JvmField val name: Name
+    @JvmField val number: Number
+    @JvmField val placeholdit: Placeholdit
+    @JvmField val phoneNumber: PhoneNumber
+    @JvmField val slackEmoji: SlackEmoji
+    @JvmField val team: Team
+    @JvmField val time: Time
+    @JvmField val university: University
     private val data: FakerData
 
     init {

lib/src/main/kotlin/io/bloco/faker/FakerComponent.kt

@@ -100,6 +100,6 @@ abstract class FakerComponent(private val data: FakerData) {
 
     companion object {
         private const val DIGIT_SYMBOL = "#"
-        private const val PARSE_REGEXP = "#\\{(.+?)}"
+        private const val PARSE_REGEXP = "\\#\\{(.+?)\\}"
     }
 }

lib/src/main/kotlin/io/bloco/faker/components/Avatar.kt

@@ -4,14 +4,15 @@ import io.bloco.faker.FakerComponent
 import io.bloco.faker.FakerData
 
 class Avatar(data: FakerData) : FakerComponent(data) {
+    @JvmOverloads
     fun image(
         slug: String? = "image",
         size: String = "300x300",
         format: String = "png",
         set: String = "set1",
         bgset: String? = null
     ): String {
-        require(size.matches("^\\d+x\\d+$".toRegex())) {
+        require(size.matches("^[0-9]+x[0-9]+$".toRegex())) {
             "Size should be specified in format 300x300"
         }
         require(SUPPORTED_FORMATS.contains(format)) {

lib/src/main/kotlin/io/bloco/faker/components/Bool.kt

@@ -4,6 +4,7 @@ import io.bloco.faker.FakerComponent
 import io.bloco.faker.FakerData
 
 class Bool(data: FakerData) : FakerComponent(data) {
+    @JvmOverloads
     fun bool(trueRatio: Float = 0.5f): Boolean {
         return Math.random() < trueRatio
     }

lib/src/main/kotlin/io/bloco/faker/components/Commerce.kt

@@ -10,13 +10,13 @@ class Commerce(data: FakerData) : FakerComponent(data) {
         return call("color.colorName")
     }
 
+    @JvmOverloads
     fun department(max: Int = 3, fixedAmount: Boolean = false): String {
         val num = if (fixedAmount) max else randomHelper.number(max) + 1
         val categories = getCategories(num)
         return if (num > 1) mergeCategories(categories) else categories.first()
     }
 
-
     fun productName(): String {
         return listOf(
             fetch("commerce.product_name.adjective"),
@@ -25,15 +25,16 @@ class Commerce(data: FakerData) : FakerComponent(data) {
         ).joinToString(" ")
     }
 
-
     fun material(): String {
         return fetch("commerce.product_name.material")
     }
 
+    @JvmOverloads
     fun price(min: Int = 0, max: Int = 100): BigDecimal {
         return BigDecimal(randomHelper.range(min, max)).setScale(2, RoundingMode.HALF_UP)
     }
 
+    @JvmOverloads
     fun promotionCode(digits: Int = 6): String {
         return listOf(
             fetch("commerce.promotion_code.adjective"),

lib/src/main/kotlin/io/bloco/faker/components/Date.kt

@@ -12,7 +12,7 @@ import java.util.Date
 import kotlin.random.Random
 
 class Date(fakerData: FakerData) : FakerComponent(fakerData) {
-    private var formatter: SimpleDateFormat = SimpleDateFormat("yyyy-MM-dd")
+    private val formatter = SimpleDateFormat("yyyy-MM-dd")
 
     fun between(from: String, to: String): Date {
         return try {
@@ -28,14 +28,17 @@ class Date(fakerData: FakerData) : FakerComponent(fakerData) {
         return between(from.toLocalDate(), to.toLocalDate())
     }
 
+    @JvmOverloads
     fun forward(numberOfDays: Int = DEFAULT_NUM_OF_DAYS): Date {
         return between(today(), today().plusDays(numberOfDays.toLong()))
     }
 
+    @JvmOverloads
     fun backward(numberOfDays: Int = DEFAULT_NUM_OF_DAYS): Date {
         return between(today().minusDays(numberOfDays.toLong()), today())
     }
 
+    @JvmOverloads
     fun birthday(minAge: Int = DEFAULT_MIN_AGE, maxAge: Int = DEFAULT_MAX_AGE): Date {
         return between(today().plusYears(minAge.toLong()), today().plusYears(maxAge.toLong()))
     }

lib/src/main/kotlin/io/bloco/faker/components/Internet.kt

@@ -4,18 +4,23 @@ import io.bloco.faker.FakerComponent
 import io.bloco.faker.FakerData
 
 class Internet(data: FakerData) : FakerComponent(data) {
+
+    @JvmOverloads
     fun email(name: String? = null): String {
         return userName(name) + "@" + domainName()
     }
 
+    @JvmOverloads
     fun freeEmail(name: String? = null): String {
         return userName(name) + "@" + fetch("internet.free_email")
     }
 
+    @JvmOverloads
     fun safeEmail(name: String? = null): String {
         return userName(name) + "@" + SAFE_EMAIL_HOST + randomHelper.sample(SAFE_EMAIL_TLDS)
     }
 
+    @JvmOverloads
     fun userName(specifier: String? = null, separators: List<String> = DEFAULT_SEPARATORS): String {
         val separator = randomHelper.sample(separators)
         return when {
@@ -34,6 +39,7 @@ class Internet(data: FakerData) : FakerComponent(data) {
         }
     }
 
+    @JvmOverloads
     fun password(
         minLength: Int = PASSWORD_MIN_LENGTH,
         maxLength: Int = PASSWORD_MAX_LENGTH,
@@ -105,6 +111,7 @@ class Internet(data: FakerData) : FakerComponent(data) {
         return "http://$host$path"
     }
 
+    @JvmOverloads
     fun slug(
         words: List<String> = listOf(fetch("lorem.words"), fetch("lorem.words")),
         glue: String = randomHelper.sample(DEFAULT_SLUG_GLUE)

lib/src/main/kotlin/io/bloco/faker/components/Lorem.kt

@@ -12,6 +12,7 @@ class Lorem(data: FakerData?) : FakerComponent(data!!) {
         return fetch("lorem.supplemental")
     }
 
+    @JvmOverloads
     fun words(num: Int = DEFAULT_NUM, supplemental: Boolean = DEFAULT_SUPPLEMENTAL): List<String> {
         return List(num) {
             if (supplemental && randomHelper.randBoolean()) {
@@ -30,6 +31,7 @@ class Lorem(data: FakerData?) : FakerComponent(data!!) {
         return List(count) { character() }.joinToString("")
     }
 
+    @JvmOverloads
     fun sentence(
         wordCount: Int = DEFAULT_WORD_COUNT,
         supplemental: Boolean = DEFAULT_SUPPLEMENTAL,
@@ -41,13 +43,15 @@ class Lorem(data: FakerData?) : FakerComponent(data!!) {
             .replaceFirstChar { it.titlecase() } + "."
     }
 
+    @JvmOverloads
     fun sentences(
         sentenceCount: Int = DEFAULT_SENTENCE_COUNT,
         supplemental: Boolean = DEFAULT_SUPPLEMENTAL
     ): List<String> {
         return List(sentenceCount) { sentence(DEFAULT_WORD_COUNT, supplemental) }
     }
 
+    @JvmOverloads
     fun paragraph(
         sentenceCount: Int = DEFAULT_SENTENCE_COUNT,
         supplemental: Boolean = DEFAULT_SUPPLEMENTAL,
@@ -58,13 +62,15 @@ class Lorem(data: FakerData?) : FakerComponent(data!!) {
         return sentences.joinToString(" ")
     }
 
+    @JvmOverloads
     fun paragraphs(
         paragraphCount: Int = DEFAULT_PARAGRAPH_COUNT,
         supplemental: Boolean = DEFAULT_SUPPLEMENTAL
     ): List<String> {
         return List(paragraphCount) { paragraph(DEFAULT_SENTENCE_COUNT, supplemental) }
     }
 
+    @JvmOverloads
     fun question(
         wordCount: Int = 4,
         supplemental: Boolean = false,
@@ -77,7 +83,7 @@ class Lorem(data: FakerData?) : FakerComponent(data!!) {
         return "$sentence?"
     }
 
-
+    @JvmOverloads
     fun questions(questionsCount: Int = 3, supplemental: Boolean = false): List<String> {
         return List(questionsCount) { question(3, supplemental) }
     }

lib/src/main/kotlin/io/bloco/faker/components/Name.kt

@@ -34,6 +34,7 @@ class Name(data: FakerData) : FakerComponent(data) {
         return parse(fetch("name.name_with_middle"))
     }
 
+    @Suppress("UNCHECKED_CAST")
     fun jobTitles(): List<String> {
         return getMap("name", "title")["job"] as List<String>
     }

lib/src/main/kotlin/io/bloco/faker/components/Number.kt

@@ -44,6 +44,7 @@ class Number(data: FakerData) : FakerComponent(data) {
         return "%0${digits}x".format(num)
     }
 
+    @JvmOverloads
     fun between(from: Int = DEFAULT_FROM, to: Int = DEFAULT_TO): Int {
         return randomHelper.range(from, to)
     }
@@ -56,6 +57,7 @@ class Number(data: FakerData) : FakerComponent(data) {
         return randomHelper.range(from, to)
     }
 
+    @JvmOverloads
     fun positive(from: Int = DEFAULT_FROM, to: Int = DEFAULT_TO): Int {
         return abs(between(from, to))
     }
@@ -68,6 +70,7 @@ class Number(data: FakerData) : FakerComponent(data) {
         return abs(between(from, to))
     }
 
+    @JvmOverloads
     fun negative(from: Int = DEFAULT_FROM, to: Int = DEFAULT_TO): Int {
         return abs(between(from, to)) * -1
     }

lib/src/main/kotlin/io/bloco/faker/components/Placeholdit.kt

@@ -4,6 +4,8 @@ import io.bloco.faker.FakerComponent
 import io.bloco.faker.FakerData
 
 class Placeholdit(data: FakerData) : FakerComponent(data) {
+
+    @JvmOverloads
     fun image(
         size: String = "300x300",
         format: String = "png",
@@ -32,7 +34,7 @@ class Placeholdit(data: FakerData) : FakerComponent(data) {
     companion object {
         val SUPPORTED_FORMATS = listOf("png", "jpg", "jpeg", "gif")
         private const val PLACEHOLDER_URL = "https://placehold.it/"
-        private const val SIZE_REGEX = "^\\d+x\\d+$"
-        private const val HEX_REGEX = "(^[\\da-fA-F]{3}$|^[\\da-fA-F]{6}$)(?!.*[^\\da-fA-F])"
+        private const val SIZE_REGEX =  "^[0-9]+x[0-9]+$"
+        private const val HEX_REGEX = "((?:^[0-9a-fA-F]{3}$)|(?:^[0-9a-fA-F]{6}$)){1}(?!.*[^0-9a-fA-F])"
     }
 }

lib/src/main/kotlin/io/bloco/faker/components/Time.kt

@@ -19,10 +19,12 @@ class Time(fakerData: FakerData) : FakerComponent(fakerData) {
         return between(from, to, Period.All)
     }
 
+    @JvmOverloads
     fun forward(numberOfDays: Int, period: Period = Period.All): Date {
         return randomTime(now(), period).plusDays(numberOfDays.toLong()).toDate()
     }
 
+    @JvmOverloads
     fun backward(numberOfDays: Int, period: Period = Period.All): Date {
         return randomTime(now(), period).minusDays(numberOfDays.toLong()).toDate()
     }

lib/src/main/kotlin/io/bloco/faker/helpers/StringHelper.kt

@@ -12,7 +12,7 @@ class StringHelper {
     }
 
     fun camelToSnake(input: String): String {
-        return input.replace("(?<=[a-zA-Z\\d])(\\p{Upper})".toRegex()) { matcher ->
+        return input.replace("(?<=\\w)(\\p{Upper})".toRegex()) { matcher ->
             "_" + matcher.groupValues[1].lowercase(Locale.getDefault())
         }.lowercase(Locale.getDefault())
     }

lib/src/test/kotlin/io/bloco/faker/components/ColorTest.kt

@@ -10,7 +10,7 @@ class ColorTest {
 
     @Test
     fun hexColor() {
-        assertTrue(faker.color.hexColor().matches(Regex("^#[\\da-f]{6}\$")))
+        assertTrue(faker.color.hexColor().matches(Regex("^#[0-9a-f]{6}$")))
     }
 
     @Test

lib/src/test/kotlin/io/bloco/faker/components/FoodTest.kt

@@ -31,7 +31,7 @@ class FoodTest {
     @Test
     fun measurement() {
         assertNotNull(faker.food.measurement())
-        assertTrue(faker.food.measurement().matches(Regex("[\\d/]+ \\w+")))
+        assertTrue(faker.food.measurement().matches(Regex("[\\d\\/]+ \\w+")))
     }
 
     @Test