Merge pull request #6 from EmilS/master

Maven Repo + Minor Changes to Main File  + Unit Tests

Author: mihai-vlc

.gitignore

@@ -0,0 +1 @@
+target

.travis.yml

@@ -0,0 +1,6 @@
+language: java
+jdk:
+ - openjdk7
+ - oraclejdk7
+notifications:
+ email: false

pom.xml

@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>VerbalExpressions</groupId>
+  <artifactId>JavaVerbalExpressions</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>JavaVerbalExpressions</name>
+  <url>https://github.com/VerbalExpressions/JavaVerbalExpressions</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  
+  <scm>
+      <connection>[email protected]:VerbalExpressions/JavaVerbalExpressions.git</connection>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+          <encoding>utf-8</encoding>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

VerbalExpression.java renamed to src/main/java/VerbalExpression.java

@@ -1,27 +1,33 @@
 import java.util.regex.Pattern;
 
 class VerbalExpression {
-    private String prefixes, source, suffixes, pattern = "";
+    private String prefixes = "", source = "", suffixes = "", pattern = "";
     private int modifiers = Pattern.MULTILINE;
 
+    public VerbalExpression () {
+        this.updatePattern();
+    }
+
     private String sanitize(String value) {
         if(value == null)
             return value;
         return Pattern.quote(value);
     }
 
     public VerbalExpression add(String value) {
-        this.source = this.source != null ? this.source + value : value;
-        if (this.source != null) {
-            Pattern p = Pattern.compile(this.prefixes + this.source + this.suffixes, this.modifiers);
-            this.pattern = p.pattern();
-        }
+        this.source += value;
+        return this.updatePattern();
+    }
+
+    public VerbalExpression updatePattern() {
+        Pattern p = Pattern.compile(this.prefixes + this.source + this.suffixes, this.modifiers);
+        this.pattern = p.pattern();
         return this;
     }
 
     public VerbalExpression startOfLine(boolean enable) {
         this.prefixes = enable ? "^" : "";
-        this.add("");
+        this.updatePattern();
         return this;
     }
 
@@ -31,7 +37,7 @@ public VerbalExpression startOfLine() {
 
     public VerbalExpression endOfLine(boolean enable) {
         this.suffixes = enable ? "$" : "";
-        this.add("");
+        this.updatePattern();
         return this;
     }
 
@@ -79,7 +85,7 @@ public VerbalExpression somethingBut(String value) {
     }
 
     public VerbalExpression replace(String source, String value) {
-        this.add("");
+        this.updatePattern();
         this.source.replaceAll(pattern,value);
         return this;
     }
@@ -159,7 +165,7 @@ public VerbalExpression addModifier(char modifier) {
                 break;
         }
 
-        this.add("");
+        this.updatePattern();
         return this;
     }
 
@@ -190,14 +196,14 @@ public VerbalExpression removeModifier(char modifier) {
                 break;
         }
 
-        this.add("");
+        this.updatePattern();
         return this;
     }
 
     public VerbalExpression withAnyCase(boolean enable) {
         if (enable) this.addModifier( 'i' );
         else this.removeModifier( 'i' );
-        this.add("");
+        this.updatePattern();
         return this;
     }
 
@@ -208,7 +214,7 @@ public VerbalExpression withAnyCase() {
     public VerbalExpression searchOneLine(boolean enable) {
         if (enable) this.removeModifier( 'm' );
         else this.addModifier( 'm' );
-        this.add("");
+        this.updatePattern();
         return this;
     }
 
@@ -235,12 +241,10 @@ public VerbalExpression or(String value) {
     }
 
     public boolean test(String toTest) {
-        this.add("");
         return Pattern.matches(this.pattern, toTest);
     }
 
     public String toString() {
-        this.add("");
         return this.pattern.toString();
     }
 }

src/test/java/TestRunner.java

@@ -0,0 +1,13 @@
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+
+public class TestRunner {
+   public static void main(String[] args) {
+      Result result = JUnitCore.runClasses(VerbalExpressionUnitTests.class);
+      for (Failure failure : result.getFailures()) {
+         System.out.println(failure.toString());
+      }
+      System.out.println(result.wasSuccessful());
+   }
+}  

src/test/java/TestSuite.java

@@ -0,0 +1,11 @@
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+//JUnit Suite Test
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ 
+   VerbalExpressionUnitTests.class
+})
+public class TestSuite {
+
+}