lothianbusestimetable 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3bf2af622eaa822e7a296b7cea1bbdb8680c7a8
-  data.tar.gz: bc2f0e8851c2333a28196598ba339373dd61a2f5
+  metadata.gz: c6802c5354c2dbd6e9312f333ce0b7b9a2076cdb
+  data.tar.gz: 73dfb063629361ca8a03157faf17748f52994ec9
 SHA512:
-  metadata.gz: 86524dc73bc3fdc147c83f38ce5353a3fa2689cdd7bc998617d88122321150b346a68ea6b45bfca6357bb23661da7821463bd8a27619cbd81b8d5cd72e8c51ef
-  data.tar.gz: d03b438eca70aef97dc79b0fa012e64f27ce965903042c6f25024034c3295d24ec5babdcbddc05ba3d663572f5f321a8eb6b89905ef49f531a2f7657ebaeb8fe
+  metadata.gz: cb8b225f2d9ec7bd18fa726e2d25acc24b65eecb7f701fe7fb109672e51712faa3e3a196376a075103ce22b2ed26764a04d4093cc0c902113694f6823fce826a
+  data.tar.gz: f803b70caef9250d09645059ef17087d6391eb19d9dcdfb4ddd453773c0548eea5b8e13c707003173f38f2c61f6f2055103aaae195cdd25ffe31a68847431413

data.tar.gz.sig

@@ -1,2 +1 @@
-Qx
-6��ŠE*fF3�.��(�+����O�9e�
+��~��A/d�NH_�����ᛍ��^�X�i�:�ܻƓ�\R�IeD%���t�U@�E:�Z�����I�Jz$��U2(ա�p�q�=���ٹ��]��d?���np���� b٦�Z��Ћ.�b����:�PFi/���[bL�������ĵ]�{i�]��-����&���$LxGR�Bu���n���%���1�1�uWUǼ��/"�ѪfT�I<�|2~���+i1�ݼI�T�7}��[�i� ��Q�m
2�F�E�⃾S

data/lib/lothianbusestimetable.rb

@@ -46,19 +46,26 @@ class LothianBusesTimetable
 
       # get the name
       a = tr.xpath('td//text()').map(&:unescape)
-      
+
       next unless a.any?
 
       col1 = a.shift.strip
 
-      if col1 =~ /Service (\w?\d+)/ then
+      if col1 =~ /^Service (\w?\d+)/ and a0.empty?then
 
         a0 << {service: $1}
 
-      elsif col1.empty? or col1.length <= 1
+      elsif prev_col =~ /^Service \w?\d+$/ 
+
+        a0.last.merge!(timetable: col1)
+        a0 << {}
+#=begin       
+      elsif col1.empty? and a.length > 1
+        next
+      elsif col1.empty? or a.length <= 1
         
         #next if a.length < 1
-        if prev_col.empty? or prev_col.length <= 1 and a0.last.any? then
+        if prev_col.empty? or prev_col.length <= 1 and a0.last and a0.last.any? then
 
           a0 << {}
 
@@ -66,17 +73,14 @@ class LothianBusesTimetable
 
           prev_col = ''
         end
-
-      elsif prev_col =~ /Service \w?\d+/ 
-
-        a0.last.merge!(timetable: col1)    
-
+#=end        
       else
 
         if a.any? and a.length > 1 then
 
+          next if col1.empty?
           h = a0.last
-
+          
           if h.has_key? col1 then
             h[col1].concat a
           else
@@ -85,7 +89,8 @@ class LothianBusesTimetable
 
         else
 
-          a0.pop if a0.last.empty?
+          #a0.pop if a0.last.empty?
+          next
         end
       end
 
@@ -100,18 +105,22 @@ class LothianBusesTimetable
       saturday: {desc: '', inbound: {}, outbound: {}},
       sunday: {desc: '', inbound: {}, outbound: {}}
     }
-
+    
     h = a0.shift
+
     master[:service] = h[:service]
     master[:weekday][:desc] = h[:timetable]
 
     h = a0.shift
+
     master[:weekday][:inbound] = h
     h = a0.shift
+
     master[:weekday][:outbound] = h
 
     h = a0.shift 
     h = a0.shift until h.any?
+
     master[:saturday][:desc] = h[:timetable]
     h = a0.shift
     master[:saturday][:inbound] = h
@@ -120,7 +129,7 @@ class LothianBusesTimetable
 
     h = a0.shift
     
-    if h then
+    if h and a0.any? then
       
       h = a0.shift until h.any?
       master[:sunday][:desc] = h[:timetable]
@@ -131,6 +140,7 @@ class LothianBusesTimetable
       
     end
 
+
     master.to_a[1..-1].each do |key, timetable|
 
       timetable.to_a[1..-1].each do |direction, printed_rows|
@@ -140,22 +150,27 @@ class LothianBusesTimetable
         # find the interval gaps
 
         a = printed_rows.to_a
-        index = a.index a.detect {|x| x.last.grep(/^ |then$/).any? }
-      
+
+        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 == " " \
-                                           or x == 'then'}.map(&:last)
+          gaps = a2.map.with_index.select {|x,i|  x == 'then'}.map(&:last)
 
           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)
 
+=begin
+# sanitise diabled for now
+# probably perform this at the end now
+
         printed_rows.each do |name, row|
 
           prev_time = nil
@@ -171,6 +186,7 @@ class LothianBusesTimetable
                 col
               when /^\d{2}$/
 
+                next if prev_time.nil?
                 # substitute with a time
                 val = "%02d%02d" % [prev_time.hour, col.to_i]
 
@@ -186,7 +202,7 @@ class LothianBusesTimetable
           end
 
         end
-
+=end
         # fill in the gaps
 
         periods = gaps.map {|i| a.map {|k,v| v[i].to_s.gsub(/\W/,' ')}
@@ -197,39 +213,28 @@ class LothianBusesTimetable
 
         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
-
-          next if interval == 0
+          intervals = []
 
-          new_rows = printed_rows.map do |k,v|
+          if desc =~ /^then every hour(?: until)?/ then
+            new_rows = every_hourly_interval printed_rows, i
+          elsif desc =~ /^then at these mins past each hour(?: until)?/                        
 
-            times = []
-            next unless v[i-1] && v[i-1] =~ /^\d{4}$/
-
-            t = Time.strptime(v[i-1], "%H%M") #if v[i-1] =~ /^\d{4}$/
-
-            while t + (60 * interval) < Time.strptime(v[i+1], "%H%M") do
-              t = t + (60 * interval)
-              times << t.strftime("%H%M")
-            end
-
-            [k,times]
-          end.compact
+            new_rows = every_hourlyset_interval printed_rows, i
+          else
+            interval = desc[/then (?:at least )?every (\d+) mins(?: until)?/,1]
+            new_rows = every_interval printed_rows, i, interval
+          end
 
           [i, new_rows]
         end
 
         intervaltimes.reverse.each do |i, rows|
-
-          rows.each do |name, xtimes|
+          
+          rows.each do |name, xtimes, del_indices|
 
             printed_rows[name].delete_at i
             printed_rows[name].insert i, *xtimes    
+            del_indices.to_a.reverse.each {|j| printed_rows[name].delete_at j}
 
           end
 
@@ -264,4 +269,78 @@ class LothianBusesTimetable
       
   end
   
+  private
+  
+  def every_hourlyset_interval(rows, i)    
+    
+    rows.map do |k,v|
+
+      i -= 19 if v.length < i # caters for special journey entries which happen at limited times of the day
+      start_i = i - 1
+
+      start_i -= 1 while v[start_i] =~ /^(?:\d{2}|-|\||[A-Z]|) *$/
+
+      times = []
+
+      a = v[start_i+1..i-1].cycle
+
+      # get the starting hour
+
+      t1 = Time.strptime(v[start_i], "%H%M")
+
+      prev_time = t1
+
+      t2 = t1
+      #j = v[i+1] =~ /^\d{4}/ ? i+1 : i+2      
+      j = i + 1
+      j += 1 until v[j] =~ /^\d{4}/
+
+      t3 = Time.strptime(v[j].rstrip, "%H%M")
+
+      while t2 < t3  do
+
+        val = a.next
+
+        if val =~ /^\d{2} *$/ then
+
+          t2 = Time.strptime("%02d%s" % [prev_time.hour, val], "%H%M")
+
+          t2 += 60 * 60 if t2 <= prev_time
+
+          times << t2.strftime("%H%M") if t2 < t3
+          prev_time = t2
+        else
+          times << val
+        end
+
+      end    
+      [k,times, (start_i+1..i-1)]
+    end.compact    
+    
+
+  end  
+
+  def every_interval(rows, i, interval=60)
+    
+    return unless interval
+    
+    rows.map do |k,v|
+
+      times = []
+      
+      next unless v[i-1] && v[i-1] =~ /^\d{4}$/
+
+      t = Time.strptime(v[i-1], "%H%M") #if v[i-1] =~ /^\d{4}$/
+
+      while t + (60 * interval.to_i) < Time.strptime(v[i+1], "%H%M") do
+        t = t + (60 * interval.to_i)
+        times << t.strftime("%H%M")
+      end
+
+      [k,times]
+    end.compact    
+  end
+  
+  alias every_hourly_interval every_interval
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lothianbusestimetable
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - James Robertson