libcdb-ruby 0.0.2-x86-mingw32 → 0.0.3-x86-mingw32

data/ChangeLog

@@ -1,5 +1,10 @@
 = Revision history for libcdb-ruby
 
+== 0.0.3 [2012-04-02]
+
+* Fixed linking error on Mac OS X. (Issue #1 reported by minaguib)
+* Some internal refactoring.
+
 == 0.0.2 [2012-01-20]
 
 * Refactored C code to DRY.

data/ext/libcdb/libcdb.c

@@ -1,10 +1,9 @@
 #include "ruby_libcdb.h"
 
+VALUE mLibCDB;
+
 void
 Init_libcdb_ruby(void) {
-  char libcdb_version[8];
-  snprintf(libcdb_version, 7, "%g", TINYCDB_VERSION);
-
   /*
    * LibCDB namespace.
    */

data/ext/libcdb/ruby_cdb.c

@@ -1,5 +1,7 @@
 #include "ruby_libcdb.h"
 
+VALUE cCDB;
+
 void
 rcdb_init_cdb(void) {
   char libcdb_version[8];

data/ext/libcdb/ruby_cdb.h

@@ -7,24 +7,23 @@
 #define RCDB_GET_FD(fptr) fileno((fptr)->f)
 #endif
 
-#define RCDB_GET_STRUCT(what, _struct, obj, ptr) {\
+#define RCDB_GET_STRUCT(what, _struct, obj, ptr) \
   if (RTEST(rcdb_##what##er_closed_p(obj))) {\
     rb_raise(rb_eIOError, "closed stream");\
   }\
   else {\
     Data_Get_Struct((obj), struct _struct, (ptr));\
   }\
-}
 
 #define RCDB_DEFINE_ALLOC(what, _struct) \
 static void \
 rcdb_##what##er_free(void *ptr) {\
-  free(ptr);\
+  xfree(ptr);\
 }\
 \
 static VALUE \
 rcdb_##what##er_alloc(VALUE klass) {\
-  struct _struct *ptr = ALLOC_N(struct _struct, 1);\
+  struct _struct *ptr = ALLOC(struct _struct);\
   return Data_Wrap_Struct(klass, NULL, rcdb_##what##er_free, ptr);\
 }
 
@@ -45,6 +44,17 @@ rcdb_##what##er_alloc(VALUE klass) {\
     rb_sys_fail(0);\
   }
 
+#define RCDB_RAISE_ARGS(min, max) \
+  rb_raise(rb_eArgError,\
+    "wrong number of arguments (%d for " #min "-" #max ")", argc);
+
+#define RCDB_RETURN_ENUMERATOR(self, argc, argv, max) \
+  if (argc > max) {\
+    RCDB_RAISE_ARGS(0, max)\
+  }\
+\
+  RETURN_ENUMERATOR(self, argc, argv)
+
 #define RCDB_DEFINE_INSPECT(what) \
 static VALUE \
 rcdb_##what##er_inspect(VALUE self) {\
@@ -58,7 +68,7 @@ rcdb_##what##er_inspect(VALUE self) {\
   return str;\
 }
 
-VALUE cCDB;
+extern VALUE cCDB;
 void rcdb_init_cdb(void);
 
 #endif  /* __RUBY_CDB_H__ */

data/ext/libcdb/ruby_cdb_reader.c

@@ -1,5 +1,7 @@
 #include "ruby_libcdb.h"
 
+VALUE cCDBReader;
+
 RCDB_DEFINE_ALLOC(read, cdb)
 
 /*
@@ -62,23 +64,13 @@ _rcdb_reader_iter_aset(VALUE pair, VALUE hash) {
 /* Helper method */
 static VALUE
 _rcdb_reader_break_equal(VALUE val, VALUE ary) {
-  if (RCDB_READER_EQUAL(val)) {
-    rb_ary_store(ary, 0, Qtrue);
-    rb_iter_break();
-  }
-
-  return Qnil;
+  RCDB_READER_BREAK_EQUAL(val, Qtrue)
 }
 
 /* Helper method */
 static VALUE
 _rcdb_reader_break_equal2(VALUE pair, VALUE ary) {
-  if (RCDB_READER_EQUAL(rb_ary_entry(pair, 1))) {
-    rb_ary_store(ary, 0, rb_ary_entry(pair, 0));
-    rb_iter_break();
-  }
-
-  return Qnil;
+  RCDB_READER_BREAK_EQUAL(rb_ary_entry(pair, 1), rb_ary_entry(pair, 0))
 }
 
 /* Helper method */
@@ -92,8 +84,8 @@ _rcdb_reader_break_shift(VALUE val, VALUE ary) {
 
 /* Helper method */
 static VALUE
-_rcdb_reader_iter_inc(VALUE val, VALUE ary) {
-  rb_ary_store(ary, 0, rb_funcall(rb_ary_entry(ary, 0), rb_intern("succ"), 0));
+_rcdb_reader_iter_inc(VALUE val, long *i) {
+  ++*i;
   return Qnil;
 }
 
@@ -157,12 +149,7 @@ rcdb_reader_each(int argc, VALUE *argv, VALUE self) {
   unsigned cdbp;
   VALUE key;
 
-  if (argc > 1) {
-    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0-1)", argc);
-  }
-
-  RETURN_ENUMERATOR(self, argc, argv);
-
+  RCDB_RETURN_ENUMERATOR(self, argc, argv, 1);
   RCDB_READER_GET(self, cdb);
 
   if (rb_scan_args(argc, argv, "01", &key) == 1 && !NIL_P(key)) {
@@ -203,11 +190,7 @@ rcdb_reader_each_dump(int argc, VALUE *argv, VALUE self) {
   VALUE key, args = rb_ary_new3(1, self), ary = rb_ary_new();
   VALUE (*block)(ANYARGS) = _rcdb_reader_yield_dump;
 
-  if (argc > 1) {
-    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0-1)", argc);
-  }
-
-  RETURN_ENUMERATOR(self, argc, argv);
+  RCDB_RETURN_ENUMERATOR(self, argc, argv, 1);
 
   if (rb_scan_args(argc, argv, "01", &key) == 1 && !NIL_P(key)) {
     rb_ary_push(ary,  key);
@@ -438,8 +421,9 @@ rcdb_reader_empty_p(VALUE self) {
  */
 static VALUE
 rcdb_reader_size(VALUE self) {
-  RCDB_READER_ITERATE_ARY(each_key, iter_inc,
-    rb_ary_new3(1, INT2FIX(0)))
+  long i = 0;
+  RCDB_READER_ITERATE1(each_key, iter_inc, (VALUE)&i)
+  return LONG2NUM(i);
 }
 
 /*
@@ -458,7 +442,7 @@ rcdb_reader_total(VALUE self) {
   cdb_seqinit(&cdbp, cdb);
 
   while (cdb_seqnext(&cdbp, cdb) > 0) {
-    i++;
+    ++i;
   }
 
   return LONG2NUM(i);

data/ext/libcdb/ruby_cdb_reader.h

@@ -26,8 +26,13 @@ _rcdb_reader_call_##iter(VALUE args) {\
   RCDB_READER_ITERATE1(method, block, arg1)\
   return rb_ary_entry(arg, 0);
 
-#define RCDB_READER_EQUAL(val) \
-  RTEST(rb_funcall((val), rb_intern("=="), 1, rb_ary_entry(ary, 1)))
+#define RCDB_READER_BREAK_EQUAL(val, ret) \
+  if (RTEST(rb_funcall(val, rb_intern("=="), 1, rb_ary_entry(ary, 1)))) {\
+    rb_ary_store(ary, 0, ret);\
+    rb_iter_break();\
+  }\
+\
+  return Qnil;
 
 #define RCDB_READER_DEFINE_READ(what) \
 static VALUE \
@@ -44,7 +49,7 @@ _rcdb_reader_read_##what(struct cdb *cdb) {\
   return ret;\
 }
 
-VALUE cCDBReader;
+extern VALUE cCDBReader;
 void rcdb_init_reader(void);
 
 #endif /* __RCDB_READER_H__ */

data/ext/libcdb/ruby_cdb_writer.c

@@ -1,5 +1,7 @@
 #include "ruby_libcdb.h"
 
+VALUE cCDBWriter;
+
 RCDB_DEFINE_ALLOC(writ, cdb_make)
 
 /*
@@ -154,7 +156,7 @@ rcdb_writer_put(int argc, VALUE *argv, VALUE self, enum cdb_put_mode mode) {
       rcdb_writer_put_value(cdbm, argv[0], argv[1], mode);
       break;
     default:
-      rb_raise(rb_eArgError, "wrong number of arguments (%d for 1-2)", argc);
+      RCDB_RAISE_ARGS(1, 2)
       break;
   }
 

data/ext/libcdb/ruby_cdb_writer.h

@@ -3,7 +3,7 @@
 
 #define RCDB_WRITER_GET(obj, ptr) RCDB_GET_STRUCT(writ, cdb_make, obj, ptr)
 
-VALUE cCDBWriter;
+extern VALUE cCDBWriter;
 void rcdb_init_writer(void);
 
 #endif  /* __RCDB_WRITER_H__ */

data/ext/libcdb/ruby_libcdb.h

@@ -22,6 +22,6 @@
 #include "ruby_cdb_reader.h"
 #include "ruby_cdb_writer.h"
 
-VALUE mLibCDB;
+extern VALUE mLibCDB;
 
 #endif  /* __RUBY_LIBCDB_H__ */

data/lib/libcdb/version.rb

@@ -6,7 +6,7 @@ module LibCDB
 
       MAJOR = 0
       MINOR = 0
-      TINY  = 2
+      TINY  = 3
 
       class << self
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libcdb-ruby
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: x86-mingw32
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 Z
+date: 2012-04-02 00:00:00 Z
 dependencies: []
 
 description: Ruby bindings for CDB Constant Databases.
@@ -65,11 +65,11 @@ post_install_message:
 rdoc_options: 
 - --main
 - README
-- --all
 - --charset
 - UTF-8
 - --title
-- libcdb-ruby Application documentation (v0.0.2)
+- libcdb-ruby Application documentation (v0.0.3)
+- --all
 - --line-numbers
 require_paths: 
 - lib
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for CDB Constant Databases.