Cleanup tests, fix deps in META

Author: Mons

META.json

@@ -34,12 +34,12 @@
          "requires" : {
             "AnyEvent" : "5",
             "Digest::SHA1" : "2",
-            "HTTP::Easy" : "0.03",
+            "HTTP::Easy" : "0.02",
             "JSON::XS" : "3"
          }
       }
    },
    "release_status" : "stable",
-   "version" : "1.99994",
+   "version" : "1.99995",
    "x_serialization_backend" : "JSON::PP version 4.06"
 }

META.yml

@@ -20,7 +20,7 @@ no_index:
 requires:
   AnyEvent: '5'
   Digest::SHA1: '2'
-  HTTP::Easy: '0.03'
+  HTTP::Easy: '0.02'
   JSON::XS: '3'
-version: '1.99994'
+version: '1.99995'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

lib/AnyEvent/HTTP/Server.pm

@@ -8,21 +8,11 @@ AnyEvent::HTTP::Server - AnyEvent HTTP/1.1 Server
 
 our $VERSION;
 BEGIN{
-$VERSION = '1.99994';
+$VERSION = '1.99995';
 }
 
-#use common::sense;
-#use 5.008008;
-#use strict;
-#use warnings;
-#no  warnings 'uninitialized';
-#use mro 'c3';
 use AnyEvent::HTTP::Server::Kit;
 
-#use Exporter;
-#our @ISA = qw(Exporter);
-#our @EXPORT_OK = our @EXPORT = qw(http_server);
-
 use AnyEvent;
 use AnyEvent::Socket;
 use AnyEvent::Handle;
@@ -37,8 +27,6 @@ use Compress::Zlib ();
 use MIME::Base64 ();
 use Time::HiRes qw/gettimeofday/;
 
-#use Carp 'croak';
-
 use AnyEvent::HTTP::Server::Req;
 
 our $MIME = Encode::find_encoding('MIME-Header');
@@ -593,14 +581,8 @@ sub incoming {
 													#warn "call for part $hd{name} ($last)";
 													$cb->( $last && $idx == -1 ? 1 : 0,$part,\%hd );
 												}
-												#warn "just return";
-												#if ($last) {
-													#warn "leave with $body";
-												#}
 											};
 										}
-#										elsif ( $h{'content-type'} =~ m{^application/x-www-form-urlencoded(?:\Z|\s*;)}i and exists $rv[0]{form} ) {
-
 										elsif (  exists $rv[0]{form} ) {
 											my $body = '';
 											$r{on_body} = sub {
@@ -792,47 +774,6 @@ sub graceful {
 1; # End of AnyEvent::HTTP::Server
 __END__
 
-sub http_server($$&) {
-	my ($lhost,$lport,$reqcb) = @_;
-	
-	# TBD
-	
-	return $self;
-}
-
-sub __old_stop {
-	my ($self,$cb) = @_;
-	delete $self->{aw};
-	close $self->{socket};
-	if (%{$self->{con}}) {
-		$log->debugf("Server have %d active connectinos while stopping...", 0+keys %{$self->{con}});
-		my $cv = &AE::cv( $cb );
-		$cv->begin;
-		for my $key ( keys %{$self->{con}} ) {
-			my $con = $self->{con}{$key};
-			$log->debug("$key: connection from $con->{host}:$con->{port}: $con->{state}");
-			if ($con->{state} eq 'idle' or $con->{state} eq 'closed') {
-				$con->close;
-				delete $self->{con}{$key};
-				use Devel::FindRef;
-				warn "closed <$con> ".Devel::FindRef::track $con;
-			} else {
-				$cv->begin;
-				$con->{close} = sub {
-					$log->debug("Connection $con->{host}:$con->{port} was closed");
-					$cv->end;
-				};
-			}
-		}
-		if (%{$self->{con}}) {
-			$log->debug("Still have @{[ 0+keys %{$self->{con}} ]}");
-		}
-		$cv->end;
-	} else {
-		$cb->();
-	}
-}
-
 =head1 SYNOPSIS
 
     use AnyEvent::HTTP::Server;

lib/AnyEvent/HTTP/Server/Req.pm

@@ -304,23 +304,12 @@ BEGIN {
 			#return $self->headers(@_) if @_ % 2;
 			my ($code,$content,%args) = @_;
 			$code ||=200;
-			#if (ref $content) {
-			#	if (ref $content eq 'HASH' and $content->{sendfile}) {
-			#		$content->{size} = -s $content->{sendfile};
-			#	}
-			#	else {
-			#		croak "Unknown type of content: $content";
-			#	}
-			#	
-			#} else {
-				utf8::encode $content if utf8::is_utf8 $content;
-			#}
+			utf8::encode $content if utf8::is_utf8 $content;
 			my $reply = "HTTP/$self->{version} $code $http{$code}$LF";
 			my @good;my @bad;
 			my $h = {
 				server           => $Server,
 				%{ $args{headers} || {} },
-				#'connection' => 'close',
 				'connection' => ( $args{headers} && $args{headers}{connection} ) ? $args{headers}{connection} : $self->connection,
 			};
 			if ($self->method ne 'HEAD') {

t/01-basic-ae.t

@@ -0,0 +1,11 @@
+#use strict;
+#use uni::perl ':dumper';
+
+use AnyEvent::Socket;
+use AnyEvent::Handle;
+use AnyEvent::HTTP::Server;
+use AnyEvent::HTTP::Server::Kit ':dumper';
+use AnyEvent::Loop;
+use FindBin;
+
+do "$FindBin::Bin/basic.pl" or die "$FindBin::Bin/basic.pl: ".($@ ? $@ : $!);

t/02-basic-ev.t

@@ -0,0 +1,14 @@
+#use strict;
+#use uni::perl ':dumper';
+
+use AnyEvent::Socket;
+use AnyEvent::Handle;
+use AnyEvent::HTTP::Server;
+use AnyEvent::HTTP::Server::Kit ':dumper';
+use Test::More;
+BEGIN{
+    eval { require EV; 1 } or plan skip_all => "EV not installed";
+}
+use FindBin;
+
+do "$FindBin::Bin/basic.pl" or die "$FindBin::Bin/basic.pl: $!";

t/02-sendfile.t t/03-sendfile.tt/02-sendfile.t renamed to t/03-sendfile.t

@@ -1,15 +1,9 @@
 #!/usr/bin/env perl
 
-#use strict;
-#use uni::perl ':dumper';
-
-use AnyEvent::Socket;
-use AnyEvent::Handle;
-use AnyEvent::HTTP::Server;
-use AnyEvent::HTTP::Server::Kit ':dumper';
-use EV;
 use Test::More tests => 194;
 use Data::Dumper;
+use FindBin;
+use lib "$FindBin::Bin/..";
 $Data::Dumper::Useqq = 1;
 
 use t::testlib;
@@ -264,4 +258,3 @@
 }
 
 done_testing();
-