@@ -1,7 +1,11 @@

+package DBIx::Custom;

+use base 'Object::Simple::Base';

+

+use strict;

+use warnings;

+

 use 5.008001;

-package DBIx::Custom;

-use Object::Simple;

 our $VERSION = '0.0901';

@@ -10,42 +14,33 @@ use DBI;

 use DBIx::Custom::Result;

 use DBIx::Custom::SQL::Template;

+my $p = __PACKAGE__;

-### Accessors

-sub dbh : Attr {}

+$p->attr('dbh');

-sub _query_caches     : ClassAttr { type => 'hash',  build => sub {{}} }

-sub _query_cache_keys : ClassAttr { type => 'array', build => sub {[]} }

-sub query_cache_max   : ClassAttr { build => 50 }

+$p->class_attr(_query_caches     => (type => 'hash',  default => sub { {} }))

+  ->class_attr(_query_cache_keys => (type => 'array', default => sub { [] }))

+  ->class_attr(query_cache_max   => 50);

-sub user         : HybridAttr { clone => 'scalar' }

-sub password     : HybridAttr { clone => 'scalar' }

-sub data_source  : HybridAttr { clone => 'scalar' }

-sub database     : HybridAttr { clone => 'scalar' }

-sub host         : HybridAttr { clone => 'scalar' }

-sub port         : HybridAttr { clone => 'scalar' }

-sub bind_filter  : HybridAttr { clone => 'scalar' }

-sub fetch_filter : HybridAttr { clone => 'scalar' }

+$p->hybrid_attr([qw/user password data_source

+                   database host port 

+                   bind_filter fetch_filter/] => (clone => 'scalar'));

-sub no_bind_filters  : HybridAttr { type  => 'array', build => sub {[]}, 

-                                    clone => 'array' }

+$p->hybrid_attr([qw/no_bind_filters no_fetch_filters/]

+            => (type => 'array', default => sub { [] }, clone => 'array'));

-sub no_fetch_filters : HybridAttr { type  => 'array', build => sub { [] },

-                                    clone => 'array' }

+$p->hybrid_attr(options => (type  => 'hash', default => sub { {} },

+                            clone => 'hash'));

-sub options : HybridAttr { type  => 'hash', build => sub {{}}, clone => 'hash' } 

+$p->hybrid_attr([qw/filters formats/]

+            => (type => 'hash', default => sub { {} },

+                deref => 1,     clone   => 'hash'));

-sub filters : HybridAttr { type  => 'hash', build => sub {{}},

-                           clone => 'hash', deref => 1 }

+$p->hybrid_attr(result_class => (default => 'DBIx::Custom::Result',

+                                 clone   => 'scalar'));

-sub formats : HybridAttr { type  => 'hash', build => sub { {} },

-                           clone => 'hash', deref => 1 }

-

-sub result_class : HybridAttr { build => 'DBIx::Custom::Result',

-                                clone => 'scalar' }

-

-sub sql_tmpl : HybridAttr { build => sub {DBIx::Custom::SQL::Template->new},

-                            clone => sub {$_[0] ? $_[0]->clone : undef} }

+$p->hybrid_attr(sql_tmpl => (default => sub {DBIx::Custom::SQL::Template->new},

+                             clone => sub {$_[0] ? $_[0]->clone : undef}));

 ### Methods

@@ -736,8 +731,6 @@ sub filter_off {

     return $self;

 }

-Object::Simple->build_class;

-

 =head1 NAME

 DBIx::Custom - Customizable DBI

@@ -5,12 +5,12 @@ use warnings;

 use strict;

 use Carp 'croak';

-my $class = __PACKAGE__;

+my $p = __PACKAGE__;

-$class->add_format(

-    datetime => $class->formats->{SQL99_datetime},

-    date     => $class->formats->{SQL99_date},

-    time     => $class->formats->{SQL99_time},

+$p->add_format(

+    datetime => $p->formats->{SQL99_datetime},

+    date     => $p->formats->{SQL99_date},

+    time     => $p->formats->{SQL99_time},

 );

@@ -1,26 +1,29 @@

 package DBIx::Custom::Query;

-use Object::Simple;

+use base 'Object::Simple::Base';

 use strict;

 use warnings;

-sub sql             : Attr {}

-sub key_infos       : Attr {}

-sub bind_filter     : Attr {}

-sub fetch_filter     : Attr {}

-sub sth             : Attr {}

+my $p = __PACKAGE__;

-sub no_bind_filters      : Attr { type => 'array', trigger => sub {

+$p->attr([qw/sql key_infos bind_filter fetch_filter sth/])

+  ->attr(_no_bind_filters_map => sub { {} })

+  ->attr(no_fetch_filters => (type => 'array', default => sub { [] }));

+

+$p->attr(no_bind_filters => (type => 'array', trigger => sub {

     my $self = shift;

     my $no_bind_filters = $self->no_bind_filters || [];

     my %no_bind_filters_map = map {$_ => 1} @{$no_bind_filters};

     $self->_no_bind_filters_map(\%no_bind_filters_map);

-}}

-sub _no_bind_filters_map : Attr {default => sub { {} }}

-

-sub no_fetch_filters     : Attr { type => 'array', default => sub { [] } }

+}));

-Object::Simple->build_class;

+sub new {

+    my $self = shift->SUPER::new(@_);

+    

+    Object::Simple::Util->init_attrs($self, 'no_bind_filters');

+    

+    return $self;

+}

 =head1 NAME

@@ -92,6 +95,12 @@ Set and get key informations

     $query     = $query->key_infos($key_infos);

     $key_infos = $query->key_infos;

+=head1 Methods

+

+=head2 new

+

+    my $query = DBIx::Custom::Query->new;

+    

 =head1 AUTHOR

 Yuki Kimoto, C<< <kimoto.yuki at gmail.com> >>

@@ -1,23 +1,31 @@

 package DBIx::Custom::Result;

-use Object::Simple;

+use base 'Object::Simple::Base';

 use strict;

 use warnings;

 use Carp 'croak';

-# Attributes

-sub _dbi             : Attr {}

-sub sth              : Attr {}

-sub fetch_filter     : Attr {}

+use Object::Simple::Util;

-sub no_fetch_filters : Attr { type => 'array', trigger => sub {

+my $p = __PACKAGE__;

+

+$p->attr([qw/_dbi sth fetch_filter/])

+  ->attr(_no_fetch_filters_map => sub { {} });

+

+$p->attr(no_fetch_filters => (type => 'array', trigger => sub {

     my $self = shift;

     my $no_fetch_filters = $self->no_fetch_filters || [];

     my %no_fetch_filters_map = map {$_ => 1} @{$no_fetch_filters};

     $self->_no_fetch_filters_map(\%no_fetch_filters_map);

-}}

+}));

-sub _no_fetch_filters_map : Attr {default => sub { {} }}

+sub new {

+    my $self = shift->SUPER::new(@_);

+    

+    Object::Simple::Util->init_attrs($self, 'no_fetch_filters');

+    

+    return $self;

+}

 # Fetch (array)

 sub fetch {

@@ -193,8 +201,6 @@ sub error {

     return wantarray ? ($sth->errstr, $sth->err, $sth->state) : $sth->errstr;

 }

-Object::Simple->build_class;

-

 =head1 NAME

 DBIx::Custom::Result - DBIx::Custom Resultset

@@ -238,6 +244,10 @@ Set and Get no filter keys when fetching

 =head1 Methods

+=head2 new

+

+    my $result = DBIx::Custom::Result->new;

+

 =head2 fetch

 Fetch a row

@@ -1,5 +1,5 @@

 package DBIx::Custom::SQL::Template;

-use Object::Simple; Object::Simple->build_class;

+use base 'Object::Simple::Base';

 use strict;

 use warnings;

@@ -7,7 +7,17 @@ use Carp 'croak';

 use DBIx::Custom::Query;

-__PACKAGE__->add_tag_processor(

+my $p = __PACKAGE__;

+

+$p->hybrid_attr(tag_processors => (type  => 'hash', default => sub { {} },

+                                   deref => 1,      clone   => 'hash'));

+

+$p->hybrid_attr(tag_start => (default => '{', clone => 'scalar'))

+  ->hybrid_attr(tag_end   => (default => '}', clone => 'scalar'));

+

+$p->hybrid_attr(tag_syntax => (clone => 'scalar'));

+

+$p->add_tag_processor(

     '?'      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

     '='      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

     '<>'     => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

@@ -21,7 +31,7 @@ __PACKAGE__->add_tag_processor(

     'update' => \&DBIx::Custom::SQL::Template::TagProcessors::expand_update_tag

 );

-__PACKAGE__->tag_syntax(<< 'EOS');

+$p->tag_syntax(<< 'EOS');

 [tag]                     [expand]

 {? name}                  ?

 {= name}                  name = ?

@@ -39,16 +49,6 @@ __PACKAGE__->tag_syntax(<< 'EOS');

 {update key1 key2}    set key1 = ?, key2 = ?

 EOS

-# Accessor is created by Object::Simple.

-

-### Class-Object accessors

-

-

-sub tag_start      : HybridAttr { build => '{', clone => 'scalar' }

-sub tag_end        : HybridAttr { build => '}', clone => 'scalar' }

-sub tag_syntax     : HybridAttr { clone => 'scalar' }

-sub tag_processors : HybridAttr { type  => 'hash', build => sub {{}},

-                                  clone => 'hash', deref => 1 }

 # Add Tag processor

 sub add_tag_processor {

@@ -5,12 +5,12 @@ use strict;

 use warnings;

 use Carp 'croak';

-my $class = __PACKAGE__;

+my $p = __PACKAGE__;

-$class->add_format(

-    datetime => $class->formats->{SQL99_datetime},

-    date     => $class->formats->{SQL99_date},

-    time     => $class->formats->{SQL99_time},

+$p->add_format(

+    datetime => $p->formats->{SQL99_datetime},

+    date     => $p->formats->{SQL99_date},

+    time     => $p->formats->{SQL99_time},

 );

 sub connect {

@@ -730,8 +730,8 @@ test 'Cache';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

 DBIx::Custom->query_cache_max(2);

 $dbi->do($CREATE_TABLE->{0});

-DBIx::Custom->delete_class_attr('_query_caches');

-DBIx::Custom->delete_class_attr('_query_cache_keys');

+delete $DBIx::Custom::CLASS_ATTRS->{_query_caches};

+delete $DBIx::Custom::CLASS_ATTRS->{_query_cache_keys};

 $tmpls[0] = "insert into table1 {insert key1 key2}";

 $queries[0] = $dbi->create_query($tmpls[0]);

 is(DBIx::Custom->_query_caches->{$tmpls[0]}{sql}, $queries[0]->sql, "$test : sql first");