tired of testing this with old moose versions

4 files changed, 24 insertions, 82 deletions

diff --git a/lib/Bread/Board/Declare.pm b/lib/Bread/Board/Declare.pm
index c0b35af..6157be2 100644
--- a/lib/Bread/Board/Declare.pm
+++ b/lib/Bread/Board/Declare.pm
@@ -107,17 +107,6 @@ they are explicitly disabled. In addition, multiple inheritance would just
 cause a lot of problems, so it is also disabled (although single inheritance
 and role application works properly).
 
-NOTE: When using this module in roles with Moose versions prior to 2.0, the
-attribute trait will need to be applied explicitly to attributes that should
-become services, as in:
-
-  has attr => (
-      traits => ['Service'],
-      is     => 'ro',
-      isa    => 'Str',
-      value  => 'value',
-  )
-
 =cut
 
 my (undef, undef, $init_meta) = Moose::Exporter->build_import_methods(
@@ -128,12 +117,9 @@ my (undef, undef, $init_meta) = Moose::Exporter->build_import_methods(
         class     => ['Bread::Board::Declare::Meta::Role::Class'],
         instance  => ['Bread::Board::Declare::Meta::Role::Instance'],
     },
-    (Moose->VERSION >= 1.9900
-        ? (role_metaroles => {
-               applied_attribute =>
-                   ['Bread::Board::Declare::Meta::Role::Attribute'],
-           })
-        : ()),
+    role_metaroles => {
+        applied_attribute => ['Bread::Board::Declare::Meta::Role::Attribute'],
+    },
     base_class_roles => ['Bread::Board::Declare::Role::Object'],
 );
 
diff --git a/lib/Bread/Board/Declare/Meta/Role/Accessor.pm b/lib/Bread/Board/Declare/Meta/Role/Accessor.pm
deleted file mode 100644
index e38236b..0000000
--- a/lib/Bread/Board/Declare/Meta/Role/Accessor.pm
+++ /dev/null
@@ -1,26 +0,0 @@
-package Bread::Board::Declare::Meta::Role::Accessor;
-use Moose::Role;
-
-around _inline_get => sub {
-    my $orig = shift;
-    my $self = shift;
-    my ($instance) = @_;
-
-    my $attr = $self->associated_attribute;
-
-    return 'do {' . "\n"
-             . 'my $val;' . "\n"
-             . 'if (' . $self->_inline_has($instance) . ') {' . "\n"
-                 . '$val = ' . $self->$orig($instance) . ';' . "\n"
-             . '}' . "\n"
-             . 'else {' . "\n"
-                 . '$val = ' . $instance . '->get_service(\'' . $attr->name . '\')->get;' . "\n"
-                 . $self->_inline_check_constraint('$val')
-             . '}' . "\n"
-             . '$val' . "\n"
-         . '}';
-};
-
-no Moose::Role;
-
-1;
diff --git a/lib/Bread/Board/Declare/Meta/Role/Attribute/Container.pm b/lib/Bread/Board/Declare/Meta/Role/Attribute/Container.pm
index 90d027d..6fa68ad 100644
--- a/lib/Bread/Board/Declare/Meta/Role/Attribute/Container.pm
+++ b/lib/Bread/Board/Declare/Meta/Role/Attribute/Container.pm
@@ -61,9 +61,7 @@ around _inline_instance_get => sub {
                 . join("\n", $self->_inline_check_constraint(
                     '$val',
                     '$type_constraint',
-                    (Moose->VERSION >= 2.0100
-                        ? '$type_message'
-                        : '$type_constraint_obj'),
+                    '$type_message',
                 )) . "\n"
             . '}' . "\n"
             . '$val' . "\n"
diff --git a/lib/Bread/Board/Declare/Meta/Role/Attribute/Service.pm b/lib/Bread/Board/Declare/Meta/Role/Attribute/Service.pm
index 6a8ee9b..edf9080 100644
--- a/lib/Bread/Board/Declare/Meta/Role/Attribute/Service.pm
+++ b/lib/Bread/Board/Declare/Meta/Role/Attribute/Service.pm
@@ -234,42 +234,26 @@ around get_value => sub {
     }
 };
 
-if (Moose->VERSION > 1.9900) {
-    around _inline_instance_get => sub {
-        my $orig = shift;
-        my $self = shift;
-        my ($instance) = @_;
-        return 'do {' . "\n"
-                . 'my $val;' . "\n"
-                . 'if (' . $self->_inline_instance_has($instance) . ') {' . "\n"
-                    . '$val = ' . $self->$orig($instance) . ';' . "\n"
-                . '}' . "\n"
-                . 'else {' . "\n"
-                    . '$val = ' . $instance . '->get_service(\'' . $self->name . '\')->get;' . "\n"
-                    . join("\n", $self->_inline_check_constraint(
-                        '$val',
-                        '$type_constraint',
-                        (Moose->VERSION >= 2.0100
-                            ? '$type_message'
-                            : '$type_constraint_obj'),
-                    )) . "\n"
-                . '}' . "\n"
-                . '$val' . "\n"
-            . '}';
-    };
-}
-else {
-    around accessor_metaclass => sub {
-        my $orig = shift;
-        my $self = shift;
-
-        return Moose::Meta::Class->create_anon_class(
-            superclasses => [ $self->$orig(@_) ],
-            roles        => [ 'Bread::Board::Declare::Meta::Role::Accessor' ],
-            cache        => 1
-        )->name;
-    };
-}
+around _inline_instance_get => sub {
+    my $orig = shift;
+    my $self = shift;
+    my ($instance) = @_;
+    return 'do {' . "\n"
+            . 'my $val;' . "\n"
+            . 'if (' . $self->_inline_instance_has($instance) . ') {' . "\n"
+                . '$val = ' . $self->$orig($instance) . ';' . "\n"
+            . '}' . "\n"
+            . 'else {' . "\n"
+                . '$val = ' . $instance . '->get_service(\'' . $self->name . '\')->get;' . "\n"
+                . join("\n", $self->_inline_check_constraint(
+                    '$val',
+                    '$type_constraint',
+                    '$type_message',
+                )) . "\n"
+            . '}' . "\n"
+            . '$val' . "\n"
+        . '}';
+};
 
 no Moose::Role;