Changeset 10622

Timestamp:

02/08/10 03:59:50 (2 years ago)

Author:

submersible_toaster

Message:

back to JSON from JSON::XS.. likely to be JSON::PP any time now

Location:

trunk/Padre-Plugin-Swarm

Files:

• Makefile.PL (modified) (1 diff)
• junkyard/irc_gw.pl (modified) (2 diffs)
• junkyard/relay.pl (modified) (2 diffs)
• lib/Padre/Plugin/Swarm/Transport/Global/WxSocket.pm (modified) (2 diffs)
• lib/Padre/Service/Swarm.pm (modified) (2 diffs)
• lib/Padre/Swarm/Geometry.pm (modified) (1 diff)
• t/06_service.t (modified) (2 diffs)

trunk/Padre-Plugin-Swarm/Makefile.PL

@@ -3 +3 @@
 all_from      lib/Padre/Plugin/Swarm.pm
 requires      Padre                 0.56
-requires      JSON::XS              2.26
+requires      JSON              2.15
 requires      IO::Socket::Multicast 1.11
 requires      IO::Select

trunk/Padre-Plugin-Swarm/junkyard/irc_gw.pl

@@ -5 +5 @@
 use AnyEvent::IRC::Client;
 use Data::Dumper;
-use JSON::XS;
+use JSON;
 use Padre::Swarm::Transport::Multicast;
 my $gatewayid = rand() . $$;
@@ -78 +78 @@
             entity => $con->nick, };
             
-      $swarm->tell_channel( 12000, JSON::XS::encode_json $msg );
+      $swarm->tell_channel( 12000, JSON::encode_json $msg );
       #$io->push_write( json => $msg );
    }

trunk/Padre-Plugin-Swarm/junkyard/relay.pl

@@ -7 +7 @@
 use AnyEvent::Handle;
 use IO::Socket::Multicast;
-use JSON::XS;
+use JSON;
 use Carp qw( cluck );
 
@@ -133 +133 @@
     }
     $message->{_relay} = $handle->{token};
-    my $payload = JSON::XS::encode_json($message);
+    my $payload = JSON::encode_json($message);
     #$ae_local->fh->mcast_send(
     #    $payload,

trunk/Padre-Plugin-Swarm/lib/Padre/Plugin/Swarm/Transport/Global/WxSocket.pm

@@ -2 +2 @@
 use strict;
 use warnings;
-use JSON::XS;
+use JSON;
 use Wx qw( :socket );
 use Padre::Wx ();
@@ -26 +26 @@
     my $self = shift;
     
-    my $marshal = JSON::XS->new;
+    my $marshal = JSON->new;
     $self->{marshal} = $marshal;
 #    my $config = $self->plugin->config_read;

trunk/Padre-Plugin-Swarm/lib/Padre/Service/Swarm.pm

@@ -3 +3 @@
 use strict;
 use warnings;
-use JSON::XS;
+use JSON;
 use Padre::Wx      ();
 use Padre::Service ();
@@ -127 +127 @@
 
 sub marshal {
-    JSON::XS->new
+    JSON->new
         ->allow_blessed
         ->convert_blessed

trunk/Padre-Plugin-Swarm/lib/Padre/Swarm/Geometry.pm

@@ -6 +6 @@
 use Graph;
 use Graph::Directed;
-use JSON::XS;
 use Class::XSAccessor 
     accessors => {

trunk/Padre-Plugin-Swarm/t/06_service.t

@@ -1 +1 @@
 use Test::More skip_all => 'Still trouble driving padre in testing';
-use JSON::XS;
+use JSON;
 use t::lib::Demo;
 
@@ -26 +26 @@
 
 $socket->mcast_send(
-        JSON::XS::encode_json( {
+        JSON::encode_json( {
         from => getlogin(),
         type =>'chat',