tfl_journey_planner 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/tfl_journey_planner.rb

@@ -23,17 +23,43 @@ class TflJourneyPlanner
 
     def get_journeys(from, to)
       output = Nokogiri::HTML.parse(submit_form(from, to)).css('.un_space_top_bottom')
-      '[' + output.map do |o|
-        '{' + o.css('div').map do |d|
-          if d.css('img').empty?
-            "'" + d.text.strip.sub(": ", "': '") + "'"
-          else
-            d.text.strip + d.css('img').map{ |i| CGI.unescape(i.attr('src')).split(/\=|\&/)[1] }.inspect
-          end
-        end.join(", ") + '}'
-      end.join(", ") + ']'
+      
+      routes = output.map do |route|
+        process_route(route)
+      end.reject(&:empty?)
+
+      to_json(routes)
+    end
+
+    def to_json(routes)
+      "[" + routes.map{ |r| "{" + r.join(", ") + "}" }.join(", ") + "]"
     end
 
+    def process_route(route)
+      route.css('div').map do |attribute|
+        has_image?(attribute) ? process_interchanges(attribute) : process_attribute(attribute) 
+      end.compact
+    end
+
+    def process_interchanges(attribute)
+      attribute.text.strip + images_urls(attribute).inspect
+    end
+      
+    def images_urls(attribute)
+      attribute.css('img').map{ |i| CGI.unescape(i.attr('src')).split(/\=|\&/)[1] }
+    end
+
+    def process_attribute(attribute)
+      "'" + attribute.text.strip.sub(": ", "': '") + "'" if has_data?(attribute)
+    end
+
+    def has_data?(attribute) 
+      !attribute.text.empty? && attribute.text.split(":").length > 1
+    end
+
+    def has_image?(attribute)
+      !attribute.css('img').empty?
+    end
   end
 
 end

data/tfl_journey_planner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tfl_journey_planner}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jordi Noguera"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tfl_journey_planner
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Jordi Noguera