Rewrite to use of Mo::utils and Mo::utils::CSS

michal-josef-spacek · Jun 9, 2024 · cedeb96 · cedeb96
1 parent 85c34d8
commit cedeb96
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 13 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,5 @@
 0.03
+ - Rewrite to use of Mo::utils and Mo::utils::CSS.
 
 0.02 2024-05-11T00:43:23+02:00
  - Add DESCRIPTION section to doc.

diff --git a/Grid.pm b/Grid.pm
@@ -6,6 +6,8 @@ use warnings;
 
 use Class::Utils qw(set_params split_params);
 use Error::Pure qw(err);
+use Mo::utils 0.01 qw(check_required);
+use Mo::utils::CSS 0.02 qw(check_css_class);
 use Scalar::Util qw(blessed);
 
 our $VERSION = 0.03;
@@ -25,9 +27,8 @@ sub new {
 	# Process params.
 	set_params($self, @{$object_params_ar});
 
-	if (! defined $self->{'css_class'}) {
-		err "Parameter 'css_class' is required.";
-	}
+	check_required($self, 'css_class');
+	check_css_class($self, 'css_class');
 
 	# Object.
 	return $self;
@@ -272,6 +273,13 @@ Returns undef.
  new():
          From Class::Utils::set_params():
                  Unknown parameter '%s'.
+         From Mo::utils::check_required():
+                 Parameter 'css_class' is required.
+         From Mo::utils::CSS::check_css_class():
+                 Parameter 'css_class' has bad CSS class name.
+                         Value: %s
+                 Parameter 'css_class' has bad CSS class name (number on begin).
+                         Value: %s
          From Tags::HTML::new():
                  Parameter 'css' must be a 'CSS::Struct::Output::*' class.
                  Parameter 'tags' must be a 'Tags::Output::*' class.
@@ -503,6 +511,8 @@ Returns undef.
 
 L<Class::Utils>,
 L<Error::Pure>,
+L<Mo::utils>,
+L<Mo::utils::CSS>,
 L<Scalar::Util>,
 L<Tags::HTML>.
 

diff --git a/META.yml b/META.yml
@@ -31,6 +31,8 @@ no_index:
 requires:
   Class::Utils: 0
   Error::Pure: 0
+  Mo::utils: 0.01
+  Mo::utils::CSS: 0.02
   Scalar::Util: 0
   Tags::HTML: 0.08
   perl: 5.8.0

diff --git a/Makefile.PL b/Makefile.PL
@@ -19,6 +19,8 @@ readme_from 'Grid.pm';
 recursive_author_tests('xt');
 requires 'Class::Utils' => 0;
 requires 'Error::Pure' => 0;
+requires 'Mo::utils' => 0.01;
+requires 'Mo::utils::CSS' => 0.02;
 requires 'Tags::HTML' => 0.08;
 requires 'Scalar::Util' => 0;
 requires 'perl' => '5.8.0';

diff --git a/README b/README
@@ -85,6 +85,13 @@ ERRORS
      new():
              From Class::Utils::set_params():
                      Unknown parameter '%s'.
+             From Mo::utils::check_required():
+                     Parameter 'css_class' is required.
+             From Mo::utils::CSS::check_css_class():
+                     Parameter 'css_class' has bad CSS class name.
+                             Value: %s
+                     Parameter 'css_class' has bad CSS class name (number on begin).
+                             Value: %s
              From Tags::HTML::new():
                      Parameter 'css' must be a 'CSS::Struct::Output::*' class.
                      Parameter 'tags' must be a 'Tags::Output::*' class.
@@ -299,7 +306,8 @@ EXAMPLE2
      # Output screenshot is in images/ directory.
 
 DEPENDENCIES
-    Class::Utils, Error::Pure, Scalar::Util, Tags::HTML.
+    Class::Utils, Error::Pure, Mo::utils, Mo::utils::CSS, Scalar::Util,
+    Tags::HTML.
 
 SEE ALSO
     Tags::HTML::Login::Access

diff --git a/t/Tags-HTML-Navigation-Grid/03-new.t b/t/Tags-HTML-Navigation-Grid/03-new.t
@@ -7,7 +7,7 @@ use Error::Pure::Utils qw(clean);
 use Tags::HTML::Navigation::Grid;
 use Tags::Output::Structure;
 use Test::MockObject;
-use Test::More 'tests' => 8;
+use Test::More 'tests' => 10;
 use Test::NoWarnings;
 
 # Test.
@@ -50,38 +50,64 @@ clean();
 # Test.
 eval {
 	Tags::HTML::Navigation::Grid->new(
-		'tags' => 'foo',
+		'css_class' => undef,
 	);
 };
 is(
 	$EVAL_ERROR,
-	"Parameter 'tags' must be a 'Tags::Output::*' class.\n",
-	"Parameter 'tags' must be a 'Tags::Output::*' class (foo).",
+	"Parameter 'css_class' is required.\n",
+	"Parameter 'css_class' is required.",
 );
 clean();
 
 # Test.
 eval {
 	Tags::HTML::Navigation::Grid->new(
-		'tags' => Test::MockObject->new,
+		'css_class' => '1foo',
+	);
+};
+is(
+	$EVAL_ERROR,
+	"Parameter 'css_class' has bad CSS class name (number on begin).\n",
+	"Parameter 'css_class' has bad CSS class name (number on begin) (1foo).",
+);
+clean();
+
+# Test.
+eval {
+	Tags::HTML::Navigation::Grid->new(
+		'css_class' => '@foo',
+	);
+};
+is(
+	$EVAL_ERROR,
+	"Parameter 'css_class' has bad CSS class name.\n",
+	"Parameter 'css_class' has bad CSS class name (\@foo).",
+);
+clean();
+
+# Test.
+eval {
+	Tags::HTML::Navigation::Grid->new(
+		'tags' => 'foo',
 	);
 };
 is(
 	$EVAL_ERROR,
 	"Parameter 'tags' must be a 'Tags::Output::*' class.\n",
-	"Parameter 'tags' must be a 'Tags::Output::*' class (bad instance).",
+	"Parameter 'tags' must be a 'Tags::Output::*' class (foo).",
 );
 clean();
 
 # Test.
 eval {
 	Tags::HTML::Navigation::Grid->new(
-		'css_class' => undef,
+		'tags' => Test::MockObject->new,
 	);
 };
 is(
 	$EVAL_ERROR,
-	"Parameter 'css_class' is required.\n",
-	"Parameter 'css_class' is required.",
+	"Parameter 'tags' must be a 'Tags::Output::*' class.\n",
+	"Parameter 'tags' must be a 'Tags::Output::*' class (bad instance).",
 );
 clean();