issue/152

README.md

@@ -55,7 +55,7 @@ Threshr is available to jvm projects via [maven central].
 <dependency>
   <groupId>com.graqr</groupId>
   <artifactId>threshr</artifactId>
-  <version>0.0.14</version>
+  <version>0</version>
 </dependency>
 ```
 
@@ -64,14 +64,14 @@ Threshr is available to jvm projects via [maven central].
 <details><summary>Gradle</summary>
 
 ```groovy
-implementation group: 'com.graqr', name: 'threshr', version: '0.0.14'
+implementation group: 'com.graqr', name: 'threshr', version: '0.0.15-SNAPSHOT'
 ```
 </details>
 
 <details><summary>Gradle Kotlin</summary>
 
 ```kotlin
-implementation("com.graqr:threshr:0.0.14")
+implementation("com.graqr:threshr:0.0.15-SNAPSHOT")
 ```
 </details>
 

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.graqr</groupId>
     <artifactId>threshr</artifactId>
-    <version>0.0.14</version>
+    <version>0.0.15-SNAPSHOT</version>
     <packaging>${packaging}</packaging>
 
     <parent>

src/main/java/com/graqr/threshr/model/queryparam/Page.java

@@ -3,6 +3,8 @@
 import com.graqr.threshr.ThreshrException;
 import lombok.Getter;
 
+import java.util.Arrays;
+
 /**
  * Query parameter in redsky api. Specifies from where an api call is made in the browser.
  */
@@ -21,19 +23,25 @@ public Page(String page) throws ThreshrException {
     }
 
     /**
-     * Sets string value as "/c/" + provided value.
+     * Sets string value as "/c/" + provided value. As a means of security, value is permitted to be 26 alphanumeric
+     * words delimited with either - or _
      *
      * @param name Query parameter in redsky api to specify from where an api call is made in the browser
      * @throws ThreshrException if string contains anything other than letters or is empty
      */
     public void setName(String name) throws ThreshrException {
         String tempPage = name.trim().toLowerCase();
+        String threshrException = "Expected non-space-character delimited string of up to 30 words, but got \"%s\".";
         if (tempPage.startsWith("/c/")) {
             tempPage = tempPage.substring(3);
         }
-        if (tempPage.matches(".+([^(a-z|\\-)]).+") || tempPage.isEmpty()) {
-            throw new ThreshrException(String.format(
-                    "Expected only letters for the page value, but received \"%s\".", tempPage));
+        if (tempPage.isEmpty()) {
+            throw new ThreshrException(String.format(threshrException, tempPage));
+        }
+        //regex "^([a-z\\d]+[-_]?){1,21}$" causes perpetual waiting in tests nearing word limit
+        long pageCount = Arrays.stream(tempPage.split("[-_]")).count();
+        if (pageCount > 30) {
+            throw new ThreshrException(String.format(threshrException, tempPage));
         }
         this.name = "/c/" + tempPage;
     }

src/test/groovy/com/graqr/threshr/model/queryparam/PageSpec.groovy

@@ -5,6 +5,7 @@ import io.micronaut.context.annotation.Value
 import io.micronaut.core.io.ResourceLoader
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import jakarta.inject.Inject
+import net.datafaker.Faker
 import spock.lang.Shared
 import spock.lang.Specification
 
@@ -69,6 +70,48 @@ class PageSpec extends Specification {
         expectedPages = getLinesFromFile("classpath:" + pagesFilepath)
     }
 
+    def "validate page title word count limit"() {
+        when: "create page title of #size word count"
+        Random randy = new Random()
+        String delimiter = randy.nextBoolean() ? "_" : "-"
+        String titleStart = randy.nextBoolean() ? "/c/" : ""
+        String pageValue = new Faker().lorem().sentence(size as int)
+        // weirdly, faker can sometimes add extra words. this is kinda documented, but doesn't make sense to me.
+        // this removes those extra words.
+        pageValue = pageValue.split(" ")[0..(size as int) - 1]
+                .join(delimiter)
+                .replace(".", "") // remove ending punctuation
+
+        and: "create page object whose title is '#pageValue'"
+        //noinspection GroovyResultOfObjectAllocationIgnored
+        new Page("$titleStart$pageValue")
+
+        then:
+        noExceptionThrown()
+
+        where:
+        size << (1..30)
+    }
+
+    def "Creating Page with title word count under or over limit fails"() {
+        when: "creating page with '#pageValue' title"
+        //noinspection GroovyResultOfObjectAllocationIgnored
+        new Page(pageValue)
+
+
+        then:
+        def exception = thrown(ThreshrException)
+        exception.message.contains("Expected non-space-character delimited string of up to 30 words, but got")
+
+
+        where:
+        pageValue                                                  | _
+        ""                                                         | _
+        "/c/"                                                      | _
+        "/c/" + new Faker().lorem().sentence(31).replace(" ", "-") | _
+        new Faker().lorem().sentence(31).replace(" ", "_")         | _
+    }
+
 
     def "test create new Page from #pageValue seed data creates object with expected value"() {
         given: