konbikol 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17cccb076cc787892f8df8c875b185157f1b8a31e6c0987f824a61c2f1fd2697
-  data.tar.gz: 7b6158a9a144621adbd1366ee9d66f2355610493b4ac32e3d4a9db1df30d6857
+  metadata.gz: ec1d54398a152292c0b3daaa531a62d12c0cad311f553679785665dd5232ff14
+  data.tar.gz: 22c8b221a5549699b70966139a5bbbb7b8ad1cd39f88fdfef0af508ca41f9177
 SHA512:
-  metadata.gz: 96cd820e81c2935cbfa98765398ae05a92b7b8db75344c390908fb364ed1574651fd23c881e79e6a614d12808494bd77e5003c7819a884d65b852df51859da48
-  data.tar.gz: 26a41d9cb65744e6fd67b7fd00f0dffebf5c9d4400cb5ed6b13314a8ceea92f64fd670a0aa81207fbc99b08606b66e8bad03728f171664a94728b9d2d8805e7f
+  metadata.gz: 34a5711d63ea9c68e32f8da1df639e2d3c0cc04a8ed2588d92e73ec51660983c33b9d20ebb6a30656e07be2085573c3d807b9070c289f3a413bb32f8f9fd08cb
+  data.tar.gz: c434bf9cf20c843e31e5fc2617e91aaa3e62587e38b3d73e0e1ad078a25753ececd9ff8aff65dc0e4a11c86e353bf1bfa19771385f2aad5e6f70ba816247c3f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    konbikol (0.1.4)
+    konbikol (0.1.5)
       icalendar (~> 2.5.1)
       pdf-reader (~> 2.1.0)
       tzinfo (~> 1.2.5)

data/lib/konbikol/ticket.rb

@@ -126,11 +126,25 @@ module Konbikol
 
     attr_reader :ticket_text
 
+    STATION_AND_REST_REGEX = /^(?<station>\D+(\b|\.))\s+(?<rest>\d.+)$/
+
     def departure
       return @departure if @departure
-      line = ticket_text.lines[departure_line_index].split(/\s{2,}/)
 
-      raw_train = line[3]
+      departure_line = ticket_text.lines[departure_line_index]
+
+      match_result = departure_line.match(STATION_AND_REST_REGEX)
+      unless match_result
+        raise "Departure line didn't match the regex to detect the station and the rest of columns, " \
+          "here's how the line looks like:\n\n#{departure_line}"
+      end
+
+      station = match_result[:station]
+      rest = match_result[:rest]
+
+      rest_columns = rest.split(/\s{2,}/)
+
+      raw_train = rest_columns[2]
       train = raw_train.split(' ').first(2).join(' ')
 
       # If everything's fine, the departure line should look somewhat like this:
@@ -146,12 +160,12 @@ module Konbikol
       # This causes troubles for us because we assume that there are at least two spaces between
       # columns, so we have to accommodate for that.
       is_there_just_one_space_between_train_and_distance = raw_train.split(' ').size != 2
-      seat = is_there_just_one_space_between_train_and_distance ? line[4] : line[5]
+      seat = is_there_just_one_space_between_train_and_distance ? rest_columns[3] : rest_columns[4]
 
       @departure = {
-        station: line[0],
-        date: line[1],
-        time: line[2],
+        station: station,
+        date: rest_columns[0],
+        time: rest_columns[1],
         train: train,
         seat: seat,
       }
@@ -160,13 +174,23 @@ module Konbikol
     def arrival
       return @arrival if @arrival
 
-      line = ticket_text.lines[departure_line_index + 1].split(/\s{2,}/)
+      arrival_line = ticket_text.lines[departure_line_index + 1]
+      match_result = arrival_line.match(STATION_AND_REST_REGEX)
+      unless match_result
+        raise "Arrival line didn't match the regex to detect the station and the rest of columns, " \
+          "here's how the line looks like:\n\n#{arrival_line}"
+      end
+
+      station = match_result[:station]
+      rest = match_result[:rest]
+
+      rest_columns = rest.split(/\s{2,}/)
 
       @arrival = {
-        station: line[0],
-        date: line[1],
-        time: line[2],
-        carriage: line[3],
+        station: station,
+        date: rest_columns[0],
+        time: rest_columns[1],
+        carriage: rest_columns[2],
       }
     end
 

data/lib/konbikol/version.rb

@@ -1,3 +1,3 @@
 module Konbikol
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: konbikol
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Rafał Cieślak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-27 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler