Merge pull request #39 from karllhughes/master

Fixes date/location parsing from Papercall
joindin · Jun 19, 2019 · ceb6fa4 · ceb6fa4
2 parents 2e6bdb8 + a06d7d7
commit ceb6fa4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -15,5 +15,12 @@ alternate version:
 
 ## Usage
 
+    # Install Composer dependencies (if not using `composer create-project` command
+    composer install
+
+    # Copy and customize the .ini file:
+    cp config/callingallpapers.ini.dist config/callingallpapers.ini
+
+    # List valid commands
     ./bin/callinallpapers list
 
diff --git a/src/Parser/PapercallIo/EventEndDate.php b/src/Parser/PapercallIo/EventEndDate.php
@@ -62,7 +62,7 @@ public function parse(DOMDocument $dom, DOMNode $node, Cfp $cfp) : Cfp
         }
 
         $locationTimeString = trim($titlePath->item(0)->textContent);
-        $locationTime = explode(' - ', $locationTimeString);
+        $locationTime = explode(PHP_EOL, $locationTimeString);
 
         if (! isset($locationTime[1])) {
             return $cfp;

diff --git a/src/Parser/PapercallIo/EventStartDate.php b/src/Parser/PapercallIo/EventStartDate.php
@@ -61,7 +61,7 @@ public function parse(DOMDocument $dom, DOMNode $node, Cfp $cfp) : Cfp
         }
 
         $location = trim($titlePath->item(0)->textContent);
-        $location = explode(' - ', $location);
+        $location = explode(PHP_EOL, $location);
 
         if (! isset($location[1])) {
             return $cfp;

diff --git a/src/Parser/PapercallIo/Location.php b/src/Parser/PapercallIo/Location.php
@@ -49,7 +49,7 @@ public function parse(DOMDocument $dom, DOMNode $node, Cfp $cfp) : Cfp
         }
 
         $location = trim($titlePath->item(0)->textContent);
-        $location = explode(' - ', $location);
+        $location = explode(PHP_EOL, $location);
         $cfp->location = $location[0];
 
         return $cfp;

diff --git a/tests/Parser/PapercallIo/_assets/conf4.html b/tests/Parser/PapercallIo/_assets/conf4.html
@@ -157,7 +157,7 @@
       <h1 class="subheader__title">BSides Wellington 2017</h1>
       <h1 class="subheader__subtitle">
         Wellington, NZ
-          - November 23, 2017, November 24, 2017
+         November 23, 2017, November 24, 2017
       </h1>
         <a target="_blank" href="https://bsides.nz/">https://bsides.nz/</a><br>
         <span>Tags: Tool release, Open source, Devsecops, Devops, New zealand, Iot, Zero-day, Hardware, Education, Mobile, Webapp, Software, Network, Technology, People, Managing, Hunting, Defending, Building, Breaking, Security culture, Awareness, Risk management, Business risk, Cybersecurity, Contempt culture, Diversity, Red team, Purple team, Blue team, Defence, Strategy</span>

diff --git a/tests/Parser/PapercallIo/_assets/conf5.html b/tests/Parser/PapercallIo/_assets/conf5.html
@@ -14,8 +14,8 @@
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:site" content="@papercall_io" />
   <meta name="twitter:title" content="PaperCall.io - India Dreamin" />
-  <meta name="twitter:description" content="Mark your calendars for September 30th, 2017 and gear up for a celebration of Salesforce - the Indian way! 
-
+  <meta name="twitter:description" content="Mark your calendars for September 30th, 2017 and gear up for a celebration of Salesforce - the Indian way! 
+
 India Dreamin is a community led, community run event for professionals around Salesforce. Put together by the vibrant Indian Salesforce community, this event is open for all Salesforce ..." />
   <meta name="twitter:image" content="https://papercallio-production.s3.amazonaws.com/uploads/event/logo/641/ID_Logo.png" />
 
@@ -159,7 +159,7 @@
       <h1 class="subheader__title">India Dreamin</h1>
       <h1 class="subheader__subtitle">
         G.L.Bajaj Institute of Technology &amp; Management, Plot No. 2, Knowledge Park III, Distt. G.B.Nagar, Greater Noida, Uttar Pradesh 201306
-          - September 30, 2017
+          September 30, 2017
       </h1>
         <a target="_blank" href="http://www.indiadreamin.in/">http://www.indiadreamin.in/</a><br>
     </div>