@@ -11,7 +11,7 @@ my $builder = Module::Build->new(

         'Test::More' => 0,

     },

     requires => {

-        'Object::Simple' => 2.0702,

+        'Object::Simple' => 2.1301,

         'DBI'            => 1.605,

         'DBD::SQLite'    => 1.25,

         'Time::Piece'    => 1.15

@@ -1,3 +1,7 @@

+0.0903

+  catch up with Object::Simple update

+0.0902

+  cleanup

 0.0901

   DBIx::Basic filter 'encode_utf8' utf8::upgrade process is deleted

 0.0801

@@ -6,59 +6,48 @@ use warnings;

 use 5.008001;

-

-our $VERSION = '0.0901';

-

 use Carp 'croak';

 use DBI;

 use DBIx::Custom::Result;

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

-my $p = __PACKAGE__;

-

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

-

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

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

-  ->class_attr(query_cache_max   => 50);

-

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

-                   database host port 

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

+__PACKAGE__->attr('dbh');

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

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

+__PACKAGE__->class_attr(_query_caches     => sub { {} });

+__PACKAGE__->class_attr(_query_cache_keys => sub { [] });

+__PACKAGE__->class_attr('query_cache_max', default => 50, clone => 'scalar');

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

-                            clone => 'hash'));

+__PACKAGE__->dual_attr([qw/user password data_source/], clone => 'scalar');

+__PACKAGE__->dual_attr([qw/database host port/],        clone => 'scalar');

+__PACKAGE__->dual_attr([qw/bind_filter fetch_filter/],  clone => 'scalar');

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

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

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

+__PACKAGE__->dual_attr([qw/no_bind_filters no_fetch_filters/],

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

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

-                                 clone   => 'scalar'));

+__PACKAGE__->dual_attr([qw/options filters formats/],

+                       default => sub { {} }, clone => 'hash');

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

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

+__PACKAGE__->dual_attr('result_class', default => 'DBIx::Custom::Result',

+                                       clone   => 'scalar');

-### Methods

+__PACKAGE__->dual_attr('sql_tmpl', default => sub {DBIx::Custom::SQL::Template->new},

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

 sub add_filter {

     my $invocant = shift;

-    my %old_filters = $invocant->filters;

-    my %new_filters = ref $_[0] eq 'HASH' ? %{$_[0]} : @_;

-    $invocant->filters(%old_filters, %new_filters);

+    my $filters = ref $_[0] eq 'HASH' ? $_[0] : {@_};

+    $invocant->filters({%{$invocant->filters}, %$filters});

+    

     return $invocant;

 }

 sub add_format{

     my $invocant = shift;

-    my %old_formats = $invocant->formats;

-    my %new_formats = ref $_[0] eq 'HASH' ? %{$_[0]} : @_;

-    $invocant->formats(%old_formats, %new_formats);

+    my $formats = ref $_[0] eq 'HASH' ? $_[0] : {@_};

+    $invocant->formats({%{$invocant->formats}, %$formats});

+

     return $invocant;

 }

@@ -737,7 +726,11 @@ DBIx::Custom - Customizable DBI

 =head1 VERSION

-Version 0.0801

+Version 0.0903

+

+=cut

+

+our $VERSION = '0.0903';

 =head1 SYNOPSYS

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

 use strict;

 use Encode qw/decode encode/;

-my $class = __PACKAGE__;

-

-$class->add_filter(

+__PACKAGE__->add_filter(

     encode_utf8 => sub { encode('UTF-8', shift) },

     decode_utf8 => sub { decode('UTF-8', shift) }

 );

-$class->add_format(

+__PACKAGE__->add_format(

     'SQL99_date'        => '%Y-%m-%d',

     'SQL99_datetime'    => '%Y-%m-%d %H:%M:%S',

     'SQL99_time'        => '%H:%M:%S',

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

 use strict;

 use Carp 'croak';

-my $p = __PACKAGE__;

-

-$p->add_format(

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

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

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

+__PACKAGE__->add_format(

+    datetime => __PACKAGE__->formats->{SQL99_datetime},

+    date     => __PACKAGE__->formats->{SQL99_date},

+    time     => __PACKAGE__->formats->{SQL99_time},

 );

@@ -4,18 +4,16 @@ use base 'Object::Simple::Base';

 use strict;

 use warnings;

-my $p = __PACKAGE__;

+__PACKAGE__->attr([qw/sql key_infos bind_filter fetch_filter sth/]);

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

+__PACKAGE__->attr(no_fetch_filters => 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 {

+__PACKAGE__->attr('no_bind_filters', 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 new {

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

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

 use Object::Simple::Util;

-my $p = __PACKAGE__;

+__PACKAGE__->attr([qw/_dbi sth fetch_filter/]);

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

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

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

-

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

+__PACKAGE__->attr('no_fetch_filters', 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 new {

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

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

 use DBIx::Custom::Query;

-my $p = __PACKAGE__;

+__PACKAGE__->dual_attr('tag_processors', default => sub { {} },

+                                         clone   => 'hash');

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

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

+__PACKAGE__->dual_attr('tag_start', default => '{', clone => 'scalar');

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

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

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

+__PACKAGE__->dual_attr('tag_syntax', clone => 'scalar');

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

-

-$p->add_tag_processor(

+__PACKAGE__->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,

@@ -31,7 +29,7 @@ $p->add_tag_processor(

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

 );

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

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

 [tag]                     [expand]

 {? name}                  ?

 {= name}                  name = ?

@@ -54,7 +52,7 @@ EOS

 sub add_tag_processor {

     my $invocant = shift;

     my $tag_processors = ref $_[0] eq 'HASH' ? $_[0] : {@_};

-    $invocant->tag_processors(%{$invocant->tag_processors}, %{$tag_processors});

+    $invocant->tag_processors({%{$invocant->tag_processors}, %{$tag_processors}});

     return $invocant;

 }

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

 use warnings;

 use Carp 'croak';

-my $p = __PACKAGE__;

-

-$p->add_format(

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

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

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

+__PACKAGE__->add_format(

+    datetime => __PACKAGE__->formats->{SQL99_datetime},

+    date     => __PACKAGE__->formats->{SQL99_date},

+    time     => __PACKAGE__->formats->{SQL99_time},

 );

 sub connect {

@@ -227,8 +227,8 @@ $rows = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 2, key2 => 6}], "$test : bind_filter fetch_filter");

 $dbi->do("delete from table1;");

-$insert_query->no_bind_filters('key1');

-$select_query->no_fetch_filters('key2');

+$insert_query->no_bind_filters(['key1']);

+$select_query->no_fetch_filters(['key2']);

 $dbi->query($insert_query, {key1 => 1, key2 => 2});

 $result = $dbi->query($select_query);

 $rows = $result->fetch_hash_all;

@@ -53,12 +53,8 @@ test 'Sub class constructor';

       ->password('b')

       ->data_source('c')

       ->options({d => 1, e => 2})

-      ->filters(

-          f => 3

-      )

-      ->formats(

-          f => 3

-      )

+      ->filters({f => 3})

+      ->formats({f => 3})

       ->bind_filter('f')

       ->fetch_filter('g')

       ->result_class('DBIx::Custom::Result')

@@ -102,8 +98,8 @@ is($dbi->database, 'a', "$test : database");

 is($dbi->password, 'b', "$test : password");

 is($dbi->data_source, 'c', "$test : data_source");

 is_deeply($dbi->options, {d => 1, e => 2}, "$test : options");

-is_deeply({$dbi->filters}, {f => 3}, "$test : filters");

-is_deeply({$dbi->formats}, {f => 3}, "$test : formats");

+is_deeply($dbi->filters, {f => 3}, "$test : filters");

+is_deeply($dbi->formats, {f => 3}, "$test : formats");

 is($dbi->bind_filter, 'f', "$test : bind_filter");

 is($dbi->fetch_filter, 'g', "$test : fetch_filter");

 is($dbi->result_class, 'DBIx::Custom::Result', "$test : result_class");

@@ -142,12 +138,8 @@ test 'Customized sub class constructor default';

       ->password('bo')

       ->data_source('co')

       ->options({do => 10, eo => 20})

-      ->filters(

-        fo => 30

-      )

-      ->formats(

-        fo => 30

-      )

+      ->filters({fo => 30})

+      ->formats({fo => 30})

       ->bind_filter('fo')

       ->fetch_filter('go')

       ->result_class('ho')

@@ -192,8 +184,8 @@ is($dbi->database, 'a', "$test : database");

 is($dbi->password, 'b', "$test : password");

 is($dbi->data_source, 'c', "$test : data_source");

 is_deeply($dbi->options, {d => 1, e => 2}, "$test : options");

-is_deeply({$dbi->filters}, {f => 3}, "$test : filters");

-is_deeply({$dbi->formats}, {f => 3}, "$test : formats");

+is_deeply($dbi->filters, {f => 3}, "$test : filters");

+is_deeply($dbi->formats, {f => 3}, "$test : formats");

 is($dbi->bind_filter, 'f', "$test : bind_filter");

 is($dbi->fetch_filter, 'g', "$test : fetch_filter");

 is($dbi->result_class, 'h', "$test : result_class");

@@ -219,14 +211,13 @@ $dbi->filter_off;

 ok(!$dbi->bind_filter,  "$test : bind_filter  off");

 ok(!$dbi->fetch_filter, "$test : fetch_filter off");

-__END__

 test 'Accessor';

 $dbi = DBIx::Custom->new;

-$dbi->options(opt1 => 1, opt2 => 2);

+$dbi->options({opt1 => 1, opt2 => 2});

 is_deeply(scalar $dbi->options, {opt1 => 1, opt2 => 2}, "$test : options");

-$dbi->no_bind_filters('a', 'b');

+$dbi->no_bind_filters(['a', 'b']);

 is_deeply(scalar $dbi->no_bind_filters, ['a', 'b'], "$test: no_bind_filters");

-$dbi->no_fetch_filters('a', 'b');

+$dbi->no_fetch_filters(['a', 'b']);

 is_deeply(scalar $dbi->no_fetch_filters, ['a', 'b'], "$test: no_fetch_filters");