konbikol 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6716fa0d342aecd16b4d6d9fcb21c29588e022c315236f7e19ab4d0592b1ab82
-  data.tar.gz: c8c28fe2eeaee2b9449b64d5bbef0cc2585a97e6045c96475b75409b45179c3a
+  metadata.gz: 17cccb076cc787892f8df8c875b185157f1b8a31e6c0987f824a61c2f1fd2697
+  data.tar.gz: 7b6158a9a144621adbd1366ee9d66f2355610493b4ac32e3d4a9db1df30d6857
 SHA512:
-  metadata.gz: b2dd655e812f2883802d9cfabafc92edea9ab4e1e4f69e939991c46b51ac80c57108b2b38c9bcb8deccdeffde75c49af79d18ecd63c1f42781ff42dbd51ccaad
-  data.tar.gz: 737d18d23341d4b7e1bd6a90261050c51c876bafba1994e75ef9f08ee4264e6f3b9c5254f3ac2b584be7486b092fd74fd54c528f48ebfcad9f432773f015c638
+  metadata.gz: 96cd820e81c2935cbfa98765398ae05a92b7b8db75344c390908fb364ed1574651fd23c881e79e6a614d12808494bd77e5003c7819a884d65b852df51859da48
+  data.tar.gz: 26a41d9cb65744e6fd67b7fd00f0dffebf5c9d4400cb5ed6b13314a8ceea92f64fd670a0aa81207fbc99b08606b66e8bad03728f171664a94728b9d2d8805e7f

data/Gemfile.lock

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

data/lib/konbikol/ticket.rb

@@ -113,8 +113,12 @@ module Konbikol
     end
 
     def purchase_time
+      return @purchase_time if @purchase_time
+
+      line = find_next_non_empty_line_below_line_matching_regex(/Zapłacono i wystawiono dnia/)
+
       @purchase_time ||= Time.parse(
-        ticket_text.lines[35].split(/\s{2,}/).last.match(/(.+)\(.+/)[1]
+        line.split(/\s{2,}/).last.match(/(.+)\(.+/)[1]
       )
     end
 
@@ -167,16 +171,23 @@ module Konbikol
     end
 
     def departure_line_index
-      return @departure_line_index if @departure_line_index
+      @departure_line_index ||= find_index_of_next_non_empty_line_below_line_matching_regex(/Stacja\s+Data\s+Godzina/)
+    end
 
+    def find_index_of_next_non_empty_line_below_line_matching_regex(regex)
       lines_with_index = ticket_text.lines.each_with_index
-      header_line_index = lines_with_index.find { |line, _| line =~ /Stacja\s+Data\s+Godzina/ }.last
+      index_of_line_matching_regex = lines_with_index.find { |line, _| line =~ regex }.last
 
-      # Find the next line after the header line that's not empty.
-      @departure_line_index = lines_with_index.to_a
-        .slice(header_line_index + 1, lines_with_index.size)
+      # Find the next line after the matching line that's not empty.
+      lines_with_index.to_a
+        .slice(index_of_line_matching_regex + 1, lines_with_index.size)
         .find { |line, _| !line.strip.empty? }
         .last
     end
+
+    def find_next_non_empty_line_below_line_matching_regex(regex)
+      index = find_index_of_next_non_empty_line_below_line_matching_regex(regex)
+      ticket_text.lines[index]
+    end
   end
 end

data/lib/konbikol/version.rb

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

metadata

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