Merge 38b58d92d1164a97cfb44d2e05d0bec9f07743b0 into 23c2c01bf07b924ac9b860fa2771bf6ceb246ad5

src/main/java/io/zipcoder/Item.java

@@ -1,11 +1,10 @@
 package io.zipcoder;
 
-public class Item {
+public class Item{
     private String name;
     private Double price;
     private String type;
     private String expiration;
-
     /**
      * Item should not be created unless you have all of the elements, which is why you are forcing
      * it to be set in the constructor. In ItemParser, if you do not find all the elements of a Item,
@@ -22,22 +21,18 @@ public class Item {
         this.expiration = expiration;
     }
 
-    public String getName() {
-        return name;
+    public Item(String name, String price, String type, String expiration) {
     }
 
-
-    public Double getPrice() {
-        return price;
+    public String getName(){
+        return name;
     }
 
-
-    public String getType() {
+    public String getType(){
         return type;
     }
 
-
-    public String getExpiration() {
+    public String getExpiration(){
         return expiration;
     }
 
@@ -45,4 +40,17 @@ public class Item {
     public String toString(){
         return "name:" + name + " price:" + price + " type:" + type + " expiration:" + expiration;
     }
+
+//    public String formattedOutput(){
+//        StringBuilder stringBuilder = new StringBuilder();
+//        stringBuilder.append("name:\t" + name)
+//                .append("\t\tseen: "+  +" times\n")
+//                .append("=============\t\t=============\n");
+//        for(     ){
+//            stringBuilder.append("Price:\t"+
+//                    .append("\t\tseen: "+  +" times\n")
+//                    .append("-------------\t\t-------------\n");
+//        }
+//        return stringBuilder.toString();
+//    }
 }

src/main/java/io/zipcoder/ItemParseException.java

@@ -1,4 +1,15 @@
 package io.zipcoder;
 
-public class ItemParseException extends Exception {
+public class ItemParseException extends Exception{
+
+    public static int numberOfErrors = 0;
+
+    public ItemParseException(String errors){
+        super(errors);
+        numberOfErrors++;
+    }
+
+    public static String errorsOutput(){
+        return "Errors\t\t\t\tseen: " + numberOfErrors + " times";
+    }
 }

src/main/java/io/zipcoder/ItemParser.java

@@ -2,9 +2,12 @@ package io.zipcoder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
 
-public class ItemParser {
+import static com.sun.tools.javac.util.StringUtils.toLowerCase;
 
+public class ItemParser{
 
     public ArrayList<String> parseRawDataIntoStringArray(String rawData){
         String stringPattern = "##";
@@ -13,11 +16,72 @@ public class ItemParser {
     }
 
     public Item parseStringIntoItem(String rawItem) throws ItemParseException{
-        return null;
+
+        ArrayList<String> kvp = findKeyValuePairsInRawItemData(rawItem);
+
+        String name;
+        Double price;
+        String type;
+        String expiration;
+
+        //name block (with regex for milk, bread, cookies, apples)
+        Pattern namePattern = Pattern.compile("([Nn][Aa][Mm][Ee]):(\\w*\\d*)");
+        Matcher nameMatcher = namePattern.matcher(kvp.get(0));
+        if(nameMatcher.matches()){
+            name = nameMatcher.group(2);
+        }
+        else {
+            throw new ItemParseException("invalid name");
+        }
+
+        //price block (with regex for all prices)
+        Pattern pricePattern = Pattern.compile("([Pp][Rr][Ii][Cc][Ee]):(\\d.\\d\\d)");
+        Matcher priceMatcher = pricePattern.matcher(kvp.get(1));
+        if(priceMatcher.matches()){
+            price = Double.parseDouble(priceMatcher.group(2));
+        }
+        else {
+            throw new ItemParseException("invalid price");
+        }
+
+        //type block (with regex for all types)
+        Pattern typePattern = Pattern.compile("([Tt][Yy][Pp][Ee]):([A-Za-z0-9]*)");
+        Matcher typeMatcher = typePattern.matcher(kvp.get(2));
+        if(typeMatcher.matches()){
+            type = typeMatcher.group(2);
+        }
+        else {
+            throw new ItemParseException("invalid type");
+        }
+
+        //expiration block (with regex for all dates)
+        Pattern expPattern = Pattern.compile("([Ee][Xx][Pp][Ii][Rr][Aa][Tt][Ii][Oo][Nn]):(\\d/\\d{2}/\\d{4})##");
+        Matcher expMatcher = expPattern.matcher(kvp.get(3));
+        if(expMatcher.matches()){
+            expiration = expMatcher.group(2);
+        }
+        else {
+            throw new ItemParseException("invalid expiration");
+        }
+        return new Item(name, price, type, expiration);
+    }
+
+    //want to check and change spelling and casing here
+    public String checkSpelling(String itemName){
+        Matcher matcher = Pattern.compile("0", Pattern.CASE_INSENSITIVE).matcher(itemName);
+        matcher.find();
+        return matcher.replaceAll("o");
+    }
+
+    public String checkCase(String itemName){
+        if(itemName != null){
+            itemName = checkSpelling(toLowerCase(itemName));
+        }
+        return itemName;
     }
 
     public ArrayList<String> findKeyValuePairsInRawItemData(String rawItem){
-        String stringPattern = "[;|^]";
+        String stringPattern = "[;|^|!|%|*|@]";
         ArrayList<String> response = splitStringWithRegexPattern(stringPattern , rawItem);
         return response;
     }
@@ -26,6 +90,7 @@ public class ItemParser {
         return new ArrayList<String>(Arrays.asList(inputString.split(stringPattern)));
     }
 
-
-
+    public void errors(){
+        System.out.println(ItemParseException.errorsOutput());
+    }
 }

src/main/java/io/zipcoder/Main.java

@@ -2,7 +2,6 @@ package io.zipcoder;
 
 import org.apache.commons.io.IOUtils;
 
-
 public class Main {
 
     public String readRawDataToString() throws Exception{
@@ -13,7 +12,8 @@ public class Main {
 
     public static void main(String[] args) throws Exception{
         String output = (new Main()).readRawDataToString();
-        System.out.println(output);
-        // TODO: parse the data in output into items, and display to console.
+        ItemParser itemParser = new ItemParser();
+        //insert formatted output here?
+        itemParser.errors();
     }
 }

src/test/java/io/zipcoder/ItemParserTest.java

@@ -1,6 +1,5 @@
 package io.zipcoder;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -12,9 +11,9 @@ public class ItemParserTest {
 
     private String rawSingleItem =    "naMe:Milk;price:3.23;type:Food;expiration:1/25/2016##";
 
-    private String rawSingleItemIrregularSeperatorSample = "naMe:MiLK;price:3.23;type:Food^expiration:1/11/2016##";
+    private String rawSingleItemIrregularSeparatorSample = "naMe:MiLK;price:3.23;type:Food^expiration:1/11/2016##";
 
-    private String rawBrokenSingleItem =    "naMe:Milk;price:3.23;type:Food;expiration:1/25/2016##";
+    private String rawBrokenSingleItem =    "naMe:Milk;price:;type:Food;expiration:1/25/2016##";
 
     private String rawMultipleItems = "naMe:Milk;price:3.23;type:Food;expiration:1/25/2016##"
                                       +"naME:BreaD;price:1.23;type:Food;expiration:1/02/2016##"
@@ -36,7 +35,7 @@ public class ItemParserTest {
 
     @Test
     public void parseStringIntoItemTest() throws ItemParseException{
-        Item expected = new Item("milk", 3.23, "food","1/25/2016");
+        Item expected = new Item("Milk", 3.23, "Food","1/25/2016");
         Item actual = itemParser.parseStringIntoItem(rawSingleItem);
         assertEquals(expected.toString(), actual.toString());
     }
@@ -56,7 +55,7 @@ public class ItemParserTest {
     @Test
     public void findKeyValuePairsInRawItemDataTestIrregular(){
         Integer expected = 4;
-        Integer actual = itemParser.findKeyValuePairsInRawItemData(rawSingleItemIrregularSeperatorSample).size();
+        Integer actual = itemParser.findKeyValuePairsInRawItemData(rawSingleItemIrregularSeparatorSample).size();
         assertEquals(expected, actual);
     }
 }