Merge pull request #54 from 47deg/nm-31-magic

Pulling in the magic strings from an online source
47degrees · Jul 6, 2017 · c7e3548 · c7e3548
2 parents c6891f3 + 16d7376
commit c7e3548
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "magic/big-list-of-naughty-strings"]
+	path = magic/big-list-of-naughty-strings
+	url = https://github.com/minimaxir/big-list-of-naughty-strings.git
diff --git a/magic/big-list-of-naughty-strings b/magic/big-list-of-naughty-strings
diff --git a/magic/src/main/resources/blns.txt b/magic/src/main/resources/blns.txt
@@ -0,0 +1 @@
+../../../big-list-of-naughty-strings/blns.txt
diff --git a/magic/src/main/scala/com/fortysevendeg/scalacheck/magic/Magic.scala b/magic/src/main/scala/com/fortysevendeg/scalacheck/magic/Magic.scala
@@ -22,8 +22,16 @@ import org.scalacheck.Arbitrary.arbitrary
 
 object Magic {
 
-  private[magic] val strings =
-    List("This", "is", "a", "temporary", "list", "of", "strings")
+  val stream = getClass.getResourceAsStream("/blns.txt")
+
+  private[magic] val strings = scala.io.Source
+    .fromInputStream(stream)
+    .getLines
+    .filterNot { s =>
+      val trimmed = s.trim
+      trimmed.startsWith("#") || trimmed.isEmpty
+    }
+    .toList
 
   val magicStrings: Gen[String] = oneOf(strings)
 

diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
@@ -73,4 +73,4 @@ object ProjectPlugin extends AutoPlugin {
         "docs/unidoc".asRunnableItemFull
       )
     )
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,4 +73,4 @@ object ProjectPlugin extends AutoPlugin { @@
             "docs/unidoc".asRunnableItemFull
           )
         )
-    }
+    }