Changeset 11476 for trunk

Timestamp:

10/06/08 14:16:06 (3 months ago)

Author:

juruen@…

Message:

add support to add custom models

Location:

trunk/extra/moddev

Files:

• src/ebox-moddev-create (modified) (1 diff)
• src/ebox-moddev-create.in (modified) (1 diff)
• src/ebox-moddev-model.in (modified) (12 diffs)
• stubs/Makefile.am (modified) (1 diff)
• stubs/src/MainClass.pm.mas (modified) (1 diff)
• stubs/src/Model/FormModel.pm.mas (modified) (3 diffs)

trunk/extra/moddev/src/ebox-moddev-create

@@ -148 +148 @@
     my ($interp, $output, $options) = @_;
 
-    my $dir = $options->{destdir} . '/src/EBox/Model';
-    my $mainClass = 'Settings.pm';
-    mkdir ($dir) or die "Can't create $dir";
-
-    my $comp = $interp->make_component(
-            comp_file => STUBS_PATH .  '/src/Model/Makefile.am.mas',
-            );
-    ${$output} = '';
-    $interp->exec($comp, 
-                    ( module => $options->{mainClass},
-                      models => ('Settings.pm')));
-    write_file($dir . '/Makefile.am', ${$output});
-    
-    # TableModel or FormModel ?
-    my $template;
-    if ($options->{model} eq 'table') {
-        $template = '/src/Model/TableModel.pm.mas';
-    } else {
-        $template = '/src/Model/FormModel.pm.mas';
-    }
-    $comp = $interp->make_component(
-            comp_file => STUBS_PATH . $template,
-            );
-    ${$output} = '';
-    $interp->exec($comp, 
-            ( mainClass => 'EBox::' . $options->{mainClass},
-              modelName => 'Settings',
-              printableTableName => 'Settings', 
-              rowName   => 'Setting',
-              modelDomain => $options->{mainClass}
-              ));
-    write_file("$dir/Settings.pm", ${$output});
+    my $dir = $options->{destdir}; 
+    my $mainClass = $options->{mainClass}; 
+    my $params = " --main-class $mainClass --name Settings" .
+                 " --field field1:Text --field field2:Text" .
+                 " --destdir $dir";
+    system("ebox-moddev-model $params"); 
 }
 

trunk/extra/moddev/src/ebox-moddev-create.in

@@ -148 +148 @@
     my ($interp, $output, $options) = @_;
 
-    my $dir = $options->{destdir} . '/src/EBox/Model';
-    my $mainClass = 'Settings.pm';
-    mkdir ($dir) or die "Can't create $dir";
-
-    my $comp = $interp->make_component(
-            comp_file => STUBS_PATH .  '/src/Model/Makefile.am.mas',
-            );
-    ${$output} = '';
-    $interp->exec($comp, 
-                    ( module => $options->{mainClass},
-                      models => ('Settings.pm')));
-    write_file($dir . '/Makefile.am', ${$output});
-    
-    # TableModel or FormModel ?
-    my $template;
-    if ($options->{model} eq 'table') {
-        $template = '/src/Model/TableModel.pm.mas';
-    } else {
-        $template = '/src/Model/FormModel.pm.mas';
-    }
-    $comp = $interp->make_component(
-            comp_file => STUBS_PATH . $template,
-            );
-    ${$output} = '';
-    $interp->exec($comp, 
-            ( mainClass => 'EBox::' . $options->{mainClass},
-              modelName => 'Settings',
-              printableTableName => 'Settings', 
-              rowName   => 'Setting',
-              modelDomain => $options->{mainClass}
-              ));
-    write_file("$dir/Settings.pm", ${$output});
+    my $dir = $options->{destdir}; 
+    my $mainClass = $options->{mainClass}; 
+    my $params = " --main-class $mainClass --name Settings" .
+                 " --field field1:Text --field field2:Text" .
+                 " --destdir $dir";
+    system("ebox-moddev-model $params"); 
 }
 

trunk/extra/moddev/src/ebox-moddev-model.in

@@ -33 +33 @@
 sub _printUsage
 {
-    print STDERR "\nUsage: $0 --name name --field field1:type1 [Options]\n\n";
+    print STDERR "\nUsage: $0 --main-class class --name name --field field1:type1 [Options]\n\n";
     print STDERR "Options:\n";
     print STDERR "\t--model form | table. Default: form\n";
@@ -48 +48 @@
     my %validTypes = map {$_ => 1} types();
     my %names;
-
+    my  @fields;
     for my $pair (@{$fields}) {
         unless ($pair =~ /:/) {
@@ -64 +64 @@
         } else {
             $names{$name} = $type;
-        }
-    }
-
-    return %names;
+            push (@fields, { name => $name, type => $type});
+        }
+    }
+
+    return \@fields;
 }
 
@@ -77 +78 @@
             destdir => undef,
             model => 'form',
+            mainClass => undef,
             );
     my $help;
@@ -82 +84 @@
     my @fields;
     my $optionsOk = GetOptions(
+            'main-class=s' => \$options{mainClass},
             'name=s' => \$options{name},
             'fields=s' => $options{fields},
@@ -89 +92 @@
             'info'  => \$info,
             );
-    %options{parsedFields} = _parseFields($options{fields});
+    $options{parsedFields} = _parseFields($options{fields});
     if (not $optionsOk or $info or $help) {
         _printUsage();
@@ -106 +109 @@
     }
 
-
-    $options{destdir} .= '/' . $options{moduleName};
-
     unless ( -d $options{destdir} ) {
         die "$options{destdir} does not exist!!";
@@ -116 +116 @@
 }
 
+sub _models
+{
+    my ($dir) = @_;
+    my @models ;
+    opendir ( my $dirFH, $dir );
+    while ( defined ( my $file = readdir ( $dirFH ))) {
+          next unless ( $file =~ m/.*\.pm/ );
+          push(@models, $file);
+    }
+    return \@models; 
+}
+sub _makefile
+{
+    my ($interp, $output, $options) = @_;
+
+    my $dir = $options->{destdir} . '/src/EBox/Model';
+
+   my $comp = $interp->make_component(
+            comp_file => STUBS_PATH .  '/src/Model/Makefile.am.mas',
+            );
+    ${$output} = '';
+    $interp->exec($comp,
+                    ( module => $options->{mainClass},
+                      models => _models($dir)));
+
+    write_file($dir . '/Makefile.am', ${$output});
+}
+
 sub _src_EBox_Model
 {
@@ -121 +149 @@
 
     my $dir = $options->{destdir} . '/src/EBox/Model';
-    my $mainClass = 'Settings.pm';
-    mkdir ($dir) or die "Can't create $dir";
-
+    my $mainClass = $options->{name} . '.pm';
+    mkdir ($dir) unless (-d $dir); 
+
+    # TableModel or FormModel ?
+    my $template = '/src/Model/FormModel.pm.mas';
+   
     my $comp = $interp->make_component(
-            comp_file => STUBS_PATH .  '/src/Model/Makefile.am.mas',
-            );
-    ${$output} = '';
-    $interp->exec($comp, 
-                    ( module => $options->{mainClass},
-                      models => ('Settings.pm')));
-    write_file($dir . '/Makefile.am', ${$output});
-    
-    # TableModel or FormModel ?
-    my $template;
-    if ($options->{model} eq 'table') {
-        $template = '/src/Model/TableModel.pm.mas';
-    } else {
-        $template = '/src/Model/FormModel.pm.mas';
-    }
-    $comp = $interp->make_component(
             comp_file => STUBS_PATH . $template,
             );
@@ -146 +161 @@
     $interp->exec($comp, 
             ( mainClass => 'EBox::' . $options->{mainClass},
-              modelName => 'Settings',
-              printableTableName => 'Settings', 
-              rowName   => 'Setting',
-              modelDomain => $options->{mainClass}
+              modelName => $options->{name},
+              printableTableName => $options->{name}, 
+              rowName   => $options->{name},
+              modelDomain => $options->{mainClass},
+              fields    => $options->{parsedFields},
               ));
-    write_file("$dir/Settings.pm", ${$output});
+    write_file("$dir/$mainClass", ${$output});
+
+}
+
+sub _addModelsToMainClass
+{
+    my ($interp, $output, $options) = @_;
+
+    my $mainClass = $options->{mainClass};
+    my $file = $options->{destdir} . "/src/EBox/$mainClass.pm";
+    my $dir = $options->{destdir} . "/src/EBox/Model";
+
+    my $code = "    return [\n";
+    for my $model (@{_models($dir)}) {
+        $code .= ' ' x 8;
+        $code .= "'EBox::${mainClass}::Model::$model',\n";
+    }
+    $code .= "    ];\n";
+
+    my $fd;
+    open($fd, $file) or die "Can open $file\n";
+    my @oldFile = <$fd>;
+    close($fd);
+    
+    open($fd, ">$file");
+    my $inFunction = undef;
+    for my $line (@oldFile) {
+        if ($line =~ /sub modelClasses/) {
+            $inFunction = 1;    
+        } elsif ($inFunction and $line =~ /{/) {
+            print $fd "{\n$code";
+            next;
+        } elsif ($inFunction and $line =~ /}/) {
+            $inFunction = undef
+        }  elsif ($inFunction) {
+            next;
+        }
+        print $fd $line;
+    }
+    close($fd);
 }
 
@@ -160 +215 @@
 
     my $dir = $options->{destdir};
-    
-    mkdir $dir or die "Can't create dir $dir";
     
     my $output;
@@ -168 +221 @@
 
    _src_EBox_Model($interp, \$output, $options);
+   _makefile($interp, \$output, $options);
+   _addModelsToMainClass($interp, \$output, $options);
 
 }

trunk/extra/moddev/stubs/Makefile.am

@@ -51 +51 @@
 
 EXTRA_DIST = $(stubs_DATA) $(stubsdebian_DATA) $(stubsm4_DATA) \
-        $(stubsmigration_DATA) $(stubsschema_DATA) $(stubssrc_DATA) \
+        $(stubsmigration_DATA) $(stubsschemas_DATA) $(stubssrc_DATA) \
         $(stubsmodel_DATA) $(stubstools_DATA) $(stubsstubs_DATA)
 

trunk/extra/moddev/stubs/src/MainClass.pm.mas

@@ -59 +59 @@
 #
 #       <EBox::Model::ModelProvider::modelClasses>
-sub modelClasses {
+sub modelClasses 
+{
     my ($self) = @_;
 

trunk/extra/moddev/stubs/src/Model/FormModel.pm.mas

@@ -5 +5 @@
     $rowName
     $modelDomain
+    $modelType => 'form'
+    @fields => ()
 </%args>
 # Copyright  
@@ -35 +37 @@
 use warnings;
 
+% if ($modelType eq 'form') {
 use base 'EBox::Model::DataForm';
+% } else {
+use base 'EBox::Model::DataTable';
+% }
 
 sub new 
@@ -53 +59 @@
     my @tableHead = 
     ( 
-        new EBox::Types::Text(
-            'fieldName' => 'field1',
-            'printableName' => __('Field 1'),
+% for my $field (@fields) {
+        new EBox::Types::<% $field->{type} %>(
+            'fieldName' => '<% $field->{name} %>',
+            'printableName' => __('<% $field->{name} %>'),
             'size' => '8',
             'unique' => 1,
             'editable' => 1
         ),
-        new EBox::Types::Text(
-            'fieldName' => 'field2',
-            'printableName' => __('Field 2'),
-            'size' => '8',
-            'unique' => 1,
-            'editable' => 1
-        ),
+% }
     );
-
     my $dataTable = 
     {