Merge 169665e2d3981241d829c788a190b89f22dbab8d into 23c2c01bf07b924ac9b860fa2771bf6ceb246ad5

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

@@ -1,15 +1,18 @@
 package io.zipcoder;
 
+import java.util.ArrayList;
+
 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,
-     * you should throw an Custom Exception.
+     * you should throw a Custom Exception.
      * @param name
      * @param price
      * @param type
@@ -23,7 +26,7 @@ public class Item {
     }
 
     public String getName() {
-        return name;
+        return null;
     }
 
 
@@ -45,4 +48,5 @@ public class Item {
     public String toString(){
         return "name:" + name + " price:" + price + " type:" + type + " expiration:" + expiration;
     }
+
 }

src/main/java/io/zipcoder/ItemList.java

@@ -0,0 +1,15 @@
+package io.zipcoder;
+
+import java.util.ArrayList;
+
+public class ItemList {
+
+    ArrayList<String> itemList = new ArrayList<String>();
+
+    public ArrayList<String> getItemList() {
+        return itemList;
+    }
+    public void addItem(String s){
+        itemList.add(s);
+    }
+}

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

@@ -1,4 +1,15 @@
 package io.zipcoder;
 
+
 public class ItemParseException extends Exception {
+
+    public static int numberOfExceptionsThrown;
+
+    public ItemParseException(){
+        numberOfExceptionsThrown++;
+    }
+    public static int getNumberOfTimesThrown(){
+        return numberOfExceptionsThrown;
+    }
+
 }

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

@@ -2,19 +2,52 @@ package io.zipcoder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class ItemParser {
 
-
     public ArrayList<String> parseRawDataIntoStringArray(String rawData){
         String stringPattern = "##";
         ArrayList<String> response = splitStringWithRegexPattern(stringPattern , rawData);
         return response;
     }
 
-    public Item parseStringIntoItem(String rawItem) throws ItemParseException{
-        return null;
+    public int countMatches(Matcher matcher){
+        int count = 0;
+        while (matcher.find()){
+            count++;
+        }
+        return count;
     }
+    public Item parseStringIntoItem(String rawItem) throws ItemParseException {
+        String name;
+        Double price;
+        String type;
+        String expiration;
+        Item item = null;
+
+        Matcher m = Pattern.compile(":([^,].+?)(\\W|;|\\^|!|%|\\*|@)").matcher(rawItem);
+
+        int numberOfMatches = countMatches(m);
+        final int REQUIRED_NUMBER_OF_FIELDS_FOR_ITEM = 4;
+        if (numberOfMatches <  REQUIRED_NUMBER_OF_FIELDS_FOR_ITEM){
+            throw  new ItemParseException();
+        }
+        m.reset();
+            while (m.find()){
+                name = m.group(1).toLowerCase();
+                m.find();
+                price = Double.parseDouble(m.group(1));
+                m.find();
+                type = m.group(1).toLowerCase();
+                m.find();
+                expiration = m.group(1);
+                item = new Item(name, price, type, expiration);
+            }
+        return item;
+        }
+
 
     public ArrayList<String> findKeyValuePairsInRawItemData(String rawItem){
         String stringPattern = "[;|^]";

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

@@ -2,18 +2,39 @@ package io.zipcoder;
 
 import org.apache.commons.io.IOUtils;
 
+import java.util.ArrayList;
+
 
 public class Main {
 
-    public String readRawDataToString() throws Exception{
+    static ItemList itemList = new ItemList();
+
+    public ArrayList<String> readRawDataToString() throws Exception {
         ClassLoader classLoader = getClass().getClassLoader();
         String result = IOUtils.toString(classLoader.getResourceAsStream("RawData.txt"));
-        return result;
+        ItemParser itemParser = new ItemParser();
+        ArrayList<String> myArray = itemParser.parseRawDataIntoStringArray(result);
+        System.out.println(myArray);
+        return myArray;
     }
 
-    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.
+    public static void main(String[] args) throws Exception {
+        ArrayList<String> output = (new Main()).readRawDataToString();
+        ItemParser itemParser = new ItemParser();
+        for (String s : output) {
+            try{
+            itemParser.parseStringIntoItem(s);
+
+
+            } catch (ItemParseException e) {
+                    continue;
+                }
+            }
+            System.out.println();
+            // TODO: parse the data in output into items, and display to console.
+        }
+
     }
-}
+
+
+

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;
 
@@ -14,7 +13,7 @@ public class ItemParserTest {
 
     private String rawSingleItemIrregularSeperatorSample = "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:;price:3.23;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##"
@@ -35,14 +34,14 @@ public class ItemParserTest {
     }
 
     @Test
-    public void parseStringIntoItemTest() throws ItemParseException{
+    public void parseStringIntoItemTest() throws ItemParseException {
         Item expected = new Item("milk", 3.23, "food","1/25/2016");
         Item actual = itemParser.parseStringIntoItem(rawSingleItem);
         assertEquals(expected.toString(), actual.toString());
     }
 
     @Test(expected = ItemParseException.class)
-    public void parseBrokenStringIntoItemTest() throws ItemParseException{
+    public void parseBrokenStringIntoItemTest() throws ItemParseException {
         itemParser.parseStringIntoItem(rawBrokenSingleItem);
     }