SEPTA: moved into consolidated Transit namespace

duckduckgo · Oct 11, 2014 · b53ec1a · b53ec1a
1 parent b0a52ce
commit b53ec1a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/lib/DDG/Spice/SEPTA.pm → lib/DDG/Spice/Transit/SEPTA.pm b/lib/DDG/Spice/SEPTA.pm → lib/DDG/Spice/Transit/SEPTA.pm
@@ -1,4 +1,4 @@
-package DDG::Spice::SEPTA;
+package DDG::Spice::Transit::SEPTA;
 
 use DDG::Spice;
 use YAML qw ( Load );
@@ -8,7 +8,7 @@ secondary_example_queries "train times to paoli from Villanova";
 description "Lookup the next SEPTA train going your way";
 name "SEPTA";
 source "SEPTA";
-code_url "https://github.com/duckduckgo/zeroclickinfo-spice/blob/master/lib/DDG/Spice/SEPTA.pm";
+code_url "https://github.com/duckduckgo/zeroclickinfo-spice/blob/master/lib/DDG/Spice/Transit/SEPTA.pm";
 topics "everyday";
 category "time_sensitive";
 attribution web => [ 'https://www.duckduckgo.com', 'DuckDuckGo' ],

diff --git a/share/spice/septa/content.handlebars → share/spice/transit/septa/content.handlebars b/share/spice/septa/content.handlebars → share/spice/transit/septa/content.handlebars
diff --git a/share/spice/septa/stops.yml → share/spice/transit/septa/stops.yml b/share/spice/septa/stops.yml → share/spice/transit/septa/stops.yml
diff --git a/share/spice/septa/train_item.handlebars → ...spice/transit/septa/train_item.handlebars b/share/spice/septa/train_item.handlebars → ...spice/transit/septa/train_item.handlebars
diff --git a/share/spice/septa/septa.css → share/spice/transit/septa/transit_septa.css b/share/spice/septa/septa.css → share/spice/transit/septa/transit_septa.css
diff --git a/share/spice/septa/septa.js → share/spice/transit/septa/transit_septa.js b/share/spice/septa/septa.js → share/spice/transit/septa/transit_septa.js
@@ -1,6 +1,6 @@
 (function(env){
     "use strict";
-    env.ddg_spice_septa = function(api_result){
+    env.ddg_spice_transit_septa = function(api_result){
 
         if (!api_result ||
                 api_result.length < 1 ||
@@ -10,11 +10,11 @@
             return Spice.failed('septa');
         }
 
-        var script = $("[src*='js/spice/septa/']")[0],
+        var script = $("[src*='js/spice/transit/septa/']")[0],
             source = decodeURI($(script).attr("src")),
             parts = source.split('/'),
-            from = parts[4],
-            to = parts[5],
+            from = parts[5],
+            to = parts[6],
             now = timeInMins(new Date().toTimeString());
 
         Spice.add({
@@ -49,7 +49,7 @@
                 detail: false,
                 item_detail: false,
                 options: {
-                    content: Spice.septa.train_item
+                    content: Spice.transit_septa.train_item
                 }
             },
             sort_fields: {

diff --git a/t/SEPTA.t b/t/SEPTA.t
@@ -12,36 +12,36 @@ my %queries = (
 
 my %tests = map {(
     "next train from $_ to $queries{$_}" => test_spice(
-        '/js/spice/septa/'
+        '/js/spice/transit/septa/'
         . (join '%20', map { ucfirst } split /\s+/, $_)
         . '/'
         . (join '%20', map { ucfirst } split /\s+/, $queries{$_}),
         call_type => 'include',
-        caller => 'DDG::Spice::SEPTA'
+        caller => 'DDG::Spice::Transit::SEPTA'
     ),
     "next train to $_ from $queries{$_}" => test_spice(
-        '/js/spice/septa/'
+        '/js/spice/transit/septa/'
         . (join '%20', map { ucfirst } split /\s+/, $queries{$_})
         . '/'
         . (join '%20', map { ucfirst } split /\s+/, $_),
         call_type => 'include',
-        caller => 'DDG::Spice::SEPTA'
+        caller => 'DDG::Spice::Transit::SEPTA'
     ),
 )} keys %queries;
 
 ddg_spice_test(
-    [qw( DDG::Spice::SEPTA )],
+    [qw( DDG::Spice::Transit::SEPTA )],
     (
         %tests,
         'septa thorndale to 30th' => test_spice(  #test station guessing
-            '/js/spice/septa/Thorndale/30th%20Street%20Station',
+            '/js/spice/transit/septa/Thorndale/30th%20Street%20Station',
             call_type => 'include',
-            caller => 'DDG::Spice::SEPTA'
+            caller => 'DDG::Spice::Transit::SEPTA'
         ),
         'septa drexel to 49th street' => test_spice(
-            '/js/spice/septa/University%20City/49th%20St',
+            '/js/spice/transit/septa/University%20City/49th%20St',
             call_type => 'include',
-            caller => 'DDG::Spice::SEPTA'
+            caller => 'DDG::Spice::Transit::SEPTA'
         ),
         'next train from a station that doesnt exist to another' => undef,
         'septa blahblah from villanova to paoli' => undef,