lothianbusestimetable 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b04bea73d8b5ad4e895b25d94eb1ffa0a94d3c91
-  data.tar.gz: af832e2b5850a9b705f141b996d88abf7ea88425
+  metadata.gz: b3bf2af622eaa822e7a296b7cea1bbdb8680c7a8
+  data.tar.gz: bc2f0e8851c2333a28196598ba339373dd61a2f5
 SHA512:
-  metadata.gz: 8419029b14414ead0461fc50f123964428342b48a4f7670db6b0eec7a6ccd906eb8a62dea7a343bf2e6663e4f91ea9efa2b2811d0f816a8326e5471594faa405
-  data.tar.gz: 5e040323094473cc03d9e10eee45af0be233285d816d53b2c48e8a3a0e455b648225ea3650d3efb2f86e607ef10623920447178adf1341d5fa0c6812301ad13c
+  metadata.gz: 86524dc73bc3fdc147c83f38ce5353a3fa2689cdd7bc998617d88122321150b346a68ea6b45bfca6357bb23661da7821463bd8a27619cbd81b8d5cd72e8c51ef
+  data.tar.gz: d03b438eca70aef97dc79b0fa012e64f27ce965903042c6f25024034c3295d24ec5babdcbddc05ba3d663572f5f321a8eb6b89905ef49f531a2f7657ebaeb8fe

data/lib/lothianbusestimetable.rb

@@ -46,6 +46,8 @@ class LothianBusesTimetable
 
       # get the name
       a = tr.xpath('td//text()').map(&:unescape)
+      
+      next unless a.any?
 
       col1 = a.shift.strip
 
@@ -54,7 +56,8 @@ class LothianBusesTimetable
         a0 << {service: $1}
 
       elsif col1.empty? or col1.length <= 1
-
+        
+        #next if a.length < 1
         if prev_col.empty? or prev_col.length <= 1 and a0.last.any? then
 
           a0 << {}
@@ -70,7 +73,7 @@ class LothianBusesTimetable
 
       else
 
-        if a.any? then
+        if a.any? and a.length > 1 then
 
           h = a0.last
 
@@ -81,6 +84,7 @@ class LothianBusesTimetable
           end
 
         else
+
           a0.pop if a0.last.empty?
         end
       end
@@ -114,28 +118,40 @@ class LothianBusesTimetable
     h = a0.shift
     master[:saturday][:outbound] = h
 
-    h = a0.shift 
-    h = a0.shift until h.any?
-    master[:sunday][:desc] = h[:timetable]
     h = a0.shift
-    master[:sunday][:inbound] = h
-    h = a0.shift
-    master[:sunday][:outbound] = h
-
+    
+    if h then
+      
+      h = a0.shift until h.any?
+      master[:sunday][:desc] = h[:timetable]
+      h = a0.shift
+      master[:sunday][:inbound] = h
+      h = a0.shift
+      master[:sunday][:outbound] = h
+      
+    end
 
     master.to_a[1..-1].each do |key, timetable|
 
       timetable.to_a[1..-1].each do |direction, printed_rows|
 
+        next unless printed_rows
+
         # find the interval gaps
 
         a = printed_rows.to_a
-        index = a.index a.detect {|x| x.last.grep(/^ $/).any? }
-        a2 = a[index].last
+        index = a.index a.detect {|x| x.last.grep(/^ |then$/).any? }
+      
+        if index then
+          a2 = a[index].last
 
-        gaps = a2.map.with_index.select {|x,i| x == " "}.map(&:last)
+          gaps = a2.map.with_index.select {|x,i| x == " " \
+                                           or x == 'then'}.map(&:last)
 
-        gaps.delete_at -1 if gaps.last >= a2.length - 1
+          gaps.delete_at -1 if gaps.last >= a2.length - 1
+        else
+          gaps = []
+        end
 
         # sanitise the times (where short hand times are 
         # given i.e. minutes only)
@@ -143,7 +159,7 @@ class LothianBusesTimetable
         printed_rows.each do |name, row|
 
           prev_time = nil
-          printed_rows[name] = row.map.with_index do |col,i|
+          printed_rows[name] = row.map.with_index do |col,i|            
 
             if gaps.include? i then
               col
@@ -173,15 +189,22 @@ class LothianBusesTimetable
 
         # fill in the gaps
 
-        periods = gaps.map {|i| a.map {|k,v| v[i].to_s.gsub(/\W/,'')}
+        periods = gaps.map {|i| a.map {|k,v| v[i].to_s.gsub(/\W/,' ')}
                     .compact.join(' ').strip }
 
         gap_times = gaps.zip(periods)
 
 
         intervaltimes = gap_times.map do |i, desc|
+          
+          interval = if desc =~ 
+              /^then at these mins past each hour(?: until)?/ then
+            60
+          else
+            interval = desc[/then (?:at least )?every (\d+) mins(?: until)?/,1].to_i
+          end
 
-          interval = desc[/then every (\d+) mins until/,1].to_i
+          next if interval == 0
 
           new_rows = printed_rows.map do |k,v|
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lothianbusestimetable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   K7yWGJq+eGl34xrLaucvTbO8Ua3rHayCkBzgfx5LVcch22Axj8quw+YGsPnhuosr
   BHdCmx9eUF/TKg==
   -----END CERTIFICATE-----
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokorexi