Skip to content
This repository has been archived by the owner on Mar 11, 2018. It is now read-only.

Issue #24 fix character classes #25

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Issue #24 fix character classes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
317e0c1
#24 make tests reproduce bug, fix ranges
Nov 17, 2015
ec554e7
#24 use more idiomatic expressions for ranges, simplify filters
Nov 17, 2015
438e1b8
#24 simplify filters
Nov 17, 2015
6e69965
#24 simplify filters
Nov 17, 2015
408b7e5
#24 make `ignoreAlphaCase` backwards-compatible
Nov 17, 2015
b605102
#24 introduce aggregate character classes, simplify filters
Nov 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 25 additions & 43 deletions core/src/main/scala/com/rockymadden/stringmetric/transform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,66 +1,48 @@
package com.rockymadden.stringmetric

import scala.collection.immutable.NumericRange

trait transform {
private val Ascii = NumericRange(0x00, 0x7F, 1)
private val ExtendedAscii = NumericRange(0x00, 0x7F, 1)
private val Latin = NumericRange(0x00, 0x24F, 1)
private val LowerCase = NumericRange(0x61, 0x7A, 1)
private val Numbers = NumericRange(0x30, 0x39, 1)
private val UpperCase = NumericRange(0x41, 0x5A, 1)

private val filter: ((Array[Char], (Char => Boolean)) => String) = (ca, f) =>
ca.filter(c => f(c)).mkString

private val filterNot: ((Array[Char], (Char => Boolean)) => String) = (ca, f) =>
ca.filterNot(c => f(c)).mkString
private lazy val Ascii = 0x00.toChar to 0x7F.toChar
private lazy val ExtendedAscii = 0x00.toChar to 0x7F.toChar
private lazy val Latin = 0x00.toChar to 0x24F.toChar
private lazy val LowerCase = 'a' to 'z'
private lazy val Numbers = '0' to '9'
private lazy val UpperCase = 'A' to 'Z'
private lazy val Alpha = LowerCase ++ UpperCase
private lazy val AlphaNumeric = Alpha ++ Numbers

val filterAlpha: StringTransform = (ca) => filter(ca, c => {
val ci = c.toInt
LowerCase.contains(ci) || UpperCase.contains(ci)
})
val filterAlpha: StringTransform = _.filter(Alpha.contains)

val filterNotAlpha: StringTransform = (ca) => filterNot(ca, c => {
val ci = c.toInt
LowerCase.contains(ci) || UpperCase.contains(ci)
})
val filterNotAlpha: StringTransform = _.filterNot(Alpha.contains)

val filterAlphaNumeric: StringTransform = (ca) => filter(ca, c => {
val ci = c.toInt
LowerCase.contains(ci) || UpperCase.contains(ci) || Numbers.contains(ci)
})
val filterAlphaNumeric: StringTransform = _.filter(AlphaNumeric.contains)

val filterNotAlphaNumeric: StringTransform = (ca) => filterNot(ca, c => {
val ci = c.toInt
LowerCase.contains(ci) || UpperCase.contains(ci) || Numbers.contains(ci)
})
val filterNotAlphaNumeric: StringTransform = _.filterNot(AlphaNumeric.contains)

val filterAscii: StringTransform = (ca) => filter(ca, c => Ascii.contains(c.toInt))
val filterAscii: StringTransform = _.filter(Ascii.contains)

val filterNotAscii: StringTransform = (ca) => filterNot(ca, c => Ascii.contains(c.toInt))
val filterNotAscii: StringTransform = _.filterNot(Ascii.contains)

val filterExtendedAscii: StringTransform = (ca) => filter(ca, c => ExtendedAscii.contains(c.toInt))
val filterExtendedAscii: StringTransform = _.filter(ExtendedAscii.contains)

val filterNotExtendedAscii: StringTransform = (ca) => filterNot(ca, c => ExtendedAscii.contains(c.toInt))
val filterNotExtendedAscii: StringTransform = _.filterNot(ExtendedAscii.contains)

val filterLatin: StringTransform = (ca) => filter(ca, c => Latin.contains(c.toInt))
val filterLatin: StringTransform = _.filter(Latin.contains)

val filterNotLatin: StringTransform = (ca) => filterNot(ca, c => Latin.contains(c.toInt))
val filterNotLatin: StringTransform = _.filterNot(Latin.contains)

val filterLowerCase: StringTransform = (ca) => filter(ca, c => LowerCase.contains(c.toInt))
val filterLowerCase: StringTransform = _.filter(LowerCase.contains)

val filterNotLowerCase: StringTransform = (ca) => filterNot(ca, c => LowerCase.contains(c.toInt))
val filterNotLowerCase: StringTransform = _.filterNot(LowerCase.contains)

val filterNumeric: StringTransform = (ca) => filter(ca, c => Numbers.contains(c.toInt))
val filterNumeric: StringTransform = _.filter(Numbers.contains)

val filterNotNumeric: StringTransform = (ca) => filterNot(ca, c => Numbers.contains(c.toInt))
val filterNotNumeric: StringTransform = _.filterNot(Numbers.contains)

val filterUpperCase: StringTransform = (ca) => filter(ca, c => UpperCase.contains(c.toInt))
val filterUpperCase: StringTransform = _.filter(UpperCase.contains)

val filterNotUpperCase: StringTransform = (ca) => filterNot(ca, c => UpperCase.contains(c.toInt))
val filterNotUpperCase: StringTransform = _.filterNot(UpperCase.contains)

val ignoreAlphaCase: StringTransform = (ca) => ca.map(c => if (c >= 65 && c <= 90) (c + 32).toChar else c)
val ignoreAlphaCase: StringTransform = _.map(c => if (UpperCase contains c) c.toLower else c)
}

object transform extends transform
56 changes: 28 additions & 28 deletions core/src/test/scala/com/rockymadden/stringmetric/transformSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,51 @@ object transformSpec extends org.specs2.mutable.SpecificationWithJUnit {
"filterAlpha()" should {
"return transformed" in {
filterAlpha(
("aBc123" + 0x250.toChar).toCharArray
) must beEqualTo("aBc".toCharArray)
("aBc123zZ" + 0x5B.toChar + 0x7B.toChar).toCharArray
) must beEqualTo("aBczZ".toCharArray)
}
}

"filterNotAlpha()" should {
"return transformed" in {
filterNotAlpha(
("aBc123" + 0x250.toChar).toCharArray
("aBc123zZ" + 0x5B.toChar + 0x7B.toChar).toCharArray
) must beEqualTo(
("123" + 0x250.toChar).toCharArray
("123" + 0x5B.toChar + 0x7B.toChar).toCharArray
)
}
}

"filterAlphaNumeric()" should {
"return transformed" in {
filterAlphaNumeric(
("aBc123" + 0x250.toChar).toCharArray
) must beEqualTo("aBc123".toCharArray)
("aBc123zZ9" + 0x3A.toChar + 0x5B.toChar + 0x7B.toChar).toCharArray
) must beEqualTo("aBc123zZ9".toCharArray)
}
}

"filterNotAlphaNumeric()" should {
"return transformed" in {
filterNotAlphaNumeric(
("aBc123" + 0x250.toChar).toCharArray
("aBc123zZ9" + 0x3A.toChar + 0x5B.toChar + 0x7B.toChar).toCharArray
) must beEqualTo(
("" + 0x250.toChar).toCharArray
("" + 0x3A.toChar + 0x5B.toChar + 0x7B.toChar).toCharArray
)
}
}

"filterAscii()" should {
"return transformed" in {
filterAscii(
("aBc" + 0x80.toChar).toCharArray
) must beEqualTo("aBc".toCharArray)
("aBc" + 0x7F.toChar + 0x100.toChar).toCharArray
) must beEqualTo(("aBc" + 0x7F.toChar).toCharArray)
}
}

"filterNotAscii()" should {
"return transformed" in {
filterNotAscii(
("aBc" + 0x100.toChar).toCharArray
("aBc" + 0x7F.toChar + 0x100.toChar).toCharArray
) must beEqualTo(
("" + 0x100.toChar).toCharArray
)
Expand All @@ -60,15 +60,15 @@ object transformSpec extends org.specs2.mutable.SpecificationWithJUnit {
"filterExtendedAscii()" should {
"return transformed" in {
filterExtendedAscii(
("aBc" + 0x100.toChar).toCharArray
) must beEqualTo("aBc".toCharArray)
("aBc" + 0x7F.toChar + 0x100.toChar).toCharArray
) must beEqualTo(("aBc" + 0x7F.toChar).toCharArray)
}
}

"filterNotExtendedAscii()" should {
"return transformed" in {
filterNotExtendedAscii(
("aBc" + 0x250.toChar).toCharArray
("aBc" + 0x7F.toChar + 0x250.toChar).toCharArray
) must beEqualTo(
("" + 0x250.toChar).toCharArray
)
Expand All @@ -78,15 +78,15 @@ object transformSpec extends org.specs2.mutable.SpecificationWithJUnit {
"filterLatin()" should {
"return transformed" in {
filterLatin(
("aBc" + 0x250.toChar).toCharArray
) must beEqualTo("aBc".toCharArray)
("aBc" + 0x24F.toChar + 0x250.toChar).toCharArray
) must beEqualTo(("aBc" + 0x24F.toChar).toCharArray)
}
}

"filterNotLatin()" should {
"return transformed" in {
filterNotLatin(
("aBc" + 0x300.toChar).toCharArray
("aBc" + 0x24F.toChar + 0x300.toChar).toCharArray
) must beEqualTo(
("" + 0x300.toChar).toCharArray
)
Expand All @@ -96,15 +96,15 @@ object transformSpec extends org.specs2.mutable.SpecificationWithJUnit {
"filterLowerCase()" should {
"return transformed" in {
filterLowerCase(
"aBc123" + 0x250.toChar
) must beEqualTo("ac".toCharArray)
"aBc123z" + 0x250.toChar
) must beEqualTo("acz".toCharArray)
}
}

"filterNotLowerCase()" should {
"return transformed" in {
filterNotLowerCase(
("aBc123" + 0x250.toChar).toCharArray
("aBc123z" + 0x250.toChar).toCharArray
) must beEqualTo(
("B123" + 0x250.toChar).toCharArray
)
Expand All @@ -114,15 +114,15 @@ object transformSpec extends org.specs2.mutable.SpecificationWithJUnit {
"filterNumeric()" should {
"return transformed" in {
filterNumeric(
("aBc123" + 0x250.toChar).toCharArray
) must beEqualTo("123".toCharArray)
("aBc1239" + 0x250.toChar).toCharArray
) must beEqualTo("1239".toCharArray)
}
}

"filterNotNumeric()" should {
"return transformed" in {
filterNotNumeric(
("aBc123" + 0x250.toChar).toCharArray
("aBc1239" + 0x250.toChar).toCharArray
) must beEqualTo(
("aBc" + 0x250.toChar).toCharArray
)
Expand All @@ -132,15 +132,15 @@ object transformSpec extends org.specs2.mutable.SpecificationWithJUnit {
"filterUpperCase()" should {
"return transformed" in {
filterUpperCase(
("aBc123" + 0x250.toChar).toCharArray
) must beEqualTo("B".toCharArray)
("aBc123Z" + 0x250.toChar).toCharArray
) must beEqualTo("BZ".toCharArray)
}
}

"filterNotUpperCase()" should {
"return transformed" in {
filterNotUpperCase(
("aBc123" + 0x250.toChar).toCharArray
("aBc123Z" + 0x250.toChar).toCharArray
) must beEqualTo(
("ac123" + 0x250.toChar).toCharArray
)
Expand All @@ -150,9 +150,9 @@ object transformSpec extends org.specs2.mutable.SpecificationWithJUnit {
"ignoreAlphaCase()" should {
"return transformed" in {
ignoreAlphaCase(
("aBc123" + 0x250.toChar).toCharArray
("aBc123zZ" + 0x250.toChar).toCharArray
) must beEqualTo(
("abc123" + 0x250.toChar).toCharArray
("abc123zz" + 0x250.toChar).toCharArray
)
}
}
Expand Down