From 86476983d21b7830a4f974f277e91b748542669a Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 10 Oct 2011 19:19:22 -0500
Subject: tired of testing this with old moose versions

---
 lib/Bread/Board/Declare/Meta/Role/Accessor.pm      | 26 ----------
 .../Board/Declare/Meta/Role/Attribute/Container.pm |  4 +-
 .../Board/Declare/Meta/Role/Attribute/Service.pm   | 56 ++++++++--------------
 3 files changed, 21 insertions(+), 65 deletions(-)
 delete mode 100644 lib/Bread/Board/Declare/Meta/Role/Accessor.pm

(limited to 'lib/Bread/Board/Declare')

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;
 
-- 
cgit v1.2.3