xspond-xapian-ruby 0.1.1 → 0.1.2

data/ext/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
-XAPIAN_RUBY_VERSION = '0.1.1'
+XAPIAN_RUBY_VERSION = '0.1.2'
 
 # Shamelessly borrowed from the RMagick project
 # Thanks!

data/ext/xapian_wrap.cc

@@ -824,6 +824,8 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 
 
 #include <ruby.h>
+#undef rb_intern
+
 
 /* Remove global macros defined in Ruby's win32.h */
 #ifdef write
@@ -2838,7 +2840,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/data/home/olly/tmp/xapian-svn-snapshot/tags/1.0.10/xapian/swig/Lib/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/data/home/olly/tmp/xapian-svn-snapshot/tags/1.0.16/xapian/swig/Lib/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2884,7 +2886,7 @@ SWIG_From_bool  (bool value)
 }
 
 
-/*@SWIG:/data/home/olly/tmp/xapian-svn-snapshot/tags/1.0.10/xapian/swig/Lib/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/data/home/olly/tmp/xapian-svn-snapshot/tags/1.0.16/xapian/swig/Lib/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2987,7 +2989,7 @@ struct timeval rb_time_timeval(VALUE);
  * Based on the php4 and python util.i files.
  *
  * Copyright (C) 2006 Networked Knowledge Systems, Inc.
- * Copyright (C) 2006,2007 Olly Betts
+ * Copyright (C) 2006,2007,2009 Olly Betts
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -3232,13 +3234,13 @@ SWIGINTERN bool Xapian_ValueIterator_equals(Xapian::ValueIterator const *self,Xa
 	    return (*self) == other;
 	}
 
-/*@SWIG:/data/home/olly/tmp/xapian-svn-snapshot/tags/1.0.10/xapian/swig/Lib/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/data/home/olly/tmp/xapian-svn-snapshot/tags/1.0.16/xapian/swig/Lib/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
   VALUE type = TYPE(obj);
   double *res = (double *)(args[1]);
-  *res = (type == T_FLOAT ? NUM2DBL(obj) : (type == T_FIXNUM ? (double) FIX2INT(obj) : rb_big2dbl(obj)));
+  *res = NUM2DBL(obj);
   return obj;
 }
 /*@SWIG@*/
@@ -20150,13 +20152,13 @@ _wrap_new_Query__SWIG_8(int argc, VALUE *argv, VALUE self) {
       SWIG_exception(SWIG_ValueError, "expected array of queries");
     }
     
-    int numitems = RARRAY(argv[1])->len;
+    int numitems = RARRAY_LEN(argv[1]);
     v2.reserve(numitems);
     for (int i = 0; i < numitems; ++i) {
       VALUE arrayEntry = rb_ary_entry(argv[1], i);
       if (TYPE(arrayEntry) == T_STRING) {
-        v2.push_back(Xapian::Query(string(RSTRING(arrayEntry)->ptr,
-              RSTRING(arrayEntry)->len)));
+        v2.push_back(Xapian::Query(string(RSTRING_PTR(arrayEntry),
+              RSTRING_LEN(arrayEntry))));
       }
       else {
         // array element may be a Xapian::Query object. Add it if it is,
@@ -20220,13 +20222,13 @@ _wrap_new_Query__SWIG_9(int argc, VALUE *argv, VALUE self) {
       SWIG_exception(SWIG_ValueError, "expected array of queries");
     }
     
-    int numitems = RARRAY(argv[1])->len;
+    int numitems = RARRAY_LEN(argv[1]);
     v2.reserve(numitems);
     for (int i = 0; i < numitems; ++i) {
       VALUE arrayEntry = rb_ary_entry(argv[1], i);
       if (TYPE(arrayEntry) == T_STRING) {
-        v2.push_back(Xapian::Query(string(RSTRING(arrayEntry)->ptr,
-              RSTRING(arrayEntry)->len)));
+        v2.push_back(Xapian::Query(string(RSTRING_PTR(arrayEntry),
+              RSTRING_LEN(arrayEntry))));
       }
       else {
         // array element may be a Xapian::Query object. Add it if it is,
@@ -25709,6 +25711,7 @@ SWIGEXPORT void Init__xapian(void) {
   rb_define_const(cQueryParser.klass, "FLAG_SYNONYM", SWIG_From_int(static_cast< int >(Xapian::QueryParser::FLAG_SYNONYM)));
   rb_define_const(cQueryParser.klass, "FLAG_AUTO_SYNONYMS", SWIG_From_int(static_cast< int >(Xapian::QueryParser::FLAG_AUTO_SYNONYMS)));
   rb_define_const(cQueryParser.klass, "FLAG_AUTO_MULTIWORD_SYNONYMS", SWIG_From_int(static_cast< int >(Xapian::QueryParser::FLAG_AUTO_MULTIWORD_SYNONYMS)));
+  rb_define_const(cQueryParser.klass, "FLAG_DEFAULT", SWIG_From_int(static_cast< int >(Xapian::QueryParser::FLAG_DEFAULT)));
   rb_define_const(cQueryParser.klass, "STEM_NONE", SWIG_From_int(static_cast< int >(Xapian::QueryParser::STEM_NONE)));
   rb_define_const(cQueryParser.klass, "STEM_SOME", SWIG_From_int(static_cast< int >(Xapian::QueryParser::STEM_SOME)));
   rb_define_const(cQueryParser.klass, "STEM_ALL", SWIG_From_int(static_cast< int >(Xapian::QueryParser::STEM_ALL)));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xspond-xapian-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - William Weidendorf
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-11 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - tests/smoketest.rb
 has_rdoc: true
 homepage: http://github.com/xspond/xapian-ruby
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -53,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Ruby bindings for xapian