@@ -1,3 +1,9 @@

+0.1646

+  add feture. all model class in namespace is included by include_model

+  rename experimental include_table to include_model

+  rename experimental table to model

+  rename experimental DBIx::Custom::Table to DBIx::Custom::Model

+  remame experimental DBIx::Custom::Table::name() to DBIx::Custom::Model::table();

 0.1645

   removed experimental base_table() for class expandability.

   experimental table() can't set table object any more.

@@ -1,6 +1,6 @@

 package DBIx::Custom;

-our $VERSION = '0.1645';

+our $VERSION = '0.1646';

 use 5.008001;

 use strict;

@@ -14,7 +14,7 @@ use DBIx::Custom::Result;

 use DBIx::Custom::Query;

 use DBIx::Custom::QueryBuilder;

 use DBIx::Custom::Where;

-use DBIx::Custom::Table;

+use DBIx::Custom::Model;

 use DBIx::Custom::Tag;

 use Encode qw/encode_utf8 decode_utf8/;

@@ -63,11 +63,15 @@ sub AUTOLOAD {

     # Method

     $self->{_methods} ||= {};

-    my $method = $self->{_methods}->{$mname};

-    return $self->$method(@_) if $method;

-    

-    # DBI method

-    return $self->dbh->$mname(@_);

+    if (my $method = $self->{_methods}->{$mname}) {

+        return $self->$method(@_)

+    }

+    elsif ($self->dbh->can($mname)) {

+        $self->dbh->$mname(@_);

+    }

+    else {

+        croak qq/Can't locate object method "$mname" via "$package"/

+    }

 }

 sub apply_filter {

@@ -586,52 +590,75 @@ sub select {

     return $result;

 }

-sub table {

-    my ($self, $name, $table) = @_;

+sub model {

+    my ($self, $name, $model) = @_;

     # Set

-    $self->{table} ||= {};

-    if ($table) {

-        $self->{table}{$name} = $table;

+    $self->{model} ||= {};

+    if ($model) {

+        $self->{model}{$name} = $model;

         return $self;

     }

-    # Check table existance

-    croak qq{Table "$name" is not included}

-      unless $self->{table}{$name};

+    # Check model existance

+    croak qq{Model "$name" is not included}

+      unless $self->{model}{$name};

     # Get

-    return $self->{table}{$name};

+    return $self->{model}{$name};

 }

-sub include_table {

-    my ($self, $name_space, $table_infos) = @_;

+sub include_model {

+    my ($self, $name_space, $model_infos) = @_;

+    

+    $name_space ||= '';

+    unless ($model_infos) {

+        # Load name space module

+        croak qq{"$name_space" is invalid class name}

+          if $name_space =~ /[^\w:]/;

+        eval "use $name_space";

+        croak qq{Name space module "$name_space.pm" is needed. $@} if $@;

+        

+        # Search model modules

+        my $path = $INC{"$name_space.pm"};

+        $path =~ s/\.pm$//;

+        opendir my $dh, $path

+          or croak qq{Can't open directory "$path": $!};

+        $model_infos = [];

+        while (my $module = readdir $dh) {

+            push @$model_infos, $module

+              if $module =~ s/\.pm$//;

+        }

+        

+        close $dh;

+    }

-    foreach my $table_info (@$table_infos) {

+    foreach my $model_info (@$model_infos) {

-        # Table name and class

-        my $table_name;

-        my $table_class;

-        if (ref $table_info eq 'HASH') {

-            $table_name = (keys %$table_info)[0];

-            $table_class = $table_info->{$table_name};

+        # Model name and class

+        my $model_name;

+        my $model_class;

+        if (ref $model_info eq 'HASH') {

+            $model_name = (keys %$model_info)[0];

+            $model_class = $model_info->{$model_name};

         }

-        else { $table_name = $table_class = $table_info }

-        my $tclass = "${name_space}::$table_class";

+        else { $model_name = $model_class = $model_info }

+        my $mclass = "${name_space}::$model_class";

         # Load

-        croak qq{"$tclass" is invalid class name}

-          if $tclass =~ /[^\w:]/;

-        unless ($tclass->can('isa')) {

-            eval "use $tclass";

+        croak qq{"$mclass" is invalid class name}

+          if $mclass =~ /[^\w:]/;

+        unless ($mclass->can('isa')) {

+            eval "use $mclass";

             croak $@ if $@;

         }

         # Instantiate

-        my $table = $tclass->new(dbi => $self, name => $table_name);

+        my $model = $mclass->new(dbi => $self);

+        $model->table($model_name) unless $model->table;

         # Set

-        $self->table($table_name, $table);

+        $self->model($model_name, $model);

     }

     return $self;

 }

@@ -1181,32 +1208,44 @@ You can do anything in callback.

 Callback receive four arguments, dbi object, table name,

 column name and columninformation.

-=head2 C<(experimental) include_table>

+=head2 C<(experimental) include_model>

-    $dbi->include_table(

-        'MyTable' => [

+    $dbi->include_model(

+        'MyModel' => [

             'book', 'person', 'company'

         ]

     );

-Include tables. First argument is name space.

+Include models. First argument is name space.

 Second argument is array reference of class base names.

-The following table is instantiated and included.

+If you don't specify second argument, All models under name space is

+included.

+

+    $dbi->include_model('MyModel');

+

+Note that in this case name spece module is needed.

-    MyTable::book

-    MyTable::person

-    MyTable::company

+    # MyModel.pm

+    package MyModel;

+    

+    use base 'DBIx::Custom::Model';

+

+The following model is instantiated and included.

-You can get these instance by C<table()>.

+    MyModel::book

+    MyModel::person

+    MyModel::company

-    my $book_table = $dbi->table('book');

+You can get these instance by C<model()>.

-If you want to other name as table class,

+    my $book_model = $dbi->model('book');

+

+If you want to other name as model class,

 you can do like this.

-    $dbi->include_table(

-        'MyTable' => [

+    $dbi->include_model(

+        'MyModel' => [

             {'book' => 'Book'},

             {'person' => 'Person'}

         ]

@@ -1341,17 +1380,16 @@ default to 0. This is experimental.

 This is overwrites C<default_bind_filter>.

 Return value of C<update()> is the count of affected rows.

-=head2 C<(experimental) table>

+=head2 C<(experimental) model>

-    $dbi->table('book')->method(

+    $dbi->model('book')->method(

         insert => sub { ... },

         update => sub { ... }

     );

-    my $table = $dbi->table('book');

+    my $model = $dbi->model('book');

-Create a L<DBIx::Custom::Table> object,

-or get a L<DBIx::Custom::Table> object.

+Set and get a L<DBIx::Custom::Model> object,

 =head2 C<update_all>

@@ -959,23 +959,23 @@ L<DBIx::Custom::Where> object is embedded into SQL.

     $dbi->execute($sql, param => $param);

-=head2 7. Table class

+=head2 7. Model

-=head3 Define table clas

+=head3 Model

-You can define table class extending L<DBIx::Custom::Table>

+you can define model extending L<DBIx::Custom::Model>

 to improve source code view.

-    package MyTable::book;

-    use base 'DBIx::Custom::Table';

+    package MyModel::book;

+    use base 'DBIx::Custom::Model';

     sub insert { ... }

     sub list { ... }

-You can include and instantiate this class.

+You can include and instantiate this class

-    $dbi->include_table(

-        MyTable => [

+    $dbi->include_model(

+        MyModel => [

             'book',

         ]

     );

@@ -983,38 +983,57 @@ You can include and instantiate this class.

 First argument is name space.

 Second argument is array reference of class base names.

-You can use this table like this.

+If you don't specify second argument, All models under name space is

+included.

-    my $result = $dbi->table('book')->list;

+    $dbi->include_model('MyModel');

-Table class is a little more useful than L<DBIx::Custom>,

-because you can use method C<insert()>, C<update()>, C<update_all()>,

-C<delete()>, C<delete_all()>, C<select()> without table name.

+Note that in this case name spece module is needed.

-    $dbi->table('book')->insert(param => $param);

+    # MyModel.pm

+    package MyModel;

+    

+    use base 'DBIx::Custom::Model';

+

+The follwoing modules location is needed.

+

+    MyModel.pm

+    MyModel / book.pm

+            / company.pm

+    

+You can use model like this.

+

+    my $result = $dbi->model('book')->list;

+

+In mode, You can use such as methods,

+C<insert()>, C<update()>, C<update_all()>,

+C<delete()>, C<delete_all()>, C<select()>

+without C<table> option.

+

+    $dbi->model('book')->insert(param => $param);

-This table is L<DBIx::Custom::Table> object.

+Model is L<DBIx::Custom::Model>.

-If you need table name, you can get C<name()>.

+If you need table name�Ayou can get it by C<table()>.

-    my $name = $table->name;

+    my $table = $model->table;

-You can get L<DBIx::Custom> object.

+You can get L<DBIx::Custom>.

-    my $dbi = $table->dbi;

+    my $dbi = $model->dbi;

-You can also call all methods of L<DBIx::Custom> and L<DBI>.

+You can also call all methods of L<DBIx::Custom> and L<DBI>. 

     # DBIx::Custom method

-    $table->execute($sql);

+    $model->execute($sql);

     # DBI method

-    $table->begin_work;

-    $table->commit;

+    $model->begin_work;

+    $model->commit;

-=head2 Table class example

+=head2 Model Examples

-Model example.

+Model examples

     package MyDBI;

@@ -1023,22 +1042,22 @@ Model example.

     sub connect {

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

-        $self->include_table(

-            MyTable => [

+        $self->include_model(

+            MyModel => [

                 'book',

                 'company'

             ]

         );

     }

-    package MyTable::book;

-    use base 'DBIx::Custom::Table';

+    package MyModel::book;

+    use base 'DBIx::Custom::Model';

     sub insert { ... }

     sub list { ... }

-    package MyTable::company;

-    use base 'DBIx::Custom::Table';

+    package MyModel::company;

+    use base 'DBIx::Custom::Model';

     sub insert { ... }

     sub list { ... }

@@ -986,23 +986,23 @@ C<execute()>との連携です。SQLを作成するときに埋め込むこと

     $dbi->execute($sql, param => $param);

-=head2 7. テーブルクラス

+=head2 7. モデル

-=head3 テーブルクラス

+=head3 モデル

 ソースコードの見通しをよくするために、

-L<DBIx::Custom::Table>を継承してテーブルクラスを作成することができます。

+L<DBIx::Custom::Model>を継承してモデルを作成することができます。

-    package MyTable::book;

-    use base 'DBIx::Custom::Table';

+    package MyModel::book;

+    use base 'DBIx::Custom::Model';

     sub insert { ... }

     sub list { ... }

 このクラスを取り込んで、インスタンス化することができます。

-    $dbi->include_table(

-        MyTable => [

+    $dbi->include_model(

+        MyModel => [

             'book',

         ]

     );

@@ -1010,40 +1010,58 @@ L<DBIx::Custom::Table>を継承してテーブルクラスを作成すること

 最初の引数は名前空間です。第二引数は、クラスの末尾の名前を含む

 配列のリファレンスです。

-このテーブルは次のように利用することができます。

+第二引数を指定しなかった場合は、名前空間以下にあるすべてのモデル

+が取り込まれます。

-    my $result = $dbi->table('book')->list;

+    $dbi->include_model('MyModel');

-テーブルクラスでは、テーブル名を指定することなしに

+ただし、名前空間名そのものを表すモジュールが

+存在していることが必要なことに注意してください。

+

+    # MyModel.pm

+    package MyModel;

+    

+    use base 'DBIx::Custom::Model';

+

+次のようなモジュールの配置が必要です。

+

+    MyModel.pm

+    MyModel / book.pm

+            / company.pm

+    

+モデルは次のように利用することができます。

+

+    my $result = $dbi->model('book')->list;

+

+モデルではテーブル名を指定することなしに

 C<insert()>, C<update()>, C<update_all()>,

 C<delete()>, C<delete_all()>, C<select()>などのメソッドを

-利用できるので

-L<DBIx::Custom>よりも少し便利です。

+利用できます。

-    $dbi->table('book')->insert(param => $param);

+    $dbi->model('book')->insert(param => $param);

-テーブルクラスはL<DBIx::Custom::Table>です。

+モデルはL<DBIx::Custom::Model>です。

-必要であれば、C<name()>でテーブル名を取得することができます。

+必要であれば、C<table()>でテーブル名を取得することができます。

-    my $name = $table->name;

+    my $table = $model->table;

 L<DBIx::Custom>オブジェクトを取得することもできます。

-    my $dbi = $table->dbi;

+    my $dbi = $model->dbi;

 L<DBIx::Custom>とL<DBI>のすべてのメソッドを呼び出すこともできます。

     # DBIx::Custom method

-    $table->execute($sql);

+    $model->execute($sql);

     # DBI method

-    $table->begin_work;

-    $table->commit;

+    $model->begin_work;

+    $model->commit;

-=head2 テーブルクラスのサンプル

+=head2 モデルのサンプル

-テーブルクラスのサンプルです。

+モデルのサンプルです。

     package MyDBI;

@@ -1052,22 +1070,22 @@ L<DBIx::Custom>とL<DBI>のすべてのメソッドを呼び出すこともで

     sub connect {

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

-        $self->include_table(

-            MyTable => [

+        $self->include_model(

+            MyModel => [

                 'book',

                 'company'

             ]

         );

     }

-    package MyTable::book;

-    use base 'DBIx::Custom::Table';

+    package MyModel::book;

+    use base 'DBIx::Custom::Model';

     sub insert { ... }

     sub list { ... }

-    package MyTable::company;

-    use base 'DBIx::Custom::Table';

+    package MyModel::company;

+    use base 'DBIx::Custom::Model';

     sub insert { ... }

     sub list { ... }

@@ -1,4 +1,4 @@

-package DBIx::Custom::Table;

+package DBIx::Custom::Model;

 use strict;

 use warnings;

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

 # Carp trust relationship

 push @DBIx::Custom::CARP_NOT, __PACKAGE__;

-__PACKAGE__->attr(['dbi', 'name']);

+__PACKAGE__->attr(['dbi', 'table']);

 our $AUTOLOAD;

@@ -22,14 +22,18 @@ sub AUTOLOAD {

     # Method

     $self->{_methods} ||= {};

-    

-    # Method

     if (my $method = $self->{_methods}->{$mname}) {

         return $self->$method(@_)

     }

-    

-    # DBI method

-    return $self->dbi->$mname(@_);

+    elsif ($self->dbi->can($mname)) {

+        $self->dbi->$mname(@_);

+    }

+    elsif ($self->dbi->dbh->can($mname)) {

+        $self->dbi->dbh->$mname(@_);

+    }

+    else {

+        croak qq/Can't locate object method "$mname" via "$package"/

+    }

 }

 sub method {

@@ -51,7 +55,7 @@ sub new {

         $self->method(

             $method => sub {

                 my $self = shift;

-                return $self->dbi->$method(table => $self->name, @_);

+                return $self->dbi->$method(table => $self->table, @_);

             }

         );

     }

@@ -71,7 +75,7 @@ DBIx::Custom::Table - Table base class(experimental)

 use DBIx::Custom::Table;

-my $table = DBIx::Custom::Table->new(name => 'books');

+my $table = DBIx::Custom::Model->new(table => 'books');

 =head1 METHODS

@@ -62,7 +62,7 @@ my $insert_query;

 my $update_query;

 my $ret_val;

 my $infos;

-my $table;

+my $model;

 my $where;

 # Prepare table

@@ -1265,20 +1265,20 @@ $dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2});

 $result = $dbi->select(selection => '* from table1', where => {key1 => 1});

 is_deeply($result->fetch_hash_all, [{key1 => 1, key2 => 2}]);

-test 'Table class';

+test 'Model class';

 use MyDBI1;

 $dbi = MyDBI1->connect($NEW_ARGS->{0});

 $dbi->execute("create table book (title, author)");

-$table = $dbi->table('book');

-$table->insert({title => 'a', author => 'b'});

-is_deeply($table->list->fetch_hash_all, [{title => 'a', author => 'b'}], 'basic');

+$model = $dbi->model('book');

+$model->insert({title => 'a', author => 'b'});

+is_deeply($model->list->fetch_hash_all, [{title => 'a', author => 'b'}], 'basic');

 $dbi->execute("create table company (name)");

-$table = $dbi->table('company');

-$table->insert({name => 'a'});

-is_deeply($table->list->fetch_hash_all, [{name => 'a'}], 'basic');

+$model = $dbi->model('company');

+$model->insert({name => 'a'});

+is_deeply($model->list->fetch_hash_all, [{name => 'a'}], 'basic');

-$dbi->table('book');

-eval{$dbi->table('book')->no_exists};

+$dbi->model('book');

+eval{$dbi->model('book')->no_exists};

 like($@, qr/locate/);

 {

@@ -1292,27 +1292,27 @@ like($@, qr/locate/);

     sub connect {

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

-        $self->include_table(

-            MyTable2 => [

+        $self->include_model(

+            MyModel2 => [

                 'book',

                 {company => 'Company'}

             ]

         );

     }

-    package MyTable2::Base1;

+    package MyModel2::Base1;

     use strict;

     use warnings;

-    use base 'DBIx::Custom::Table';

+    use base 'DBIx::Custom::Model';

-    package MyTable2::book;

+    package MyModel2::book;

     use strict;

     use warnings;

-    use base 'MyTable2::Base1';

+    use base 'MyModel2::Base1';

     sub insert {

         my ($self, $param) = @_;

@@ -1322,12 +1322,12 @@ like($@, qr/locate/);

     sub list { shift->select; }

-    package MyTable2::Company;

+    package MyModel2::Company;

     use strict;

     use warnings;

-    use base 'MyTable2::Base1';

+    use base 'MyModel2::Base1';

     sub insert {

         my ($self, $param) = @_;

@@ -1339,10 +1339,34 @@ like($@, qr/locate/);

 }

 $dbi = MyDBI4->connect($NEW_ARGS->{0});

 $dbi->execute("create table book (title, author)");

-$table = $dbi->table('book');

-$table->insert({title => 'a', author => 'b'});

-is_deeply($table->list->fetch_hash_all, [{title => 'a', author => 'b'}], 'basic');

+$model = $dbi->model('book');

+$model->insert({title => 'a', author => 'b'});

+is_deeply($model->list->fetch_hash_all, [{title => 'a', author => 'b'}], 'basic');

 $dbi->execute("create table company (name)");

-$table = $dbi->table('company');

-$table->insert({name => 'a'});

-is_deeply($table->list->fetch_hash_all, [{name => 'a'}], 'basic');

+$model = $dbi->model('company');

+$model->insert({name => 'a'});

+is_deeply($model->list->fetch_hash_all, [{name => 'a'}], 'basic');

+

+{

+     package MyDBI5;

+

+    use strict;

+    use warnings;

+

+    use base 'DBIx::Custom';

+

+    sub connect {

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

+        

+        $self->include_model('MyModel4');

+    }

+}

+$dbi = MyDBI5->connect($NEW_ARGS->{0});

+$dbi->execute("create table company (name)");

+$model = $dbi->model('company');

+$model->insert({name => 'a'});

+is_deeply($model->list->fetch_hash_all, [{name => 'a'}], 'include all model');

+$model = $dbi->model('book');

+is_deeply($model->list->fetch_hash_all, [{name => 'a'}], 'include all model');

+

+

@@ -8,8 +8,8 @@ use base 'DBIx::Custom';

 sub connect {

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

-    $self->include_table(

-        MyTable1 => [

+    $self->include_model(

+        MyModel1 => [

             'book',

             {company => 'Company'}

         ]

@@ -1,9 +1,9 @@

-package MyTable1::Company;

+package MyModel1::Company;

 use strict;

 use warnings;

-use base 'DBIx::Custom::Table';

+use base 'DBIx::Custom::Model';

 sub insert {

@@ -1,9 +1,9 @@

-package MyTable1::book;

+package MyModel1::book;

 use strict;

 use warnings;

-use base 'DBIx::Custom::Table';

+use base 'DBIx::Custom::Model';

 sub insert {

     my ($self, $param) = @_;

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

+package MyModel4;

+

+use base 'DBIx::Custom::Model';

+

+1;

@@ -0,0 +1,9 @@

+package MyModel4::book;

+

+use base 'MyModel4';

+

+sub table { 'company' }

+

+sub list { shift->select }

+

+1;

@@ -0,0 +1,8 @@

+package MyModel4::company;

+

+use base 'MyModel4';

+

+sub insert { shift->SUPER::insert(param => $_[0]) }

+sub list { shift->select }

+

+1;