inflate/deflateの処理をSchema側に追い出した

git-svn-id: http://svn.coderepos.org/share/lang/perl/DBIx-Skinny/trunk@27822 d0d07461-0603-4401-acd4-de1884942a52
yappo · Jan 3, 2009 · e0a421f · e0a421f
1 parent f4a4249
commit e0a421f
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 26 deletions.
diff --git a/lib/DBIx/Skinny.pm b/lib/DBIx/Skinny.pm
@@ -181,13 +181,8 @@ sub insert {
     $class->call_schema_trigger('pre_insert', $table, $args);
 
     # deflate
-    my $inflate_rules = $class->schema->inflate_rules;
-    for my $rule (keys %{$inflate_rules}) {
-        for my $col (keys %{$args}) {
-            if ($col =~ /$rule/ and my $code = $inflate_rules->{$rule}->{deflate}) {
-                $args->{$col} = $code->($args->{$col});
-            }
-        }
+    for my $col (keys %{$args}) {
+        $args->{$col} = $class->schema->call_deflate($col, $args->{$col});
     }
 
     my (@cols,@bind);
@@ -217,13 +212,8 @@ sub update {
     $class->call_schema_trigger('pre_update', $table, $args);
 
     # deflate
-    my $inflate_rules = $class->schema->inflate_rules;
-    for my $rule (keys %{$inflate_rules}) {
-        for my $col (keys %{$args}) {
-            if ($col =~ /$rule/ and my $code = $inflate_rules->{$rule}->{deflate}) {
-                $args->{$col} = $code->($args->{$col});
-            }
-        }
+    for my $col (keys %{$args}) {
+        $args->{$col} = $class->schema->call_deflate($col, $args->{$col});
     }
 
     my (@set,@bind);

diff --git a/lib/DBIx/Skinny/Row.pm b/lib/DBIx/Skinny/Row.pm
@@ -25,16 +25,9 @@ sub _razy_get_data {
 
     return sub {
         my $self = shift;
-        my $data = $self->get_column($col);
 
-        # inflate
-        my $inflate_rules = $self->skinny->schema->inflate_rules;
-        for my $rule (keys %{$inflate_rules}) {
-            if ($col =~ /$rule/ and my $code = $inflate_rules->{$rule}->{inflate}) {
-                $data = $code->($data);
-            }
-        }
-        return $data;
+        my $data = $self->get_column($col);
+        $self->skinny->schema->call_inflate($col, $data);
     };
 }
 

diff --git a/lib/DBIx/Skinny/Schema.pm b/lib/DBIx/Skinny/Schema.pm
@@ -17,8 +17,8 @@ sub import {
         install_table
           schema pk columns schema_info
         install_inflate_rule
-          inflate deflate
-          callback
+          inflate deflate call_inflate call_deflate
+          callback _do_inflate
         trigger call_trigger
         install_utf8_columns
           is_utf8_column utf8_on utf8_off
@@ -115,6 +115,30 @@ sub deflate (&) {
     }->{deflate} = $code;
 }
 
+sub call_inflate {
+    my $class = shift;
+
+    return $class->_do_inflate('inflate', @_);
+}
+
+sub call_deflate {
+    my $class = shift;
+
+    return $class->_do_inflate('deflate', @_);
+}
+
+sub _do_inflate {
+    my ($class, $key, $col, $data) = @_;
+
+    my $inflate_rules = $class->inflate_rules;
+    for my $rule (keys %{$inflate_rules}) {
+        if ($col =~ /$rule/ and my $code = $inflate_rules->{$rule}->{$key}) {
+            $data = $code->($data);
+        }
+    }
+    return $data;
+}
+
 sub callback (&) { shift }
 
 sub install_utf8_columns (@) {

diff --git a/tools/benchmark.pl b/tools/benchmark.pl
@@ -26,6 +26,8 @@
  2 wallclock secs ( 2.01 usr +  0.01 sys =  2.02 CPU) @ 29.21/s (n=59)
 2008-01-02 15:14
  2 wallclock secs ( 2.15 usr +  0.00 sys =  2.15 CPU) @ 28.84/s (n=62)
-2008-01-03 1435
+2008-01-03 14:35
  2 wallclock secs ( 2.00 usr +  0.01 sys =  2.01 CPU) @ 43.28/s (n=87)
+2008-01-03 14:50
+ 2 wallclock secs ( 2.00 usr +  0.00 sys =  2.00 CPU) @ 43.50/s (n=87)