cumtd 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd40b208a39e58b04532f3480f40bfa872fb9a9c
-  data.tar.gz: 0be1f6a864db4f9f12542d9312b67ee2f3d438d9
+  metadata.gz: 6b40e29e5713b9d247b524ac5696660b8bbd0b1f
+  data.tar.gz: 0dd7c7fb931c2f57b8c0ce2efc7b667dff2abe26
 SHA512:
-  metadata.gz: fe7ebb6bf969afd5b457cfb0ecdf4dbc4ee08ef140b3888960ca9fb083df28388d8a71f7452484bffab3a1870a0269f85910a1a07d20dbfc5a325374fbb74395
-  data.tar.gz: 4c1689a745a21980d2fa46a48d655bbc3795ed1b4336af9551c2602cc801f84ea6e3cac0d83a08d52ff02465af0dfb899e6a632d475a38b91ad8153279a1d220
+  metadata.gz: dfa8dcd9dc64a077264da61f3f93da939cbca85729d467e8148c0de23fc31f54e986fef269315dac16aa3a037307004ce641a66961b7e947cc873e3a8d53b748
+  data.tar.gz: c049aaa4307c92d182975bd6236f9e414d70f018f52b405517ac88df9114d60089a9cba64c470d9426d0eb3a9961a762c9c5fdbc6c2a8de18e189813566206fa

data/lib/cumtd.rb

@@ -16,7 +16,7 @@ class CUMTD
 		@@all_stops = Array.new
 		if stops_file
 			object = nil
-			File.open(stops_file,"rb") {|f| @@all_stops = Marshal.load(f)}
+			File.open(stops_file,"rb") {|f| @@all_stops = YAML.load(f)}
 		else
 			self.get_stops
 		end
@@ -24,13 +24,12 @@ class CUMTD
 		@@all_routes = Array.new
 		if routes_file
 			object = nil
-			File.open(routes_file,"rb") {|f| @@all_routes = Marshal.load(f)}
+			File.open(routes_file,"rb") {|f| @@all_routes = YAML.load(f)}
 		else
 			self.get_routes
 		end
 
 		unless serialize_path == :no_serialize
-			p File.join(serialize_path, 'stops')
 			serialize_stops(File.join(serialize_path, 'stops.yaml'))
 			serialize_routes(File.join(serialize_path, 'routes.yaml'))
 		end
@@ -61,6 +60,12 @@ class CUMTD
 		end
 	end
 
+	def serialize_vehicles(vehicles, file_location)
+		File.open(file_location, "wb") do |file|
+			YAML.dump(vehicles,file)
+		end
+	end
+
 	def get_stops
 		response = self.class.get("/GetStops?key=#{@api_key}")
 		@@all_stops.clear

data/lib/trip.rb

@@ -1,3 +1,4 @@
+require 'json'
 class Trip < CUMTD
 	def initialize(json)
 		@trip_id = json["trip_id"]
@@ -9,6 +10,18 @@ class Trip < CUMTD
 		@shape_id = json["shape_id"]
 	end
 	
+	def to_json(*a)
+		{
+		'trip_id' => @trip_id,
+		'trip_headsign' => @trip_headsign,
+		'route_id' => @route_id,
+		'block_id' => @block_id,
+		'direction' => @direction,
+		'service_id' => @service_id,
+		'shape_id' => @shape_id
+		}.to_json(*a)
+	end
+
 	def trip_id
 		@trip_id
 	end

data/lib/vehicle.rb

@@ -1,3 +1,4 @@
+require 'json'
 class Vehicle < CUMTD
 	def initialize(json)
 		@vehicle_id = json["vehicle_id"]
@@ -41,5 +42,14 @@ class Vehicle < CUMTD
 	def last_updated
 		@last_updated
 	end
+
+	def to_json(*a)
+		{
+		'vehicle_id' => @vehicle_id,
+		'lat' => @location[:lat],
+		'lon' => @location[:lon],
+		'trip' => @trip
+		}.to_json(*a)
+	end
 	
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cumtd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brett Jackson