actsasflinn-ruby-tokyotyrant 0.1.7 → 0.1.8

data/Rakefile

@@ -20,7 +20,7 @@ CLEAN.include('pkg', 'tmp')
 
 gemspec = Gem::Specification.new do |s|
   s.name = 'ruby-tokyotyrant'
-  s.version = '0.1.7'
+  s.version = '0.1.8'
   s.authors = [ 'Flinn' ]
   s.email = 'flinn@actsasflinn.com'
   s.homepage = 'http://github.com/actsasflinn/ruby-tokyotyrant/'
@@ -34,7 +34,7 @@ gemspec = Gem::Specification.new do |s|
   s.files = ['COPYING',
              'Rakefile',
              'README.rdoc'] +
-             Dir['ext/**/*'] +
+             Dir['ext/**/*.[rb|c|h]'] +
              Dir['spec/**/*'] +
              Dir['benchmarks/**/*']
   s.extensions << "ext/extconf.rb"

data/ext/tokyo_tyrant_query.c

@@ -24,7 +24,7 @@ static VALUE cQuery_addcond(VALUE vself, VALUE vname, VALUE vop, VALUE vexpr){
 
   if (TYPE(vop) == T_STRING){
     vop = StringValueEx(vop);
-    vop = tctdbqrystrtocondop(RSTRING_PTR(toupper(vop)));
+    vop = tctdbqrystrtocondop(RSTRING_PTR(vop));
     vop = INT2NUM(vop);
   }
 
@@ -34,22 +34,35 @@ static VALUE cQuery_addcond(VALUE vself, VALUE vname, VALUE vop, VALUE vexpr){
   return vself;
 }
 
-static VALUE cQuery_setorder(VALUE vself, VALUE vname, VALUE vtype){
+static VALUE cQuery_setorder(int argc, VALUE *argv, VALUE vself){
+  VALUE vname, vtype;
+  int type;
   VALUE vqry;
   RDBQRY *qry;
-  vname = StringValueEx(vname);
 
-  if (TYPE(vtype) == T_SYMBOL) vtype = rb_str_new2(rb_id2name(SYM2ID(vtype)));
+  rb_scan_args(argc, argv, "11", &vname, &vtype);
+  if(NIL_P(vtype)) vtype = INT2NUM(RDBQOSTRASC);
+
+  vname = StringValueEx(vname);
 
-  if (TYPE(vtype) == T_STRING){
-    vtype = StringValueEx(vtype);
-    vtype = tctdbqrystrtoordertype(RSTRING_PTR(toupper(vtype)));
-    vtype = INT2NUM(vtype);
+  switch(TYPE(vtype)){
+    case T_SYMBOL:
+      vtype = rb_str_new2(rb_id2name(SYM2ID(vtype)));
+    case T_STRING:
+      vtype = StringValueEx(vtype);
+      type = tctdbqrystrtoordertype(RSTRING_PTR(vtype));
+      break;
+    case T_FIXNUM:
+      type = NUM2INT(vtype);
+      break;
+    default:
+      rb_raise(rb_eArgError, "type must be symbol, string or integer");
+      break;
   }
 
   vqry = rb_iv_get(vself, RDBQRYVNDATA);
   Data_Get_Struct(vqry, RDBQRY, qry);
-  tcrdbqrysetorder(qry, RSTRING_PTR(vname), NUM2INT(vtype));
+  tcrdbqrysetorder(qry, RSTRING_PTR(vname), type);
   return vself;
 }
 
@@ -158,7 +171,7 @@ void init_query(){
   rb_define_alias(cQuery, "add_condition", "addcond");
   rb_define_alias(cQuery, "condition", "addcond");
   rb_define_alias(cQuery, "add", "addcond");                    // Rufus Compat
-  rb_define_method(cQuery, "setorder", cQuery_setorder, 2);
+  rb_define_method(cQuery, "setorder", cQuery_setorder, -1);
   rb_define_alias(cQuery, "order_by", "setorder");              // Rufus Compat
   rb_define_method(cQuery, "setlimit", cQuery_setlimit, -1);
   rb_define_alias(cQuery, "setmax", "setlimit");                 // Rufus Compat

data/ext/tokyo_tyrant_table.c

@@ -165,7 +165,7 @@ static VALUE cTable_setindex(VALUE vself, VALUE vname, VALUE vtype){
 
   if (TYPE(vtype) == T_STRING){
     vtype = StringValueEx(vtype);
-    vtype = tctdbstrtoindextype(RSTRING_PTR(toupper(vtype)));
+    vtype = tctdbstrtoindextype(RSTRING_PTR(vtype));
     vtype = INT2NUM(vtype);
   }
 

data/spec/tokyo_tyrant_query_spec.rb

@@ -26,6 +26,13 @@ describe TokyoTyrant::Query, "with an open database" do
     end
   end
 
+  it "should get ordered keys for search conditions with default order" do
+    q = @db.query
+    q.addcond(:type, :streq, 'Spinach')
+    q.setorder(:variety)
+    q.search.should == ["3332", "34173"]
+  end
+
   it "should get ordered keys for search conditions with ascending order" do
     q = @db.query
     q.addcond('type', :streq, 'Spinach')
@@ -36,7 +43,7 @@ describe TokyoTyrant::Query, "with an open database" do
   it "should get ordered keys for search conditions with decending order" do
     q = @db.query
     q.addcond('type', :streq, 'Spinach')
-    q.order_by('variety', :strdesc)
+    q.order_by('variety', :StrDesc)
     q.search.should == ["34173", "3332"]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: actsasflinn-ruby-tokyotyrant
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Flinn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -07:00
+date: 2009-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: []