atco 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/atco.rb

@@ -3,7 +3,10 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'open3'
 require 'tempfile'  
-require 'location'
+require 'atco/location'
+require 'atco/journey'
+require 'atco/stop'
+
 
 module Atco
   VERSION = '0.0.1'
@@ -52,9 +55,9 @@ module Atco
 
             if current_journey
               if journeys[current_journey[:unique_journey_identifier]]
-                journeys[current_journey[:unique_journey_identifier]] << object
+                journeys[current_journey[:unique_journey_identifier]].stops << Stop.new(object)
               else
-                journeys[current_journey[:unique_journey_identifier]] = [object]
+                journeys[current_journey[:unique_journey_identifier]] = Journey.new(object)
               end
             end
             objects << object

data/lib/atco/journey.rb

@@ -0,0 +1,66 @@
+module Atco
+  
+  class Journey
+    
+    attr_accessor :vehicle_type, :registration_number, :identifier, :operator, :route_number,
+      :first_date_of_operation, :running_board, :last_date_of_operation, :school_term_time, :route_direction, :bank_holidays
+
+    attr_accessor :stops
+
+    def initialize(data)
+      @mondays = parse_boolean_int data[:operates_on_mondays]
+      @tuesdays = parse_boolean_int data[:operates_on_tuesdays]
+      @wednesdays = parse_boolean_int data[:operates_on_wednesdays]
+      @thursdays = parse_boolean_int data[:operates_on_thursdays]
+      @fridays = parse_boolean_int data[:operates_on_fridays]
+      @saturdays = parse_boolean_int data[:operates_on_saturdays]
+      @sundays = parse_boolean_int data[:operates_on_sundays]
+      
+      @vehicle_type = data[:vehicle_type]
+      @registration_number = data[:registration_number]
+      @identifier = data[:unique_journey_identifier]
+      @operator = data[:operator]
+      @route_number = data[:route_number]
+      @route_direction = data[:route_direction]
+      @first_date_of_operation = data[:first_date_of_operation]
+      @last_date_of_operation = data[:last_date_of_operation]
+      @running_board = data[:running_board]
+      @school_term_time = data[:school_term_time]
+      @bank_holidays = data[:bank_holidays]
+      
+      @stops = []
+     #stops.each do |s|
+     #  @stops << Stop.new(s)
+     #end
+    end
+
+    def mondays?; @mondays; end
+    def tuesdays?; @tuesdays; end
+    def wednesdays?; @wednesdays; end
+    def thursdays?; @thursdays; end
+    def fridays?; @fridays; end
+    def saturdays?; @saturdays; end
+    def sundays?; @sundays; end
+    
+    def parse_boolean_int(string)
+      (string && string == "1") ? true : false
+    end
+    
+    def to_json(*args)
+      {
+        :vehicle_type => @vehicle_type, 
+        :registration_number => @registration_number, 
+        :identifier => @identifier, 
+        :operator => @operator, 
+        :route_number => @route_number,
+        :first_date_of_operation => @first_date_of_operation, 
+        :running_board => @running_board, 
+        :last_date_of_operation => @last_date_of_operation, 
+        :school_term_time => @school_term_time, 
+        :route_direction => @route_direction, 
+        :bank_holidays => @bank_holidays,
+        :stops => @stops
+      }.to_json(*args)
+    end
+  end
+end

data/lib/atco/location.rb

@@ -0,0 +1,27 @@
+module Atco
+  
+  class Location
+
+    attr_accessor :name, :identifier, :easting, :northing, :gazeteer_code
+
+    def initialize(location_header, additional_location_information)
+      @name = location_header[:full_location]
+      @identifier = location_header[:record_identity]
+      @easting = additional_location_information[:grid_reference_easting]
+      @northing = additional_location_information[:grid_reference_northing]
+      @gazeteer_code = location_header[:gazetteer_code]
+    end
+
+    def to_json(*a)
+      { 
+        :name => @name,
+        :identifier => @identifier,
+        :easting => @easting,
+        :northing => @northing,
+        :gazeteer_code => @gazeteer_code 
+      }.to_json(*a)
+    end
+
+  end
+
+end

data/lib/atco/stop.rb

@@ -0,0 +1,31 @@
+module Atco
+
+  class Stop
+
+    attr_accessor :bay_number, :location, :timing_point_indicator, :fare_stage_indicator, :published_departure_time, :record_identity
+
+    def origin?; @record_identity == "QO"; end
+    def intermediate?; @record_identity == "QI"; end
+    def destination?; @record_identity == "QT"; end
+    
+    def initialize(data)
+      @bay_number = data[:bay_number]
+      @location = data[:location]
+      @timing_point_indicator = data[:timing_point_indicator]
+      @fare_stage_indicator = data[:fare_stage_indicator]
+      @published_departure_time = data[:published_departure_time]
+      @record_identity = data[:record_identity]
+    end
+
+    def to_json(*args)
+      {
+        :record_identity => @record_identity,
+        :location => @location,
+        :published_departure_time => @published_departure_time,
+        :timing_point_indicator => @timing_point_indicator,
+        :fare_stage_indicator => @fare_stage_indicator,
+        :bay_number => @bay_number
+      }.to_json(*args)
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - David Rice
@@ -31,7 +31,9 @@ files:
 - Rakefile
 - VERSION
 - lib/atco.rb
-- lib/location.rb
+- lib/atco/journey.rb
+- lib/atco/location.rb
+- lib/atco/stop.rb
 has_rdoc: true
 homepage: http://github.com/davidjrice/atco
 licenses: []

data/lib/location.rb

@@ -1,23 +0,0 @@
-class Location
-
-  attr_accessor :name, :identifier, :easting, :northing, :gazeteer_code
-
-  def initialize(location_header, additional_location_information)
-    @name = location_header[:full_location]
-    @identifier = location_header[:record_identity]
-    @easting = additional_location_information[:grid_reference_easting]
-    @northing = additional_location_information[:grid_reference_northing]
-    @gazeteer_code = location_header[:gazetteer_code]
-  end
-
-  def to_json(*a)
-    { 
-      :name => @name,
-      :identifier => @identifier,
-      :easting => @easting,
-      :northing => @northing,
-      :gazeteer_code => @gazeteer_code 
-    }.to_json(*a)
-  end
-  
-end