11 files changed, 40 insertions, 265 deletions
diff --git a/lib/WebService/TFL/Bus/Fields.pm b/lib/WebService/TFL/Bus/Fields.pm
deleted file mode 100644
index b3d555f..0000000
--- a/lib/WebService/TFL/Bus/Fields.pm
+++ /dev/null
@@ -1,77 +0,0 @@
-package WebService::TFL::Bus::Fields;
-use strict;
-use warnings;
-
-sub stop_return_fields {
-    qw(
-          StopPointName
-          StopID
-          StopCode1
-          StopCode2
-          StopPointType
-          Towards
-          Bearing
-          StopPointIndicator
-          StopPointState
-          Latitude
-          Longitude
-  );
-}
-
-sub prediction_return_fields {
-    stop_return_fields(),
-    qw(
-          VisitNumber
-          LineID
-          LineName
-          DirectionID
-          DestinationText
-          DestinationName
-          VehicleID
-          TripID
-          RegistrationNumber
-          EstimatedTime
-          ExpireTime
-  ),
-}
-
-sub flexible_return_fields {
-    stop_return_fields,
-    qw(
-          MessageUUID
-          MessageType
-          MessagePriority
-          MessageText
-          StartTime
-          ExpireTime
-  ),
-}
-
-sub query_fields {
-    qw(
-          StopAlso
-          Circle
-          StopPointName
-          StopID
-          StopCode1
-          StopCode2
-          StopPointType
-          Towards
-          Bearing
-          StopPointIndicator
-          StopPointState
-          VisitNumber
-          LineID
-          LineName
-          DirectionID
-          DestinationText
-          DestinationName
-          VehicleID
-          TripID
-          RegistrationNumber
-          MessageType
-          MessagePriority
-  );
-}
-
-1;
diff --git a/lib/WebService/TFL/Bus/Prediction.pm b/lib/WebService/TFL/Bus/Prediction.pm
new file mode 100644
index 0000000..670baf7
--- /dev/null
+++ b/lib/WebService/TFL/Bus/Prediction.pm
@@ -0,0 +1,26 @@
+package WebService::TFL::Bus::Prediction;
+use Moo;
+use Types::Standard -all;
+use Types::DateTime -all;
+use namespace::clean;
+
+has [qw(stationName lineName towards)] => (
+    is => 'ro',
+    isa => Str,
+    required => 1,
+);
+
+has 'expectedArrival' => (
+    is => 'ro',
+    isa => DateTimeUTC->plus_coercions( Format['ISO8601'] ),
+    required => 1,
+    coerce => 1,
+);
+
+sub new_from_response {
+    my ($class,$response_data) = @_;
+
+    return $class->new($response_data);
+}
+
+1;
diff --git a/lib/WebService/TFL/Bus/Request.pm b/lib/WebService/TFL/Bus/Request.pm
deleted file mode 100644
index dda6586..0000000
--- a/lib/WebService/TFL/Bus/Request.pm
+++ /dev/null
@@ -1,38 +0,0 @@
-package WebService::TFL::Bus::Request;
-use Moo;
-use Types::Standard -all;
-use WebService::TFL::Bus::Fields;
-use namespace::autoclean;
-
-for my $field (WebService::TFL::Bus::Fields->query_fields) {
-    has $field => (
-        is => 'rw',
-        predicate => "has_$field",
-    );
-}
-
-has ReturnList => (
-    is => 'rw',
-    isa => ArrayRef,
-    predicate => 'has_ReturnList',
-);
-
-sub request_uri {
-    my ($self,$base_uri) = @_;
-
-    my $uri = $base_uri->clone;
-    my %form;
-    for my $field (WebService::TFL::Bus::Fields->query_fields) {
-        my $pred = "has_$field";
-        if ($self->$pred) {
-            $form{$field} = $self->$field;
-        }
-    }
-    if ($self->has_ReturnList) {
-        $form{ReturnList}=join ',',@{$self->ReturnList}
-    }
-    $uri->query_form(\%form);
-    return $uri;
-}
-
-1;
diff --git a/lib/WebService/TFL/Bus/Response.pm b/lib/WebService/TFL/Bus/Response.pm
index e05d49d..6cba172 100644
--- a/lib/WebService/TFL/Bus/Response.pm
+++ b/lib/WebService/TFL/Bus/Response.pm
@@ -1,55 +1,24 @@
 package WebService::TFL::Bus::Response;
 use Moo;
-use Class::Load 'load_class';
-use Type::Utils 'class_type';
 use Types::Standard -all;
-use JSON;
-use namespace::autoclean;
+use WebService::TFL::Bus::Prediction;
+use namespace::clean;
 
-sub line_class {
-    "WebService::TFL::Bus::Response::$_[0]";
-}
-
-my %line_map = (
-    0 => 'Stop',
-    1 => 'Prediction',
-    2 => 'FlexibleMessage',
-    3 => 'BaseVersion',
-    4 => 'URAVersion',
+has predictions => (
+    is => 'ro',
+    isa => ArrayRef[InstanceOf['WebService::TFL::Bus::Prediction']],
 );
 
-for my $field (values %line_map) {
-    my $class = line_class($field);
-    load_class($class);
-    has $field => (
-        is => 'ro',
-        isa => ArrayRef[class_type { class => $class }],
-    );
-}
-
-sub new_from_json {
-    my ($class,$return_list,$json) = @_;
-
-    my $parser = JSON->new->utf8;
-
-    my %return_set;@return_set{@$return_list}=();
-    unless (%return_set) {
-        @return_set{qw(StopPointName LineName EstimatedTime)}=();
-    }
-    my %args;
-
-    while ($json) {
-        my ($array,$consumed) = $parser->decode_prefix($json);
-
-        my $array_type = $line_map{$array->[0]};
-        my $line_class = line_class($array_type);
-        push @{$args{$array_type}},
-            $line_class->new_from_array(\%return_set,$array);
-
-        substr($json,0,$consumed)='';
-    }
+sub new_from_response {
+    my ($class,$response_data) = @_;
 
-    return $class->new(\%args);
+    return $class->new({
+        predictions => [
+            map { WebService::TFL::Bus::Prediction->new_from_response($_) }
+            grep { $_->{'$type'} =~ /\bPrediction\b/ }
+            $response_data->@*
+        ],
+    });
 }
 
 1;
diff --git a/lib/WebService/TFL/Bus/Response/BaseVersion.pm b/lib/WebService/TFL/Bus/Response/BaseVersion.pm
deleted file mode 100644
index 07edbcb..0000000
--- a/lib/WebService/TFL/Bus/Response/BaseVersion.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package WebService::TFL::Bus::Response::BaseVersion;
-use Moo;
-use namespace::autoclean;
-
-has Version => (
-    is => 'ro',
-);
-
-sub new_from_array {
-    my ($class,$return_set,$array) = @_;
-
-    return $class->new({Version => $array->[1]});
-}
-
-1;
diff --git a/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm b/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm
deleted file mode 100644
index 603ef6b..0000000
--- a/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package WebService::TFL::Bus::Response::FlexibleMessage;
-use Moo;
-use namespace::autoclean;
-use WebService::TFL::Bus::ResponseTypeRole;
-with ResponseTypeRole('flexible');
-
-1;
diff --git a/lib/WebService/TFL/Bus/Response/Prediction.pm b/lib/WebService/TFL/Bus/Response/Prediction.pm
deleted file mode 100644
index 49a4b76..0000000
--- a/lib/WebService/TFL/Bus/Response/Prediction.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package WebService::TFL::Bus::Response::Prediction;
-use Moo;
-use namespace::autoclean;
-use WebService::TFL::Bus::ResponseTypeRole;
-with ResponseTypeRole('prediction');
-
-1;
diff --git a/lib/WebService/TFL/Bus/Response/Stop.pm b/lib/WebService/TFL/Bus/Response/Stop.pm
deleted file mode 100644
index 30f2f91..0000000
--- a/lib/WebService/TFL/Bus/Response/Stop.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package WebService::TFL::Bus::Response::Stop;
-use Moo;
-use namespace::autoclean;
-use WebService::TFL::Bus::ResponseTypeRole;
-with ResponseTypeRole('stop');
-
-1;
diff --git a/lib/WebService/TFL/Bus/Response/URAVersion.pm b/lib/WebService/TFL/Bus/Response/URAVersion.pm
deleted file mode 100644
index fc0b41f..0000000
--- a/lib/WebService/TFL/Bus/Response/URAVersion.pm
+++ /dev/null
@@ -1,17 +0,0 @@
-package WebService::TFL::Bus::Response::URAVersion;
-use Moo;
-use namespace::autoclean;
-
-for my $field (qw(Version TimeStamp)) {
-    has $field => (
-        is => 'ro',
-    );
-}
-
-sub new_from_array {
-    my ($class,$return_set,$array) = @_;
-
-    return $class->new({Version => $array->[1],TimeStamp => $array->[2]});
-}
-
-1;
diff --git a/lib/WebService/TFL/Bus/ResponseTypeRole.pm b/lib/WebService/TFL/Bus/ResponseTypeRole.pm
deleted file mode 100644
index 7f48419..0000000
--- a/lib/WebService/TFL/Bus/ResponseTypeRole.pm
+++ /dev/null
@@ -1,38 +0,0 @@
-package WebService::TFL::Bus::ResponseTypeRole;
-use Package::Variant
-    importing => [ 'Moo::Role'],
-    subs => [ 'has' ];
-use WebService::TFL::Bus::Fields;
-use WebService::TFL::Bus::Types 'DateTimeMillis';
-
-sub make_variant {
-    my ($class,$target_package,$type) = @_;
-
-    my $method = $type . '_return_fields';
-    my @fields = WebService::TFL::Bus::Fields->$method;
-
-    for my $field (@fields) {
-        has $field => (
-            is => 'ro',
-            ( $field =~ /Time$/ ? (
-                isa => DateTimeMillis,
-                coerce => DateTimeMillis->coercion,
-            ) : () ),
-        );
-    }
-
-    install new_from_array => sub {
-        my ($class,$return_set,$array) = @_;
-
-        my %args;
-        my $i=1;
-        for my $field (@fields) {
-            next unless exists $return_set->{$field};
-            $args{$field}=$array->[$i];
-            ++$i;
-        }
-        return $class->new(\%args);
-    }
-}
-
-1;
diff --git a/lib/WebService/TFL/Bus/Types.pm b/lib/WebService/TFL/Bus/Types.pm
deleted file mode 100644
index e67fe32..0000000
--- a/lib/WebService/TFL/Bus/Types.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-package WebService::TFL::Bus::Types;
-use Type::Library -base, -declare => 'DateTimeMillis';
-use Types::Standard -all;
-use Type::Utils -all;
-use Types::DateTime 'DateTimeT';
-use namespace::autoclean;
-
-declare DateTimeMillis, as DateTimeT;
-coerce DateTimeMillis, from Num, via {
-    require DateTime;
-    DateTime->from_epoch( epoch => $_ / 1000 )
-};
-
-1;