Changeset 1927

Timestamp:

04/16/08 15:36:30 (22 months ago)

Author:

mpaschal

Message:

Land the new implementation of metadata based on narrow tables
BugzID: 68749

Location:

branches/release-35

Files:

• build/mt-dists/default.mk (modified) (1 diff)
• lib/MT.pm.pre (modified) (9 diffs)
• lib/MT/Asset/Image.pm (modified) (1 diff)
• lib/MT/Author.pm (modified) (3 diffs)
• lib/MT/Blog.pm (modified) (2 diffs)
• lib/MT/Component.pm (modified) (1 diff)
• lib/MT/Meta (copied) (copied from branches/feature-narrow-tables/lib/MT/Meta)
• lib/MT/Meta.pm (copied) (copied from branches/feature-narrow-tables/lib/MT/Meta.pm)
• lib/MT/Meta/Proxy.pm (copied) (copied from branches/feature-narrow-tables/lib/MT/Meta/Proxy.pm)
• lib/MT/Object.pm (modified) (14 diffs)
• lib/MT/ObjectDriver/DDL/mysql.pm (modified) (1 diff)
• lib/MT/Template.pm (modified) (2 diffs)
• lib/MT/Upgrade.pm (modified) (1 diff)
• t/09-image.t (modified) (4 diffs)
• t/20-setup.t (modified) (1 diff)
• t/22-author.t (modified) (4 diffs)
• t/64-objectmeta.t (modified) (2 diffs)
• t/lib/MT/Test.pm (modified) (31 diffs)
• t/plugins/Awesome (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome)
• t/plugins/Awesome/config.yaml (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/config.yaml)
• t/plugins/Awesome/lib (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/lib)
• t/plugins/Awesome/lib/MT (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/lib/MT)
• t/plugins/Awesome/lib/MT/Awesome (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/lib/MT/Awesome)
• t/plugins/Awesome/lib/MT/Awesome.pm (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/lib/MT/Awesome.pm)
• t/plugins/Awesome/lib/MT/Awesome/Image.pm (copied) (copied from branches/feature-narrow-tables/t/plugins/Awesome/lib/MT/Awesome/Image.pm)

branches/release-35/build/mt-dists/default.mk

@@ -2 +2 @@
 
 PRODUCT_VERSION = 4.15
-SCHEMA_VERSION = 4.0054
+SCHEMA_VERSION = 4.0055
 API_VERSION = 4.15
 

branches/release-35/lib/MT.pm.pre

@@ -58 +58 @@
             no strict 'refs';
             unless ( defined *{ $compat . '::' } ) {
-                eval "require $compat;";
+                eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $compat;";
             }
         }
@@ -267 +267 @@
         return $object_types{$k} if exists $object_types{$k};
 
+        if ($k =~ m/^(.+):meta$/) {
+            my $ppkg = $pkg->model($1);
+            my $mpkg = $ppkg->meta_pkg;
+            return $mpkg ? $object_types{$k} = $mpkg : undef;
+        }
+
         my $model = $pkg->registry( 'object_types', $k );
         if ( ref($model) eq 'ARRAY' ) {
@@ -287 +293 @@
         unless ( defined *{ $model . '::__properties' } ) {
             use strict 'refs';
-            eval "require $model;";
+            eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $model;";
             if ( $@ && ( $k =~ m/^(.+)\./ ) ) {
 
@@ -612 +618 @@
 
     $cb->error();    # reset the error string
-    my $result = eval { $cb->invoke(@args) };
+    my $result = eval {
+        # line __LINE__ __FILE__
+        $cb->invoke(@args);
+    };
     if ( my $err = $@ ) {
         $cb->error($err);
@@ -1262 +1271 @@
                     $Plugins{$plugin_sig}{full_path} = $plugin_full_path;
                     $timer->pause_partial if $timer;
-                    eval { require $plugin };
+                    eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire '$plugin';";
                     $timer->mark("Loaded plugin " . $sig) if $timer;
                     if ($@) {
@@ -1270 +1279 @@
                         # the database has been initialized...
                         eval {
+                            # line __LINE__ __FILE__
                             require MT::Log;
                             $mt->log(
@@ -2588 +2598 @@
             if ($method) {
                 return sub {
-                    eval "require $hdlr_pkg;"
+                    eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $hdlr_pkg;"
                       or Carp::confess(
                         "failed loading package $hdlr_pkg for routine $name: $@");
@@ -2599 +2609 @@
             else {
                 return sub {
-                    eval "require $hdlr_pkg;"
+                    eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $hdlr_pkg;"
                       or Carp::confess(
                         "failed loading package $hdlr_pkg for routine $name: $@");
@@ -2613 +2623 @@
         }
         else {
-            eval "require $hdlr_pkg;"
+            eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $hdlr_pkg;"
               or Carp::confess(
                 "failed loading package $hdlr_pkg for routine $name: $@");

branches/release-35/lib/MT/Asset/Image.pm

@@ -10 +10 @@
 use base qw( MT::Asset );
 
-__PACKAGE__->install_properties( { class_type => 'image', } );
-__PACKAGE__->install_meta( { columns => [ 'image_width', 'image_height', ], } );
+__PACKAGE__->install_properties( {
+    class_type => 'image',
+    column_defs => {
+        'image_width' => 'integer meta',
+        'image_height' => 'integer meta',
+    },
+} );
 
 # List of supported file extensions (to aid the stock 'can_handle' method.)

branches/release-35/lib/MT/Author.pm

@@ -37 +37 @@
         'userpic_asset_id' => 'integer',
         'basename' => 'string(255)',
+
+        # meta properties
+        'widgets' => 'hash meta',
+        'favorite_blogs' => 'array meta',
     },
     defaults => {
@@ -59 +63 @@
     audit => 1,
 });
-__PACKAGE__->install_meta({
-    columns => [
-        'favorite_blogs',
-        'widgets',
-    ],
-});
 
 sub class_label {
@@ -263 +261 @@
     die unless $perms->isa('MT::Permission');
     $perms->can_edit_all_posts ||
-    ($perms->can_create_post && $entry->author_id == $author->id);
+        ($perms->can_create_post && $entry->author_id == $author->id);
 }
 

branches/release-35/lib/MT/Blog.pm

@@ -77 +77 @@
         'archive_tmpl_category' => 'string(255)',
         'archive_tmpl_individual' => 'string(255)',
+
+        # meta properties
+        'image_default_wrap_text' => 'integer meta',
+        'image_default_align' => 'string meta',
+        'image_default_thumb' => 'integer meta',
+        'image_default_width' => 'integer meta',
+        'image_default_wunits' => 'integer meta',
+        'image_default_constrain' => 'integer meta',
+        'image_default_popup' => 'integer meta',
+        'commenter_authenticators' => 'string meta',
+        'require_typekey_emails' => 'integer meta',
+        'nofollow_urls' => 'integer meta',
+        'follow_auth_links' => 'integer meta',
+        'update_pings' => 'integer meta',
+        'captcha_provider' => 'string meta',
+        'publish_queue' => 'integer meta',
+        'nwc_smart_replace' => 'integer meta',
+        'nwc_replace_field' => 'string meta',
+        'template_set' => 'string meta',
+        'page_layout' => 'string meta',
+        'include_system' => 'integer meta',
+        'include_cache' => 'integer meta',
     },
     meta => 1,
@@ -93 +115 @@
     datasource => 'blog',
     primary_key => 'id',
-});
-__PACKAGE__->install_meta({
-    columns => [
-        'image_default_wrap_text',
-        'image_default_align',
-        'image_default_thumb',
-        'image_default_width',
-        'image_default_wunits',
-        'image_default_constrain',
-        'image_default_popup',
-        'commenter_authenticators',
-        'require_typekey_emails',
-        'nofollow_urls',
-        'follow_auth_links',
-        'update_pings',
-        'captcha_provider',
-        'publish_queue',
-        'nwc_smart_replace',
-        'nwc_replace_field',
-        'template_set',
-        'page_layout',
-        'include_system',
-        'include_cache',
-    ],
 });
 

branches/release-35/lib/MT/Component.pm

@@ -508 +508 @@
 
                 # check for a yaml file reference...
-                if ( !ref($v) && ( $v =~ m/^[-\w]+\.yaml$/ ) ) {
-                    my $f = File::Spec->catfile( $c->path, $v );
-                    if ( -f $f ) {
-                        require YAML::Tiny;
-                        my $y = eval { YAML::Tiny->read($f) }
-                            or die "Error reading $f: " . $YAML::Tiny::errstr;
-
-                        # skip over non-hash elements
-                        shift @$y while @$y && ( ref( $y->[0] ) ne 'HASH' );
-                        if (@$y) {
-                            $r->{$p} = $y->[0];
+                if ( !ref($v) ) {
+                    if ( $v =~ m/^[-\w]+\.yaml$/ ) {
+                        my $f = File::Spec->catfile( $c->path, $v );
+                        if ( -f $f ) {
+                            require YAML::Tiny;
+                            my $y = eval { YAML::Tiny->read($f) }
+                                or die "Error reading $f: "
+                                    . $YAML::Tiny::errstr;
+                            # skip over non-hash elements
+                            shift @$y
+                                while @$y && ( ref( $y->[0] ) ne 'HASH' );
+                            $r->{$p} = $y->[0] if @$y;
+                        }
+                    } elsif ($v =~ m/^\$\w+::/) {
+                        my $code = MT->handler_to_coderef($v);
+                        if (ref $code eq 'CODE') {
+                            $r->{$p} = $code->($c);
                         }
                     }

branches/release-35/lib/MT/Object.pm

@@ -53 +53 @@
     }
 
+    my %meta;
+
     my $super_props = $class->SUPER::properties();
+    $props->{meta} = 1 if $super_props && $super_props->{meta};
+
+    if ($props->{meta}) {
+        # yank out any meta columns before we start working on column_defs
+        $meta{$_} = delete $props->{column_defs}{$_}
+            for grep { $props->{column_defs}{$_} =~ m/\bmeta\b/ }
+            keys %{ $props->{column_defs} };
+    }
+
     if ($super_props) {
         # subclass; merge hash
-        for (qw(primary_key meta_column class_column datasource driver audit meta)) {
+        for (qw(primary_key class_column datasource driver audit)) {
             $props->{$_} = $super_props->{$_}
                 if exists $super_props->{$_} && !(exists $props->{$_});
         }
-        for my $p (qw(column_defs defaults indexes meta_columns)) {
+        for my $p (qw(column_defs defaults indexes)) {
             if (exists $super_props->{$p}) {
                 foreach my $k (keys %{ $super_props->{$p} }) {
@@ -81 +92 @@
     # Legacy MT::Object types only define 'columns'; we still support that
     # but they aren't handled properly with the upgrade system as a result.
-    if (exists $props->{column_defs}) {
-        $props->{columns} = [ keys %{ $props->{column_defs} } ];
-    } else {
+    if (! exists $props->{column_defs}) {
         map { $props->{column_defs}{$_} = () } @{ $props->{columns} };
     }
+    $props->{columns} = [ keys %{ $props->{column_defs} } ];
 
     # Support audit flags
@@ -98 +108 @@
     }
 
-    # Metadata column
-    $props->{meta_column} ||= 'meta' if exists $props->{meta};
-    if (my $col = $props->{meta_column}) {
-        if (!$props->{column_defs}{$col}) {
-            $props->{column_defs}{$col} = 'blob';
-            push @{ $props->{columns} }, $col;
-        }
-        no strict 'refs'; ## no critic
-        *{$class . '::' . $col} = \&__meta_column;
-        $class->add_trigger( pre_save => \&pre_save_serialize_metadata );
-    }
-
     # Classed object types
     $props->{class_column} ||= 'class' if exists $props->{class_type};
@@ -151 +149 @@
         foreach my $isa_class (@classes) {
             next if UNIVERSAL::isa($class, $isa_class);
-            eval "require $isa_class;" or die;
+            eval "# line " . __LINE__ . " " . __FILE__ . "\nrequire $isa_class;" or die;
             no strict 'refs'; ## no critic
             push @{$class . '::ISA'}, $isa_class;
@@ -160 +158 @@
             for my $name (keys %$cols) {
                 next if exists $props->{column_defs}{$name};
+                if ($cols->{$name} =~ m/\bmeta\b/) {
+                    $meta{$name} = $cols->{$name};
+                    next;
+                }
+
                 $class->install_column($name, $cols->{$name});
                 $props->{indexes}{$name} = 1
@@ -226 +229 @@
         no strict 'refs'; ## no critic
         *{$class . '::driver'} = sub { $_[0]->dbi_driver(@_) };
+    }
+
+    # inherit parent's metadata setup
+    if ($props->{meta}) { # if ($super_props && $super_props->{meta_installed}) {
+        $class->install_meta({ ( %meta ? ( column_defs => \%meta ) : ( columns => [] ) ) });
+        $class->add_trigger( post_remove => \&remove_meta );
     }
 
@@ -347 +356 @@
             return $package;
         } else {
-            eval "use $package;";
+            eval "# line " . __LINE__ . " " . __FILE__ . "\nuse $package;";
             return $package unless $@;
-            eval "use $pkg; $package->new;";
+            eval "# line " . __LINE__ . " " . __FILE__ . "\nuse $pkg; $package->new;";
             return $package unless $@;
         }
@@ -373 +382 @@
 # 'meta' metadata column support
 
+sub new {
+    my $class = shift;
+    my $obj = $class->SUPER::new(@_);
+    if ($obj->properties->{meta_installed}) {
+        $obj->init_meta();
+    }
+    return $obj;
+}
+
+sub init_meta {
+    my $obj = shift;
+    require MT::Meta::Proxy;
+    $obj->{__meta} = MT::Meta::Proxy->new($obj);
+}
+
 sub install_meta {
     my $class = shift;
-    my ($props) = @_;
+    my ($params) = @_;
     if ( ( $class ne 'MT::Config' ) && (!$MT::plugins_installed) ) {
-        push @PRE_INIT_META, [$class, $props];
+        push @PRE_INIT_META, [$class, $params];
         return;
     }
-    my $cprops = $class->properties;
-    my $fields = $cprops->{meta_columns} ||= {};
-    my $meta_col = $cprops->{meta_column};
-    foreach my $name (@{ $props->{columns} }) {
-        $fields->{$name} = ();
-        # Skip adding this method if the class overloads it.
-        # this lets the SUPER::columnname magic do it's thing
-        unless ($class->can($name)) {
-            no strict 'refs'; ## no critic
-            *{"${class}::$name"} = sub { shift->$meta_col($name, @_) };
-        }
-    }
+
+    require MT::Meta;
+    my $pkg = ref $class || $class;
+    if (!$pkg->SUPER::properties->{meta_installed}) {
+        $pkg->add_trigger( post_save => \&post_save_save_metadata );
+        $pkg->add_trigger( post_load => \&post_load_initialize_metadata );
+    }
+
+    my $props = $class->properties;
+
+    if (!$params->{columns} && !$params->{fields} && !$params->{column_defs}) {
+        return $class->error('No meta fields specified to install_meta');
+    }
+
+    $params->{fields} ||= [];
+    if (my $cols = delete $params->{columns}) {
+        foreach my $col (@$cols) {
+            push @{ $params->{fields} }, {
+                name => $col,
+                type => 'vblob',
+            };
+            # $props->{fields}{$col} = 'vblob';
+        }
+    }
+    if (my $cols = delete $params->{column_defs}) {
+        foreach my $col ( keys %$cols ) {
+            my $type = $cols->{$col};
+            $type =~ s/\s.*//; # take first keyword, ignoring anything after
+            $type .= '_indexed'
+                if $cols->{$col} =~ m/\bindexed\b/;
+            $type = MT::Meta->normalize_type($type);
+
+            push @{ $params->{fields} }, {
+                name => $col,
+                type => $type,
+            };
+            # $props->{fields}{$col} = $type;
+        }
+    }
+
+    $params->{datasource} ||= $class->datasource . '_meta';
+
+    if ($props->{meta_installed} && !@{ $params->{fields} }) {
+        return 1;
+    }
+
+    if (my $fields = MT::Meta->install($pkg, $params)) {
+        # we may have inherited meta fields so lets update with
+        # the fields returned by MT::Meta
+        $props->{fields} = $fields;
+    }
+
+    return $props->{meta_installed} = 1;
+}
+
+sub meta_args {
+    my $class = shift;
+    my $id_field = $class->datasource . '_id';
+    return {
+        key         => $class->datasource,
+        column_defs => {
+            $id_field         => 'integer not null',
+            type              => 'string(255) not null',
+            vchar             => 'string(255)',
+            vchar_indexed     => 'string(255)',
+            vdatetime         => 'datetime',
+            vdatetime_indexed => 'datetime',
+            vinteger          => 'integer',
+            vinteger_indexed  => 'integer',
+            vfloat            => 'float',
+            vfloat_indexed    => 'float',
+            vblob             => 'blob',
+            vclob             => 'text',
+        },
+        columns => [ $id_field, qw(
+            type
+            vchar
+            vchar_indexed
+            vdatetime
+            vdatetime_indexed
+            vinteger
+            vinteger_indexed
+            vfloat
+            vfloat_indexed
+            vblob
+            vclob
+        ) ],
+        indexes => {
+            $id_field => 1,
+            id_type   => { columns => [ $id_field, 'type' ] },
+            id_type_vchar => { columns => [ $id_field, 'type', 'vchar_indexed' ] },
+            id_type_vdatetime => { columns => [ $id_field, 'type',
+                'vdatetime_indexed' ] },
+            id_type_vinteger => { columns => [ $id_field, 'type',
+                'vinteger_indexed' ] },
+            id_type_vfloat => { columns => [ $id_field, 'type',
+                'vfloat_indexed' ] },
+        },
+        primary_key => [ $class->datasource . '_id', 'type' ],
+    };
 }
 
 sub has_meta {
-    my $props = $_[0]->properties;
-    return $props->{meta} && (@_ > 1 ? exists $props->{meta_columns}{$_[1]} : 1);
-}
-
-sub pre_save_serialize_metadata {
-    my ($obj) = shift;
-    my $meta_col = $obj->properties->{meta_column};
-    if ($obj->{changed_cols}{$meta_col}) {
-        require MT::Serialize;
-        my $meta = $obj->$meta_col;
-        $obj->$meta_col(MT::Serialize->serialize(\$meta));
-    }
-}
-
-sub __thaw_meta {
-    my ($meta) = @_;
-    $$meta = '' unless defined $$meta;
-    require MT::Serialize;
-    my $out = MT::Serialize->unserialize($$meta);
-    if (ref $out eq 'REF') {
-        return $$out;
-    } else {
-        return {};
-    }
-}
-
-# $obj->meta returns a hashref of metadata information
-# $obj->meta($scalar) allows assignment of a serialized value
-# $obj->meta('name', 'value') assigns an individual metadata element
-# $obj->meta('name') returns an individual metadata value
-# $obj->save will automatically serialize the metadata back to the database
-sub __meta_column {
-    my $obj = shift;
-    my $meta_col = $obj->properties->{meta_column} or return;
-
-    if (@_) {
-        my $var = shift;
-        if ((defined $var) && ($var =~ m/^SERG\0\0\0\0/)) {
-            return $obj->column($meta_col, $var);
-        }
-        my $meta = $obj->column($meta_col);
-        if (!defined($meta)) {
-            $obj->{column_values}{$meta_col} = $meta = {};
-        } elsif (!ref $meta) {
-            $obj->{column_values}{$meta_col} = $meta = __thaw_meta(\$meta);
-        }
+    my $obj = shift;
+    return $obj->is_meta_column(@_) if @_;
+    return $obj->properties->{meta_installed} ? 1 : 0;
+}
+
+sub post_load_initialize_metadata {
+    my $obj = shift;
+    if (defined $obj && $obj->properties->{meta_installed}) {
+        $obj->init_meta();
+        $obj->{__meta}->set_primary_keys($obj);
+    }
+}
+
+sub is_meta_column {
+    my $obj = shift;
+    my ($field) = @_;
+
+    my $props = $obj->properties;
+    return unless $props->{meta_installed};
+
+    my $meta = $obj->meta_pkg;
+    return 1 if $props->{fields}{$field};
+
+    return;
+}
+
+sub meta_pkg {
+    my $class = shift;
+    my $props = $class->properties;
+    return unless $props->{meta}; # this only works for meta-enabled classes
+
+    return $props->{meta_pkg} if $props->{meta_pkg};
+
+    my $meta = ref $class || $class;
+    $meta .= '::Meta';
+    return $props->{meta_pkg} = $meta;
+}
+
+sub has_column {
+    my $obj = shift;
+    return 1 if $obj->SUPER::has_column(@_);
+    return 1 if $obj->is_meta_column(@_);
+    return;
+}
+
+sub post_save_save_metadata {
+    my $obj = shift;
+    if (defined $obj && exists $obj->{__meta}) {
+        $obj->{__meta}->set_primary_keys($obj);
+        $obj->{__meta}->save;
+    }
+}
+
+sub meta {
+    my $obj = shift;
+    my ($name, $value) = @_;
+
+    return !$obj->{__meta} ? undef
+         : 2 == scalar @_  ? $obj->{__meta}->set($name, $value)
+         : 1 == scalar @_  ? $obj->{__meta}->get($name)
+         :                   $obj->{__meta}->get_hash
+         ;
+}
+
+sub meta_obj {
+    my $obj = shift;
+    return $obj->{__meta};
+}
+
+sub column_func {
+    my $obj = shift;
+    my ($col) = @_;
+    return if !$col;
+
+    return $obj->SUPER::column_func(@_)
+        if !$obj->is_meta_column($col);
+
+    return sub {
+        my $obj = shift;
         if (@_) {
-            $meta->{$var} = shift if @_;
-            $obj->{changed_cols}{$meta_col}++;
-        }
-        return $meta->{$var};
-    } else {
-        my $meta = $obj->column($meta_col);
-        if (!ref $meta) {
-            $meta = __thaw_meta(\$meta);
-            $obj->{column_values}{$meta_col} = $meta;
-        }
-        # we should assume changes are going to be made, since
-        # we can't really monitor the hash once it has left us
-        $obj->{changed_cols}{$meta_col}++;
-        return $meta;
-    }
+            $obj->{__meta}->set($col, @_);
+        }
+        else {
+            $obj->{__meta}->get($col);
+        }
+    };
 }
 
@@ -466 +602 @@
     my $ret = sprintf '%04d-%02d-%02d %02d:%02d:%02d', unpack 'A4A2A2A2A2A2', $_[0];  
     return $ret;  
-}  
+}
   
 sub db2ts {  
@@ -754 +890 @@
 }
 
+sub clone_all {
+    my $obj = shift;
+    my $clone = $obj->SUPER::clone_all();
+    $clone->{__meta} = $obj->{__meta};  # TODO: clone this too
+    return $clone;
+}
+
 sub clone {
     my $obj = shift;
     my($param) = @_;
-    my $clone = $obj->SUPER::clone_all;
+    my $clone = $obj->clone_all();
 
     ## If the caller has listed a set of columns not to copy to the clone,
@@ -821 +964 @@
 }
 
+sub remove_meta {
+    my $obj = shift;
+    return 1 unless ref $obj;
+    my $mpkg = $obj->meta_pkg or return;
+    my $id_field = $obj->datasource . '_id';
+    return $mpkg->remove({ $id_field => $obj->id });
+}
+
 sub remove_children {
     my $obj = shift;
@@ -834 +985 @@
     my $obj_id = $obj->id;
     for my $class (@classes) {
-        eval "use $class;";
+        eval "# line " . __LINE__ . " " . __FILE__ . "\nuse $class;";
         $class->remove({ $key => $obj_id });
     }
@@ -943 +1094 @@
     $def{key} = 1 if ($props->{primary_key}) && ($props->{primary_key} eq $col);
     $def{auto} = 1 if $def =~ m/\bauto[_ ]increment\b/i;
-    $def{default} = $props->{defaults}{$col} if exists $props->{defaults}{$col};
+    $def{default} = $props->{defaults}{$col}
+        if exists $props->{defaults}{$col};
     \%def;
 }
@@ -1008 +1160 @@
     $hash;
 }
+
+package MT::Object::Meta;
+
+use base qw( Data::ObjectDriver::BaseObject );
+
+sub driver { $MT::Object::DRIVER ||= MT::ObjectDriverFactory->new }
+
+sub install_properties {
+    my $class = shift;
+    my ($props) = @_;
+    $props->{column_defs}->{$_} ||= 'string'
+        for @{ $props->{columns} };
+    $class->SUPER::install_properties(@_);
+}
+
+sub meta_pkg { undef }
+
+*table_name = \&MT::Object::table_name;
+*column_defs = \&MT::Object::column_defs;
+*column_def = \&MT::Object::column_def;
+*index_defs = \&MT::Object::index_defs;
+*__parse_defs = \&MT::Object::__parse_defs;
+*__parse_def = \&MT::Object::__parse_def;
+*count = \&MT::Object::count;
+*columns_of_type = \&MT::Object::columns_of_type;
+
+# TODO: copy this too
+sub blob_requires_zip {}
 
 1;

branches/release-35/lib/MT/ObjectDriver/DDL/mysql.pm

@@ -22 +22 @@
     my $field_prefix = $class->datasource;
     my $table_name = $class->table_name;
+    local $dbh->{RaiseError} = 0;
     my $sth = $dbh->prepare('SHOW INDEX FROM ' . $table_name)
         or return undef;

branches/release-35/lib/MT/Template.pm

@@ -35 +35 @@
         'build_type' => 'smallint',
         'build_interval' => 'integer',
+
+        # meta properties
+        'last_rebuild_time' => 'integer meta',
+        'page_layout' => 'string meta',
+        'include_with_ssi' => 'integer meta',
+        'use_cache' => 'integer meta',
+        'cache_expire_type' => 'integer meta',
+        'cache_expire_interval' => 'integer meta',
+        'cache_expire_event' => 'string meta',
     },
     indexes => {
@@ -54 +63 @@
     datasource => 'template',
     primary_key => 'id',
-});
-__PACKAGE__->install_meta({
-    columns => [
-        'last_rebuild_time',
-        'page_layout',
-        'include_with_ssi',
-        'use_cache',
-        'cache_expire_type',
-        'cache_expire_interval',
-        'cache_expire_event',
-    ],
 });
 __PACKAGE__->add_trigger('pre_remove' => \&pre_remove_children);

branches/release-35/lib/MT/Upgrade.pm

@@ -1352 +1352 @@
         }
     }
+
+    # handle schema updates for meta table
+    if ($class->meta_pkg) {
+        $self->check_type($type . ':meta');
+    }
+
     1;
 }

branches/release-35/t/09-image.t

@@ -25 +25 @@
     );
     @drivers = qw( ImageMagick NetPBM );
-    plan tests => scalar @Img + scalar @Img * scalar @drivers * 17;
+    plan tests => scalar @Img                           # file exists
+                + (scalar @Img * scalar @drivers * 18)  # 18 tests each for every image and driver
+                ;
 }
 
@@ -38 +40 @@
 
 for my $rec (@Img) {
-    my $img_file = File::Spec->catfile($BASE, 't', 'images', $rec->[0]);
+    my ($img_filename, $img_width, $img_height) = @$rec;
+    my $img_file = File::Spec->catfile($BASE, 't', 'images', $img_filename);
     ok(-B $img_file, "$img_file looks like a binary file");
 
@@ -46 +49 @@
 SKIP : {
         skip("no $driver image", 17) unless $img;
-        isa_ok($img, 'MT::Image::' . $driver);
+        isa_ok($img, 'MT::Image::' . $driver, "driver $driver with image $img_file is an MT::Image::$driver");
 #        diag( MT::Image->errstr ) if MT::Image->errstr;
 
-        is($img->{width}, $rec->[1], "width is $rec->[1]");
-        is($img->{height}, $rec->[2], "height is $rec->[2]");
-        my($w, $h) = $img->get_dimensions;
-        is($w, $rec->[1], "width is $rec->[1]");
-        is($h, $rec->[2], "height is $rec->[2]");
+        is($img->{width},  $img_width,  "$driver says $img_filename is $img_width px wide");
+        is($img->{height}, $img_height, "$driver says $img_filename is $img_height px high");
+        my($w, $h) = $img->get_dimensions();
+        is($w, $img_width,  "${driver}'s get_dimensions says $img_filename is $img_width px wide");
+        is($h, $img_height, "${driver}'s get_dimensions says $img_filename is $img_height px high");
 
         ($w, $h) = $img->get_dimensions(Scale => 50);
-        my($x, $y) = (int($img->{width} / 2), int($img->{height} / 2));
-        is($w, $x, "width is $x");
-        is($h, $y, "height is $y");
+        my($x, $y) = (int($img_width / 2), int($img_height / 2));
+        is($w, $x, "$driver says $img_filename at 50\% scale is $x px wide");
+        is($h, $y, "$driver says $img_filename at 50\% scale is $y px high");
+
+        ($w, $h) = $img->get_dimensions();
+        is($w, $img_width,  "${driver}'s get_dimensions says $img_filename is still $img_width px wide after theoretical scaling");
+        is($h, $img_height, "${driver}'s get_dimensions says $img_filename is still $img_height px high after theoretical scaling");
 
         ($w, $h) = $img->get_dimensions(Width => 50);
-        is($w, 50, 'width is 50');
+        is($w, 50, "$driver says $img_filename scaled to 50 px wide is 50 px wide");
 
         ($w, $h) = $img->get_dimensions(Width => 50, Height => 100);
-        is($w, 50, 'width is 50');
-        is($h, 100, 'height is 100');
+        is($w, 50,  "$driver says $img_filename scaled to 50x100 is 50 px wide");
+        is($h, 100, "$driver says $img_filename scaled to 50x100 is 100 px high");
 
         (my($blob), $w, $h) = $img->scale(Scale => 50);
-        ($x, $y) = (int($img->{width} / 2), int($img->{height} / 2));
-        is($w, $x, "width is $x");
-        is($h, $y, "height is $y");
+        ($x, $y) = (int($img_width / 2), int($img_height / 2));
+        is($w, $x, "result of scaling $img_filename to 50\% with $driver is $x px wide");
+        is($h, $y, "result of scaling $img_filename to 50\% with $driver is $y px high");
 
         open FH, $img_file or die $!;
@@ -80 +87 @@
         isa_ok($img, 'MT::Image::' . $driver);
 #            diag( MT::Image->errstr ) if MT::Image->errstr;
-        is($img->{width}, $rec->[1], "width is $rec->[1]");
-        is($img->{height}, $rec->[2], "height is $rec->[2]");
+        is($img->{width},  $img_width,  "$driver says $img_filename from blob is $img_width px wide");
+        is($img->{height}, $img_height, "$driver says $img_filename from blob is $img_height px high");
         ($w, $h) = $img->get_dimensions;
-        is($w, $rec->[1], "width is $rec->[1]");
-        is($h, $rec->[2], "height is $rec->[2]");
+        is($w, $img_width,  "${driver}'s get_dimensions says $img_filename from blob is $img_width px wide");
+        is($h, $img_height, "${driver}'s get_dimensions says $img_filename from blob is $img_height px high");
 } # END SKIP
     }

branches/release-35/t/20-setup.t

@@ -39 +39 @@
 ObjectDriver DBI::sqlite
 PluginPath ../plugins
+PluginPath plugins
 CFG
     close $fh;

branches/release-35/t/22-author.t

@@ -8 +8 @@
 use lib 'extlib';
 
-use Test::More tests => 54;
+use Test::More tests => 64;
 
 use MT;
@@ -34 +34 @@
 my $perm = $author->blog_perm(1);
 ok($perm, "$author->blog_perm(1)") || die;
-ok($author->can_edit_entry(1), 'can_edit_entry(1)');
-ok($author->can_edit_entry(2), 'can_edit_entry(2)');
+ok($author->can_edit_entry(1), 'Chuck D can edit entry #1');
+ok($author->can_edit_entry(2), 'Chuck D can edit entry #2');
 ok($perm->can_comment, 'can_comment');
 ok($perm->can_post, 'can_post');
@@ -58 +58 @@
 
 {
+diag('meta field tests');
+
+my $author = MT::Author->load({ name => 'Chuck D' });
+ok(eval { $author->widgets(); 1 }, 'Author obj has widgets accessor');
+ok(!defined $author->widgets, "Author's widgets are undefined by default");
+ok(!defined $author->favorite_blogs, "Author's favorite blogs are undefined by default");
+
+    # same as in MT::CMS::Dashboard, but that's not necessary
+    my $default_widgets = {
+        'blog_stats' =>
+          { param => { tab => 'entry' }, order => 1, set => 'main' },
+        'this_is_you-1' => { order => 1, set => 'sidebar' },
+        'mt_shortcuts'  => { order => 2, set => 'sidebar' },
+        'mt_news'       => { order => 3, set => 'sidebar' },
+    };
+
+my $fav_blogs = [1, 7];  # not actually a blog #7, but meh
+
+ok($author->widgets($default_widgets), "Author's widgets can be set");
+ok($author->favorite_blogs($fav_blogs), "Author's favorite blogs can be set");
+ok($author->save(), "Author with modified widgets can be saved");
+
+require MT::ObjectDriver::Driver::Cache::RAM;
+MT::ObjectDriver::Driver::Cache::RAM->clear_cache();
+
+$author = MT::Author->load({ name => 'Chuck D' });
+
+ok($author->widgets, "Modified author has widgets");
+is_deeply($author->widgets, $default_widgets, "Author's widgets survived being saved accurately");
+
+ok($author->favorite_blogs, "Modified author has favorite blogs");
+is_deeply($author->favorite_blogs, $fav_blogs, "Author's favorite blogs survived being saved accurately");
+}
+
+{
 my $author = MT::Author->load({ name => 'Bob D' });
 $author = MT::Author->load($author->id);  # silly ruse to force caching.... 
@@ -68 +103 @@
 ok( ! $author->can_view_log, 'can_view_log' );
 ok( ! $author->can_manage_plugins, 'can manage plugins');
-ok( ! $author->can_edit_entry(1), 'can_edit_entry(1)' );
-ok(   $author->can_edit_entry(2), 'can_edit_entry(2)' );
+ok( ! $author->can_edit_entry(1), 'Bob D can edit entry #1' );
+ok(   $author->can_edit_entry(2), 'Bob D can edit entry #2' );
 ok(   $perm->can_post, 'can_post' );
 ok(   $perm->can_create_post, 'can_create_post');
 ok(   $perm->can_publish_post, 'can_publish_post');
-ok( ! $perm->can_upload, 'can_upload' );
-ok( ! $perm->can_edit_all_posts, 'can_edit_all_posts' );
+ok(   $perm->can_upload, 'Bob D can *not* upload files' );
+ok( ! $perm->can_edit_all_posts, 'Bob D can *not* edit all posts' );
 ok( ! $perm->can_manage_pages, 'can_manage_pages');
-ok(   $perm->can_edit_templates, 'can_edit_templates' );
+ok( ! $perm->can_edit_templates, 'Bob D can *not* edit templates' );
 ok( ! $perm->can_edit_tags, 'can_edit_tags');
 ok( ! $perm->can_edit_config, 'can_edit_config' );
 ok( ! $perm->can_set_publish_paths, 'can_set_publish_paths');
 ok( ! $perm->can_rebuild, 'can_rebuild' );
-ok( ! $perm->can_send_notifications, 'can_send_notifications' );
+ok(   $perm->can_send_notifications, 'Bob D can send notifications' );
 ok( ! $perm->can_edit_categories, 'can_edit_categories' );
 ok( ! $perm->can_edit_notifications, 'can_edit_notifications' );

branches/release-35/t/64-objectmeta.t

@@ -2 +2 @@
 
 use strict;
-use lib 'extlib', 'lib';
+use lib 't/lib', 'extlib', 'lib';
 
 use Data::Dumper;
-use Test::More tests => 13;
+use Test::More tests => 26;
 
 use MT;
 use MT::Object;
 
+use vars qw( $DB_DIR $T_CFG );
+use MT::Test qw(:db);
+
 my $mt = MT->instance;  # plugins are go!
 
+require MT::Awesome;
+require MT::Awesome::Image;
 
-package MT::Awesome;
+my $file  = MT::Awesome->new;
+my $image = MT::Awesome::Image->new;
 
-our @ISA = qw( MT::Object );
+#ok($file->has_column('meta'), 'having meta auto-adds meta column');
 
-__PACKAGE__->install_properties({
-    column_defs => {
-        id => 'integer not null auto_increment',
-        title => 'string(255)',
-        file => 'string(255)',
-    },
-    meta => 1,
-    class_type => 'foo',
-});
-__PACKAGE__->install_meta({
-    columns => [ 'mime_type' ]
-});
+ok($file->is_meta_column('mime_type'), 'adding mime_type metadata field reports mime_type as a meta column');
+ok($file->has_column('mime_type'), 'adding mime_type metadata field reports mime_type as a column');
+ok(!defined $file->meta('mime_type'), 'unset metadata field is undefined');
 
-package MT::Awesome::Image;
-
-our @ISA = qw( MT::Awesome );
-
-__PACKAGE__->install_properties({
-    class_type => 'image',
-});
-__PACKAGE__->install_meta({
-    columns => [ 'width', 'height' ]
-});
-
-package main;
-
-my $file = new MT::Awesome;
-my $image = new MT::Awesome::Image;
-
-ok($file->has_column('meta'), 'having meta auto-adds meta column');
-ok(!defined $file->meta('mime_type'), 'unset metadata field is undefined');
 ok($file->meta('mime_type', 'archive/zip'), 'metadata field could be set');
 is($file->meta('mime_type'), 'archive/zip', 'new metadata value could be retrieved');
-ok($file->{changed_cols}{meta}, 'setting metadata field marked meta column as changed');
 is($file->mime_type, 'archive/zip', 'auto-installed metadata field method retrieved new value');
+
+diag('saving object');
+ok($file->save(), 'object with metadata could be saved');
+diag('object saved');
+ok($file->id, 'object with metadata received id when saved');
+is($file->meta('mime_type'), 'archive/zip', 'metadata value is still set after save');
+
+my $file_2 = MT::Awesome->load($file->id)
+    or diag('ERROR: ' . MT::Awesome->errstr);
+ok($file_2, 'object with metadata could be loaded');
+is($file_2->meta('mime_type'), 'archive/zip', 'metadata value is correct on loaded object');
+
+is($file_2->mime_type, 'archive/zip', 'metadata value as retrieved with auto-installed method is correct on loaded object');
+
+#ok($file->{changed_cols}{meta}, 'setting metadata field marked meta column as changed');
 ok(!$file->has_meta('width'), 'metadata field on subclass did not install on superclass');
 
@@ -57 +50 @@
 ok($image->width(300), 'metadata field on subclass could be set with auto-installed method');
 is($image->width, 300, 'auto-installed metadata field method retrieved new value for subclass');
-ok($image->{changed_cols}{meta}, 'setting metadata field on subclass with auto-installed method marked meta column as changed');
+#ok($image->{changed_cols}{meta}, 'setting metadata field on subclass with auto-installed method marked meta column as changed');
 ok($image->has_meta('width'), 'subclass has metadata field that was declared for subclass');
 ok($image->has_meta('mime_type'), 'subclass has metadata field that was declared for superclass');
+ok($image->mime_type('image/jpeg'), 'subclass object mime type set');
+ok($image->save(), 'image object saved');
 
+ok($image->id, 'image object with metadata received id when saved');
+
+my $image_2 = MT::Awesome->load($image->id);
+ok($image_2, 'subclass object could be loaded');
+is($image_2->mime_type, 'image/jpeg', 'metadata value as retrieved with auto-installed method is correct on loaded image object');
+
+ok(MT::Asset::Image->has_meta('image_width'), 'MT::Asset::Image has an image_width meta column.');
+ok(MT::Entry->has_meta, 'MT::Entry has a meta support.');
+ok(MT::Page->has_meta, 'MT::Page has a meta support.');
+

branches/release-35/t/lib/MT/Test.pm

@@ -6 +6 @@
 use File::Spec;
 use MT;
+
+use Test::More;
 
 BEGIN {
@@ -34 +36 @@
     my $pkg = shift;
     foreach my $opt (@_) {
-        $pkg->init_db() if $opt eq ':db';
-        $pkg->init_test_db() if $opt eq ':testdb';
-        $pkg->sample_data() if $opt eq ':data';
+        if ($opt eq ':db') {
+            diag "Initializing database";
+            $pkg->init_db();
+        }
+        elsif ($opt eq ':testdb') {
+            $pkg->init_test_db();
+        }
+        elsif ($opt eq ':data') {
+            diag "Initializing sample data";
+            $pkg->sample_data();
+        }
     }
 }
@@ -74 +84 @@
 
     my $types = MT->registry('object_types');
-    my @classes = map { $types->{$_} } grep { $_ !~ /\./ } keys %$types;
+    $types->{$_} = MT->model($_) for
+        grep { MT->model($_) }
+        map  { $_ . ':meta' }
+        grep { MT->model($_)->meta_pkg }
+        sort keys %$types;
+    my @classes = map { $types->{$_} } grep { $_ !~ /\./ } sort keys %$types;
     foreach my $class (@classes) {
         if (ref($class) eq 'ARRAY') {
             next; #TODO for now - it won't hurt when we do driver-tests.
         }
-        else {
-            eval 'require '.$class or die $@;
+        elsif (!defined *{ $class . '::__properties' }) {
+            eval '# line ' . __LINE__ . ' ' . __FILE__ . "\n" . 'require '.$class or die $@;
         }
     }
@@ -109 +124 @@
     );
     eval {
+        # line __LINE__ __FILE__
         MT::Entry->remove;
         MT::Comment->remove;
@@ -151 +167 @@
     $blog->commenter_authenticators('enabled_TypeKey');
     $blog->save() or die "Couldn't save blog 1: ". $blog->errstr;
+    diag "Saved blog";
 
     require MT::Entry;
@@ -169 +186 @@
     $chuckd->save()
         or die "Couldn't save author record 2: " . $chuckd->errstr;
+    diag "Saved user Chuck D";
 
     my $bobd = MT::Author->new();
@@ -181 +199 @@
     $bobd->id(3);
     $bobd->save() or die "Couldn't save author record 3: " . $bobd->errstr;
+    diag "Saved user Bob D";
 
     my $johnd = MT::Author->new();
@@ -193 +212 @@
     $johnd->id(4);
     $johnd->save() or die "Couldn't save author record 4: " . $johnd->errstr;
+    diag "Saved user John Doe";
 
     my $hiro = MT::Author->new();
@@ -206 +226 @@
     $hiro->status(2);
     $hiro->save() or die "Couldn't save author record 5: " . $hiro->errstr;
+    diag "Saved user Hiro";
+
+    require MT::Role;
+    my ($admin_role, $author_role) = map { MT::Role->load({ name => $_ }) }
+        ('Blog Administrator', 'Author');
 
     require MT::Association;
@@ -211 +236 @@
     $assoc->author_id($chuckd->id);
     $assoc->blog_id(1);
-    $assoc->role_id(3);
+    $assoc->role_id($admin_role->id);
     $assoc->type(1);
     $assoc->save();
@@ -218 +243 @@
     $assoc->author_id($bobd->id);
     $assoc->blog_id(1);
-    $assoc->role_id(4);
+    $assoc->role_id($author_role->id);
     $assoc->type(1);
     $assoc->save();
@@ -225 +250 @@
     $assoc->author_id($hiro->id);
     $assoc->blog_id(1);
-    $assoc->role_id(3);
+    $assoc->role_id($admin_role->id);
     $assoc->type(1);
     $assoc->save();
@@ -255 +280 @@
         $entry->tags('rain', 'grandpa', 'strolling');
         $entry->save() or die "Couldn't save entry record 1: ".$entry->errstr;
+        diag "Saved entry #1";
     }
 
@@ -275 +301 @@
         $entry->id(2);
         $entry->save() or die "Couldn't save entry record 2: ".$entry->errstr;
+        diag "Saved entry #2";
     }
 
@@ -297 +324 @@
         $entry->tags('anemones');
         $entry->save() or die "Couldn't save entry record 3: ".$entry->errstr;
+        diag "Saved entry #3";
     }
 
@@ -327 +355 @@
         $ping->visible(1);
         $ping->save or die "Couldn't save TBPing record 1: " . $ping->errstr;
+        diag "Saved a trackback ping";
     }
 
@@ -355 +384 @@
         $cat->id(1);
         $cat->save or die "Couldn't save category record 1: ". $cat->errstr;
+        diag "Saved category foo";
     }
 
@@ -367 +397 @@
         $cat->id(2);
         $cat->save or die "Couldn't save category record 2: ". $cat->errstr;
+        diag "Saved category bar";
     }
 
@@ -379 +410 @@
         $tb->id(2);
         $tb->save or die "Couldn't save Trackback record 2: " . $tb->errstr;;
+        diag "Saved category bar's trackback target";
     }
 
@@ -391 +423 @@
         $cat->id(3);
         $cat->save or die "Couldn't save category record 3: ". $cat->errstr;
+        diag "Saved subcategory subfoo";
     }
 
@@ -427 +460 @@
                 $place->save
                     or die "Couldn't save placement record: ".$place->errstr;
+                diag "Placed entry Verse 3 in category foo";
             }
             if ($i == 4) {
@@ -436 +470 @@
                 $place->save
                     or die "Couldn't save placement record: ".$place->errstr;
+                diag "Placed entry Verse 4 in category subfoo";
             }
         }
@@ -458 +493 @@
         $cmt->id(1);
         $cmt->save() or die "Couldn't save comment record 1: ".$cmt->errstr;
+        diag "Saved comment #1";
 
         $cmt->id(11);
@@ -465 +501 @@
         $cmt->parent_id(1);
         $cmt->save() or die "Couldn't save comment record 11: ".$cmt->errstr;
+        diag "Saved child comment #11";
 
         $cmt->id(12);
@@ -472 +509 @@
         $cmt->parent_id(11);
         $cmt->save() or die "Couldn't save comment record 12: ".$cmt->errstr;
+        diag "Saved child comment #12";
     }
     # entry id 5 - 1 comment, commenting is off (closed)
@@ -587 +625 @@
     $tmpl->type('custom');
     $tmpl->save or die "Couldn't save template record 1: ".$tmpl->errstr;
+    diag "Saved blog-name template";
 
     ### Asset
@@ -600 +639 @@
     $asset->file_ext('jpg');
     $asset->image_width(640);
+    diag "Set image asset's width metadata field";
     $asset->image_height(480);
     $asset->mime_type('image/jpeg');
@@ -606 +646 @@
     $asset->created_by(1);
     $asset->tags('alpha', 'beta', 'gamma');
-    $asset->save;
+    diag "Tagged image asset";
+    $asset->save or die "Couldn't save asset record 1: " . $asset->errstr;
+    diag "Saved image asset";
 
     $asset->set_score('unit test', $bobd, 5, 1);
@@ -624 +666 @@
     $asset->created_on('19780131074500');
     $asset->tags('beta');
-    $asset->save;
+    $asset->save or die "Couldn't save file asset record: " . $asset->errstr;
+    diag "Saved file asset";
 
     $asset->set_score('unit test', $chuckd, 2, 1);
@@ -642 +685 @@
     $e4->set_score('unit test', $chuckd, 2, 1);
     $e4->set_score('unit test', $johnd, 3, 1);
+    diag "Saved scores for entry #4";
 
     ## Page
@@ -672 +716 @@
     $folder->id(20);
     $folder->save or die "Could'n sae folder record 20:" . $folder->errstr;
+    diag "Saved folder #20";
 
     $folder = MT::Folder->new();