comments

Author: gekomad

.codecov.yml

@@ -1,12 +1,11 @@
-[![Build Status](https://travis-ci.com/gekomad/scala-regex-collection.svg?branch=master)](https://travis-ci.com/gekomad/scala-regex-collection) [![codecov.io](http://codecov.io/github/gekomad/scala-regex-collection/coverage.svg?branch=master)](http://codecov.io/github/gekomad/scala-regex-collection?branch=master)
-
+[![Build Status](https://travis-ci.com/gekomad/scala-regex-collection.svg?branch=master)](https://travis-ci.com/gekomad/scala-regex-collection)
 
 Scala regex collection
 =====================
 
 Scala-regex-collection is a pure scala regex collection
 ## Add the library to your project
-`libraryDependencies += "com.github.gekomad" %% "scala-regex-collection" % "1.0.0"`
+`libraryDependencies += "com.github.gekomad" %% "scala-regex-collection" % "1.0.1"`
 
  ## Using Library
 
@@ -123,6 +122,9 @@ Coordinates
 - [Coordinate1](https://github.com/gekomad/scala-regex-collection/wiki/Coordinate1)  (45°23'36.0" N 10°33'48.0" E)
 - [Coordinate2](https://github.com/gekomad/scala-regex-collection/wiki/Coordinate2)  (12:12:12.223546"N - 15:17:6"S - 12°30'23.256547"S)
 
+Programming
+
+- [Comments](https://github.com/gekomad/scala-regex-collection/wiki/Comments)  (/* foo */)
 
  ## Use the library
 
@@ -274,4 +276,4 @@ See the License for the specific language governing permissions and limitations
 
 ## Special Thanks ##
 
-To [regexlib.com](http://regexlib.com)
+To [regexlib.com](http://regexlib.com)

.travis.yml

@@ -1,13 +1,25 @@
 name := "scala-regex-collection"
 
-version := "1.0.0"
+version := "1.0.1"
 
-scalaVersion := "2.13.0"
+scalaVersion := "2.13.1"
 organization := "com.github.gekomad"
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % Test
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.0-M2" % Test
 
-crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.12.8","2.13.0")
+crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.12.8", "2.13.0", "2.13.1")
+
+scalacOptions ++= Seq(
+  "-deprecation",
+  "-encoding", "UTF-8",
+  "-language:postfixOps",
+  "-feature",
+  "-unchecked", // Enable additional warnings where generated code depends on assumptions.
+  "-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access.
+  "-Ywarn-dead-code", // Warn when dead code is identified.
+  "-explaintypes", // Explain type errors in more detail.
+  "-Xfatal-warnings"
+)
 
 publishTo := sonatypePublishTo.value
 

README.md

@@ -1 +1 @@
-sbt.version = 1.2.8
+sbt.version = 1.3.6

build.sbt

@@ -1,3 +1,2 @@
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype"  % "2.3")
 addSbtPlugin("com.jsuereth"   % "sbt-pgp"       % "1.1.1")
-addSbtPlugin("org.scoverage"  % "sbt-scoverage" % "1.6.0")

project/build.properties

@@ -6,13 +6,13 @@ import scala.util.Try
 import scala.util.matching.Regex
 
 object Validate {
-  implicit def validateIgnoreCase[A](a: String)(implicit f: Validator[A]): Option[String]  = f.validateIgnoreCase(a)
-  implicit def validate[A](a: String)(implicit f: Validator[A]): Option[String]            = f.validateCaseSensitive(a)
-  implicit def regexp[A](implicit f: Validator[A]): String                                 = f.regexp
-  implicit def findAllIgnoreCase[A](a: String)(implicit f: Validator[A]): List[String]     = f.findAllIgnoreCase(a)
-  implicit def findAll[A](a: String)(implicit f: Validator[A]): List[String]               = f.findAllCaseSensitive(a)
-  implicit def findFirstIgnoreCase[A](a: String)(implicit f: Validator[A]): Option[String] = f.findFirstIgnoreCase(a)
-  implicit def findFirst[A](a: String)(implicit f: Validator[A]): Option[String]           = f.findFirstCaseSensitive(a)
+  def validateIgnoreCase[A](a: String)(implicit f: Validator[A]): Option[String]  = f.validateIgnoreCase(a)
+  def validate[A](a: String)(implicit f: Validator[A]): Option[String]            = f.validateCaseSensitive(a)
+  def regexp[A](implicit f: Validator[A]): String                                 = f.regexp
+  def findAllIgnoreCase[A](a: String)(implicit f: Validator[A]): List[String]     = f.findAllIgnoreCase(a)
+  def findAll[A](a: String)(implicit f: Validator[A]): List[String]               = f.findAllCaseSensitive(a)
+  def findFirstIgnoreCase[A](a: String)(implicit f: Validator[A]): Option[String] = f.findFirstIgnoreCase(a)
+  def findFirst[A](a: String)(implicit f: Validator[A]): Option[String]           = f.findFirstCaseSensitive(a)
 }
 
 trait Email
@@ -95,6 +95,8 @@ trait Celsius
 trait Fahrenheit
 trait HtmlHref
 
+trait Comments
+
 object Collection {
 
   import java.time._
@@ -107,16 +109,16 @@ object Collection {
     def findAllCaseSensitive(a: String): List[String]
     def findFirstIgnoreCase(a: String): Option[String]
     def findFirstCaseSensitive(a: String): Option[String]
-    val regexp: String
+    def regexp: String
   }
 
   object Validator {
     def apply[A](reg: String): Validator[A] = new Validator[A] {
       override val regexp: String = reg
       val regex: Regex            = reg.r
-      val regexIgn: Regex         = ("(?i)" + reg).r
-      val regexExact: Regex       = ('^' + reg + '$').r
-      val regexExactIgn: Regex    = ("^(?i)" + reg + '$').r
+      val regexIgn: Regex         = s"(?i)$reg".r
+      val regexExact: Regex       = s"^$reg$$".r
+      val regexExactIgn: Regex    = s"^(?i)$reg$$".r
 
       override def validateIgnoreCase(a: String): Option[String]    = regexExactIgn.findFirstMatchIn(a).map(_ => a)
       override def validateCaseSensitive(a: String): Option[String] = regexExact.findFirstMatchIn(a).map(_ => a)
@@ -261,6 +263,7 @@ object Collection {
   implicit val validatorTime: Validator[Time] =
     Validator[Time]("""(([0-9]|[0-1][0-9]|[2][0-3]):([0-5][0-9])(\s{0,1})(AM|PM|am|pm|aM|Am|pM|Pm{2,2})$)|(^([0-9]|[1][0-9]|[2][0-3])(\s{0,1})(AM|PM|am|pm|aM|Am|pM|Pm{2,2}))""")
 
+  implicit val validatorComment: Validator[Comments]            = Validator[Comments]("""(\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/)""")
   implicit val validatorLocalDateTime: Validator[LocalDateTime] = Validator[LocalDateTime]((a: String) => Try(LocalDateTime.parse(a, ISO_LOCAL_DATE_TIME)).toOption.map(_ => a))
 
   implicit val validatorLocalDate: Validator[LocalDate] = Validator[LocalDate]((a: String) => Try(LocalDate.parse(a, ISO_LOCAL_DATE)).toOption.map(_ => a))

project/plugins.sbt

@@ -1,6 +1,6 @@
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
-class FindAll extends FunSuite {
+class FindAll extends AnyFunSuite {
 
   test("Email") {
     import com.github.gekomad.regexcollection.Email
@@ -72,4 +72,10 @@ class FindAll extends FunSuite {
     assert(findAllIgnoreCase[Bar]("bar [email protected] hi hello [email protected] 123 [email protected]") == List("[email protected]", "[email protected]"))
     assert(findAll[Bar]("bar [email protected] hi hello [email protected] 123 [email protected]") == List("[email protected]"))
   }
+
+  test("Comments") {
+    import com.github.gekomad.regexcollection.Comments
+    import com.github.gekomad.regexcollection.Validate.findAll
+    assert(findAll[Comments]("""/*foo*/ bar /*baz*/ 10%  dg 55% """) == List("/*foo*/", "/*baz*/"))
+  }
 }

src/main/scala/com/github/gekomad/regexcollection/Validator.scala

@@ -1,6 +1,6 @@
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
-class FindFirst extends FunSuite {
+class FindFirst extends AnyFunSuite {
 
   test("Email") {
     import com.github.gekomad.regexcollection.Email
@@ -72,4 +72,10 @@ class FindFirst extends FunSuite {
     assert(findFirstIgnoreCase[Bar]("bar [email protected] hi hello [email protected] 123 [email protected]") == Some("[email protected]"))
     assert(findFirst[Bar]("bar [email protected] hi hello [email protected] 123 [email protected]") == Some("[email protected]"))
   }
+
+  test("Comments") {
+    import com.github.gekomad.regexcollection.Comments
+    import com.github.gekomad.regexcollection.Validate.findFirst
+    assert(findFirst[Comments]("/*foo*/ bar /*baz*/ 10%  dg 55% ") == Some("/*foo*/"))
+  }
 }

src/test/scala/FindAll.scala

@@ -0,0 +1,47 @@
+import org.scalatest.funsuite.AnyFunSuite
+
+class ReadFile extends AnyFunSuite {
+
+  ignore("Extract from files") {
+    import scala.io.Source
+    import com.github.gekomad.regexcollection._
+    import com.github.gekomad.regexcollection.Validate.findAll
+    import java.io.File
+    import scala.util.Try
+    def getListOfFiles(dir: String)(f : File => Unit): Unit = {
+      def go(dir: File): Unit= dir match {
+        case d if d.exists && d.isDirectory && d.canRead=>
+          val files = d.listFiles.filter(a => a.canRead && a.isFile).toList
+          val dirs  = dir.listFiles.filter(_.isDirectory).toList
+          files.foreach(f)
+          dirs.foreach(go)
+        case _ => ()
+      }
+      go(new File(dir))
+    }
+
+   getListOfFiles("/") { filename =>
+      Try {
+        for (line <- Source.fromFile(filename).getLines) {
+          findAll[Email](line).foreach(a => println(s"$filename: [Email] $a"))
+          findAll[Time24](line).foreach(a => println(s"$filename: [Time24] $a"))
+          findAll[ApacheError](line).foreach(a => println(s"$filename: [ApacheError] $a"))
+          findAll[BitcoinAdd](line).foreach(a => println(s"$filename: [BitcoinAdd] $a"))
+          findAll[Celsius](line).foreach(a => println(s"$filename: [Celsius] $a"))
+          findAll[Comments](line).foreach(a => println(s"$filename: [Comments] $a"))
+          findAll[Coordinate](line).foreach(a => println(s"$filename: [Coordinate] $a"))
+          findAll[Coordinate1](line).foreach(a => println(s"$filename: [Coordinate1] $a"))
+          findAll[Coordinate2](line).foreach(a => println(s"$filename: [Coordinate2] $a"))
+          findAll[Cron](line).foreach(a => println(s"$filename: [Cron] $a"))
+          findAll[DMY](line).foreach(a => println(s"$filename: [DMY] $a"))
+          findAll[DMY2](line).foreach(a => println(s"$filename: [DMY2] $a"))
+          findAll[DMY3](line).foreach(a => println(s"$filename: [DMY3] $a"))
+          findAll[UUID](line).foreach(a => println(s"$filename: [UUID] $a"))
+          findAll[Youtube](line).foreach(a => println(s"$filename: [Youtube] $a"))
+
+        }
+      }
+    }
+  }
+
+}