cleanup

shlomif · Dec 22, 2009 · 2ccb675 · 2ccb675
1 parent e417927
commit 2ccb675
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,5 @@
+2.1101
+  add 'Object::Simple::Util::init_attrs'
 2.1002
   add 'new' function to 'Object::Simple::Accessor';
 2.1001

diff --git a/lib/Object/Simple.pm b/lib/Object/Simple.pm
@@ -390,11 +390,11 @@ Object::Simple - Simple class builder
  
 =head1 VERSION
 
-Version 2.1002
+Version 2.1101
 
 =cut
 
-our $VERSION = '2.1002';
+our $VERSION = '2.1101';
 
 =head1 FEATURES
  

diff --git a/lib/Object/Simple/Util.pm b/lib/Object/Simple/Util.pm
@@ -342,7 +342,7 @@ sub create_accessor {
     my $strage;
     if ($accessor_type eq 'ClassAttr') {
         # Strage package Varialbe in case class accessor
-        $strage = "Object::Simple::Util->class_infos->{\$self}{class_attrs}{'$accessor_name'}";
+        $strage = "Object::Simple::Util->class_attrs(\$self)->{'$accessor_name'}";
         $source .=
                 qq/    Carp::croak("${class}::$accessor_name must be called from class, not instance")\n/ .
                 qq/      if ref \$self;\n/;
@@ -766,7 +766,11 @@ sub class_attrs {
 
     my $class = ref $invocant || $invocant;
 
-    return $self->class_infos->{$class}{class_attrs};
+    no strict 'refs';
+    ${"${class}::CLASS_ATTRS"} ||= {};
+    my $class_attrs = ${"${class}::CLASS_ATTRS"};
+
+    return $class_attrs;
 }
 
 # Class attribute is exsist?
@@ -775,7 +779,7 @@ sub exists_class_attr {
 
     my $class = ref $invocant || $invocant;
 
-    return exists $self->class_infos->{$class}{class_attrs}{$accessor_name};
+    return exists $self->class_attrs($class)->{$accessor_name};
 }
 
 # Delete class attribute
@@ -784,7 +788,7 @@ sub delete_class_attr {
 
     my $class = ref $invocant || $invocant;
 
-    return delete $self->class_infos->{$class}{class_attrs}{$accessor_name};
+    return delete $self->class_attrs($class)->{$accessor_name};
 }
 
 sub init_attrs {