Changeset 3944 for lang/perl/Senna

Timestamp:

01/02/08 00:32:22 (5 years ago)

Author:

daisuke

Message:

lang/perl/Senna; Update calling syntax for ->create(), update tests.

Location:

lang/perl/Senna/trunk

Files:

• lib/Senna/Index.pm (modified) (2 diffs)
• t/index/01_create.t (modified) (1 diff)
• t/index/02_open.t (modified) (2 diffs)
• t/index/03_simple.t (modified) (1 diff)

lang/perl/Senna/trunk/lib/Senna/Index.pm

@@ -14 +14 @@
 {
     my $class = shift;
-    my %args  = @_;
 
-    $args{key_size} ||= 0;
-    $args{flags}    ||= 0;
-    my @xs_args = @args{ qw(path key_size flags initial_n_segments encoding) };
-    pop @xs_args while @xs_args && ! defined $xs_args[-1];
-    $class->XS_create(@xs_args);
+    my @fields = qw(path key_size flags initial_n_segments encoding);
+    my $count = scalar @_;
+    if ($count == 1) {
+        if (ref $_[0] eq 'HASH') {
+            @_ = map { $_[0]->{$_} } @fields;
+        }
+    } elsif ($count != 5) {
+        my %args  = @_;
+        @_ = @args{ @fields };
+    }
+
+    pop @_ while @_ && ! defined $_[-1];
+    $class->XS_create(@_);
 }
 
@@ -96 +103 @@
 =head2 create
 
+Creates a new index.
+
+  my $index = Senna::Index->create(
+    $path, $key_size, $flags, $initial_n_segments, $encoding
+  );
+  my $index = Senna::Index->create({
+    path               => $path,
+    key_size           => $key_size, 
+    flags              => $flags,
+    initial_n_segments => $initial_n_segments,
+    encoding           => $encoding
+  });
+
+For backwards compatibility, if given anything other than 1 or 5 arguments,
+create() assumes that you've been given a key value pair like so:
+
+  my $index = Senna::Index->create(
+    path               => $path,
+    key_size           => $key_size, 
+    flags              => $flags,
+    initial_n_segments => $initial_n_segments,
+    encoding           => $encoding
+  );
+
+However, note that this form is DEPRECATED. Use the HASHREF form instead
+
 =head2 open
 

lang/perl/Senna/trunk/t/index/01_create.t

@@ -10 +10 @@
 {
     my $temp  = File::Temp->new( UNLINK => 1 );
-    my $index = Senna::Index->create( path => $temp->filename );
+    my $index = Senna::Index->create({ path => $temp->filename });
     ok( $index );
     isa_ok( $index, "Senna::Index" );

lang/perl/Senna/trunk/t/index/02_open.t

@@ -1 +1 @@
 use strict;
-use Test::More (tests => 7);
+use Test::More (tests => 10);
 use File::Temp;
 
@@ -6 +6 @@
 {
     use_ok("Senna");
+    use_ok("Senna::Constants", qw(SEN_ENC_DEFAULT));
 }
 
 {
     my $temp  = File::Temp->new( UNLINK => 1 );
-    my $index = Senna::Index->create( path => $temp->filename );
+    my $index = Senna::Index->create({ path => $temp->filename });
     ok( $index );
     isa_ok( $index, "Senna::Index" );
     is( $index->path, $temp->filename );
+
+    my $info = $index->info;
+    ok($info);
+    is($info->flags, 0);
+
     ok( $index->close);
 

lang/perl/Senna/trunk/t/index/03_simple.t

@@ -20 +20 @@
 
 {
-    my $index = Senna::Index->create(
+    my $index = Senna::Index->create({
         path               => $temp->filename,
         key_size           => 0,
         initial_n_segments => 256,
         flags              => SEN_INDEX_MORPH_ANALYSE | SEN_INDEX_NORMALIZE
-    );
+    });
 
     open(my $fh, '<', $file) or