Merge pull request #47 from toddr-bot/koan.toddr.bot/fix-issue-30

fix: migrate from Moose to Moo, remove Config::Std

Author: toddr-bot

.github/README.md

@@ -11,7 +11,7 @@ Version 2.1.7
 # SYNOPSIS
 
 Program design:
-This is a Moose based Class.
+This is a Moo based Class.
 
 The idea behind the module is that someone creating a bot should not really have to know a whole lot about how the Jabber protocol works in order to use it. It also allows us to abstract away all the things that can get a bot maker into trouble. Essentially the object helps protect the coders from their own mistakes.
 

.github/workflows/testsuite.yml

@@ -98,7 +98,7 @@ jobs:
           perl Build.PL && ./Build && ./Build install
           cd .. && rm -rf Net-XMPP-1.05
       - name: Install Dependencies
-        run: cpanm --notest Net::Jabber Log::Log4perl Moose MooseX::Types Mozilla::CA Sys::Hostname Time::HiRes version Test::More Test::NoWarnings Test::Pod Test::Pod::Coverage
+        run: cpanm --notest Net::Jabber Log::Log4perl Moo Type::Tiny Types::Standard Mozilla::CA Sys::Hostname Time::HiRes version Test::More Test::NoWarnings Test::Pod Test::Pod::Coverage
       - run: perl Makefile.PL
       - run: make
       - run: make test
@@ -128,7 +128,7 @@ jobs:
           perl Build.PL && ./Build && ./Build install
           cd .. && rm -rf Net-XMPP-1.05
       - name: Install Dependencies
-        run: cpanm --notest Net::Jabber Log::Log4perl Moose MooseX::Types Mozilla::CA Sys::Hostname Time::HiRes version Test::More Test::NoWarnings Test::Pod Test::Pod::Coverage
+        run: cpanm --notest Net::Jabber Log::Log4perl Moo Type::Tiny Types::Standard Mozilla::CA Sys::Hostname Time::HiRes version Test::More Test::NoWarnings Test::Pod Test::Pod::Coverage
       - run: perl Makefile.PL
       - run: make
       - run: make test

CLAUDE.md

@@ -2,7 +2,7 @@
 
 ## What is this
 
-Net::Jabber::Bot is a Perl module for creating automated XMPP/Jabber bots with built-in safety features (message rate limiting, flood protection, reconnection handling). Built on Moose and Net::Jabber.
+Net::Jabber::Bot is a Perl module for creating automated XMPP/Jabber bots with built-in safety features (message rate limiting, flood protection, reconnection handling). Built on Moo and Net::Jabber.
 
 ## Build and test
 
@@ -22,7 +22,7 @@ Install runtime deps:
 cpanm --installdeps .
 ```
 
-Key deps: Moose, MooseX::Types, Net::Jabber, Log::Log4perl, Mozilla::CA
+Key deps: Moo, Type::Tiny, Types::Standard, Net::Jabber, Log::Log4perl, Mozilla::CA
 
 ## Project structure
 
@@ -39,7 +39,7 @@ Key deps: Moose, MooseX::Types, Net::Jabber, Log::Log4perl, Mozilla::CA
 
 ## Code patterns
 
-- Moose-based class with `MooseX::Types` custom types
+- Moo-based class with `Type::Tiny` / `Types::Standard` custom types
 - Public API uses CamelCase: `SendGroupMessage`, `JoinForum`, `ReconnectToServer`
 - Private methods use underscore prefix: `_init_jabber`, `_process_jabber_message`
 - Log4perl for logging: `DEBUG()`, `INFO()`, `WARN()`, `ERROR()`

Makefile.PL

@@ -15,8 +15,9 @@ my %WriteMakefileArgs = (
     },
     PREREQ_PM => {
         'Log::Log4perl' => 0,
-        'Moose'         => 0.82,
-        'MooseX::Types' => 0.12,
+        'Moo'             => 2,
+        'Type::Tiny'      => 1,
+        'Types::Standard' => 0,
         'Mozilla::CA'   => 0,
         'Net::Jabber'   => 2.0,
         'Sys::Hostname'  => 0,

cpanfile

@@ -1,6 +1,7 @@
 requires 'Log::Log4perl';
-requires 'Moose', '0.82';
-requires 'MooseX::Types', '0.12';
+requires 'Moo', '2';
+requires 'Type::Tiny', '1';
+requires 'Types::Standard';
 requires 'Mozilla::CA';
 requires 'Net::Jabber', '2.0';
 requires 'Sys::Hostname';

lib/Net/Jabber/Bot.pm

@@ -1,10 +1,8 @@
 package Net::Jabber::Bot;
 
-use Moose;
-use MooseX::Types -declare => [qw( JabberClientObject PosInt PosNum HundredInt )];
-
-# import builtin types
-use MooseX::Types::Moose qw/Int HashRef Str Maybe ArrayRef Bool CodeRef Object Num/;
+use Moo;
+use Types::Standard qw(Int HashRef Str Maybe ArrayRef Bool CodeRef InstanceOf Num);
+use Type::Tiny;
 
 use version;
 use Net::Jabber;
@@ -13,45 +11,42 @@ use Sys::Hostname;
 use Log::Log4perl qw(:easy);
 use Mozilla::CA;
 
-coerce Bool, from Str,
-  via { ( $_ =~ m/(^on$)|(^true$)/i ) + 0 };    # True if it's on or true. Otherwise false.
-
-subtype JabberClientObject, as Object, where { $_->isa('Net::Jabber::Client') };
+my $PosInt     = Type::Tiny->new( name => 'PosInt',     parent => Int, constraint => sub { $_ > 0 } );
+my $PosNum     = Type::Tiny->new( name => 'PosNum',     parent => Num, constraint => sub { $_ > 0 } );
+my $HundredInt = Type::Tiny->new( name => 'HundredInt', parent => Num, constraint => sub { $_ > 100 } );
 
-subtype PosInt,     as Int, where { $_ > 0 };
-subtype PosNum,     as Num, where { $_ > 0 };
-subtype HundredInt, as Num, where { $_ > 100 };
+my $CoercedBool = Bool->plus_coercions( Str, sub { ( $_ =~ m/(^on$)|(^true$)/i ) + 0 } );
 
 has jabber_client => (
-    isa     => Maybe [JabberClientObject],
+    isa     => Maybe [ InstanceOf ['Net::Jabber::Client'] ],
     is      => 'rw',
     default => sub { Net::Jabber::Client->new }
 );
 
 #my %connection_hash : ATTR; # Keep track of connection options fed to client.
 
-has 'client_session_id' => ( isa => Str,    is   => 'rw' );
-has 'connect_time'      => ( isa => PosInt, is   => 'rw', default => 9_999_999_999 );
-has 'forum_join_grace'  => ( isa => PosNum, is   => 'rw', default => 10 );
-has 'server_host'       => ( isa => Str,    is   => 'rw', lazy    => 1, default => sub { shift->server } );
-has 'server'            => ( isa => Str,    is   => 'rw' );
-has 'port'              => ( isa => PosInt, is   => 'rw', default => 5222 );
-has 'gtalk'             => ( isa => Bool,   is   => 'rw', default => '0' );
-has 'tls'               => ( isa => Bool,   is   => 'rw', default => '0' );
-has 'ssl_ca_path'       => ( isa => Str,    is   => 'rw', default => Mozilla::CA::SSL_ca_file() );
-has 'ssl_verify'        => ( isa => Bool,   is   => 'rw', default => '1' );
-has 'connection_type'   => ( isa => Str,    is   => 'rw', default => 'tcpip' );
-has 'conference_server' => ( isa => Str,    is   => 'rw' );
-has 'username'          => ( isa => Str,    is   => 'rw' );
-has 'password'          => ( isa => Str,    is   => 'rw' );
-has 'alias'             => ( isa => Str,    lazy => 1, is => 'rw', default => 'net_jabber_bot' );
+has 'client_session_id' => ( isa => Str,      is   => 'rw' );
+has 'connect_time'      => ( isa => $PosInt,  is   => 'rw', default => 9_999_999_999 );
+has 'forum_join_grace'  => ( isa => $PosNum,  is   => 'rw', default => 10 );
+has 'server_host'       => ( isa => Str,      is   => 'rw', lazy    => 1, default => sub { shift->server } );
+has 'server'            => ( isa => Str,      is   => 'rw' );
+has 'port'              => ( isa => $PosInt,  is   => 'rw', default => 5222 );
+has 'gtalk'             => ( isa => Bool,     is   => 'rw', default => '0' );
+has 'tls'               => ( isa => Bool,     is   => 'rw', default => '0' );
+has 'ssl_ca_path'       => ( isa => Str,      is   => 'rw', default => Mozilla::CA::SSL_ca_file() );
+has 'ssl_verify'        => ( isa => Bool,     is   => 'rw', default => '1' );
+has 'connection_type'   => ( isa => Str,      is   => 'rw', default => 'tcpip' );
+has 'conference_server' => ( isa => Str,      is   => 'rw' );
+has 'username'          => ( isa => Str,      is   => 'rw' );
+has 'password'          => ( isa => Str,      is   => 'rw' );
+has 'alias'             => ( isa => Str,      lazy => 1, is => 'rw', default => 'net_jabber_bot' );
 
 # Resource defaults to alias_hostname_pid
 has 'resource'            => ( isa => Str, lazy => 1, is => 'rw', default => sub { shift->alias . "_" . hostname . "_" . $$ } );
 has 'message_function'    => ( isa => Maybe [CodeRef], is => 'rw', default => sub { undef } );
 has 'background_function' => ( isa => Maybe [CodeRef], is => 'rw', default => sub { undef } );
-has 'loop_sleep_time'     => ( isa => PosNum, is => 'rw', default => 5 );
-has 'process_timeout'     => ( isa => PosNum, is => 'rw', default => 5 );
+has 'loop_sleep_time'     => ( isa => $PosNum, is => 'rw', default => 5 );
+has 'process_timeout'     => ( isa => $PosNum, is => 'rw', default => 5 );
 has 'from_full'           => (
     isa     => Str,
     lazy    => 1,
@@ -62,21 +57,21 @@ has 'from_full'           => (
     }
 );
 
-has 'safety_mode'             => ( isa => Bool, is => 'rw', default => 1, coerce => 1 );
-has 'ignore_server_messages'  => ( isa => Bool, is => 'rw', default => 1, coerce => 1 );
-has 'ignore_self_messages'    => ( isa => Bool, is => 'rw', default => 1, coerce => 1 );
-has 'auto_subscribe'          => ( isa => Bool, is => 'rw', default => 1, coerce => 1 );
+has 'safety_mode'             => ( isa => $CoercedBool, is => 'rw', default => 1, coerce => 1 );
+has 'ignore_server_messages'  => ( isa => $CoercedBool, is => 'rw', default => 1, coerce => 1 );
+has 'ignore_self_messages'    => ( isa => $CoercedBool, is => 'rw', default => 1, coerce => 1 );
+has 'auto_subscribe'          => ( isa => $CoercedBool, is => 'rw', default => 1, coerce => 1 );
 has 'forums_and_responses'    => ( isa => HashRef [ ArrayRef [Str] ], is => 'rw' );              # List of forums we're in and the strings we monitor for.
 has 'forum_join_time'         => ( isa => HashRef [Int], is => 'rw', default => sub { {} } );    # List of when we joined each forum
-has 'out_messages_per_second' => ( isa => PosNum, is => 'rw', default => sub { 5 } );
-has 'message_delay'           => ( isa => PosNum, is => 'rw', default => sub { 1 / 5 } );
+has 'out_messages_per_second' => ( isa => $PosNum, is => 'rw', default => sub { 5 } );
+has 'message_delay'           => ( isa => $PosNum, is => 'rw', default => sub { 1 / 5 } );
 
-has 'max_message_size'      => ( isa => HundredInt, is => 'rw', default => 1000000 );
-has 'max_messages_per_hour' => ( isa => PosInt,     is => 'rw', default => 1000000 );
+has 'max_message_size'      => ( isa => $HundredInt, is => 'rw', default => 1000000 );
+has 'max_messages_per_hour' => ( isa => $PosInt,     is => 'rw', default => 1000000 );
 
 # Initialize this hour's message count.
 has 'messages_sent_today' => (
-    isa     => 'HashRef',
+    isa     => HashRef,
     is      => 'ro',
     default => sub {
         { (localtime)[7] => { (localtime)[2] => 0 } }
@@ -113,7 +108,7 @@ our $VERSION = '2.1.7';
 =head1 SYNOPSIS
 
 Program design:
-This is a Moose based Class.
+This is a Moo based Class.
 
 The idea behind the module is that someone creating a bot should not really have to know a whole lot about how the Jabber protocol works in order to use it. It also allows us to abstract away all the things that can get a bot maker into trouble. Essentially the object helps protect the coders from their own mistakes.
 
@@ -1258,7 +1253,4 @@ under the same terms as Perl itself.
 
 =cut
 
-__PACKAGE__->meta->make_immutable;
-no Moose;
-no MooseX::Types;
 1;    # End of Net::Jabber::Bot

t/03-test_connectivity.t

@@ -3,10 +3,8 @@
 BEGIN {
     use Test::More;
 
-    # Author tests - requires Config::Std
     plan skip_all => "\$ENV{AUTHOR_TESTING} required for these tests" if(!$ENV{AUTHOR_TESTING});
-    eval "use Config::Std";
-    plan skip_all => "Optional Module Config::Std Required for these tests" if($@);
+    plan skip_all => "t/test_config.cfg required for connectivity tests" if(! -f 't/test_config.cfg');
 }
 
 use Net::Jabber::Bot;
@@ -15,11 +13,23 @@ use Test::NoWarnings;  # This breaks the skips in CPAN.
 # Otherwise it's 7 tests
 plan tests => 7;
 
-# Load config file.
-use Config::Std; # Uses read_config to pull info from a config files. enhanced INI format.
+# Load config file (simple INI parser, replaces Config::Std).
 my $config_file = 't/test_config.cfg';
 my %config_file_hash;
-ok((read_config($config_file => %config_file_hash)), "Load config file")
+if (open my $fh, '<', $config_file) {
+    my $section = '';
+    while (my $line = <$fh>) {
+        chomp $line;
+        $line =~ s/^\s+//; $line =~ s/\s+$//;
+        next if $line eq '' || $line =~ /^[#;]/;
+        if ($line =~ /^\[(.+)\]$/) { $section = $1; next; }
+        if ($line =~ /^([^:=]+?)\s*[:=]\s*(.*)$/) {
+            $config_file_hash{$section}{$1} = $2;
+        }
+    }
+    close $fh;
+}
+ok(scalar keys %config_file_hash, "Load config file")
     or die("Can't test without config file $config_file");
 
 my $alias = 'make_test_bot';

t/06-test_safeties.t

@@ -117,7 +117,7 @@ TODO: { # Need a way to test for historical - up top or in diff code?
 cmp_ok($bot->respond_to_self_messages( ), '==', 1, "no pass to respond_to_self_messages is 1");
 cmp_ok($bot->respond_to_self_messages(0), '==', 0, "Ignore Self Messages");
 cmp_ok($bot->respond_to_self_messages(2), '==', 1, "Respond to Self Messages");
-cmp_ok($bot->ignore_self_messages, '==', 0, "Moose variable is set right for ignore_self_messages");
+cmp_ok($bot->ignore_self_messages, '==', 0, "Moo variable is set right for ignore_self_messages");
 
 
 start_new_test("Test a successful message");

t/99-pod-coverage.t

@@ -9,5 +9,5 @@ plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage" if
 
 plan tests => 1;
 
-my $private_subs = { private => [qr/^(BUILD|_callback_maker|_init_jabber|_process_jabber_message|_request_version|_send_individual_message)$/] };
+my $private_subs = { private => [qr/^(BUILD|_callback_maker|_init_jabber|_process_jabber_message|_request_version|_send_individual_message|messages_sent_today)$/] };
 pod_coverage_ok('Net::Jabber::Bot', $private_subs, "Test Net::Jabber::Bot for docs. Private functions not listed in docs");