libcdb-ruby 0.0.3 → 0.0.4

data/ChangeLog

@@ -1,5 +1,10 @@
 = Revision history for libcdb-ruby
 
+== 0.0.4 [2012-08-09]
+
+* Fixed writing with Ruby 1.9.3 on Windows.
+* Fixed leaking CDB pointer when closing reader.
+
 == 0.0.3 [2012-04-02]
 
 * Fixed linking error on Mac OS X. (Issue #1 reported by minaguib)

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to libcdb-ruby version 0.0.2
+This documentation refers to libcdb-ruby version 0.0.4
 
 
 == DESCRIPTION
@@ -63,9 +63,10 @@ creating and reading {constant databases}[http://cr.yp.to/cdb.html].
 == PREREQUISITES
 
 <b></b>
-* Ruby 1.8.7+ or 1.9+ (see below for details)
-* TinyCDB[http://corpit.ru/mjt/tinycdb.html] headers (not
-  needed when installing the fat binary gem on Windows)
+* Ruby 1.8.7+ or 1.9+ (see {below}[rdoc-label:label-SUPPORTED+PLATFORMS]
+  for details)
+* TinyCDB[http://corpit.ru/mjt/tinycdb.html] headers (not needed when
+  installing the fat binary gem on Windows)
 
   Debian/Ubuntu:: +libcdb-dev+
   Fedora/SuSE::   +tinycdb-devel+
@@ -75,8 +76,8 @@ creating and reading {constant databases}[http://cr.yp.to/cdb.html].
 == SUPPORTED PLATFORMS
 
 <b></b>
-Linux::   1.8 & 1.9 (Tested on Ubuntu with 1.8.7p302 and 1.9.3p19)
-Windows:: 1.9 only (Tested on XP with 1.9.3p0)
+Linux::   1.8 & 1.9 (Tested on Ubuntu with 1.8.7p361, 1.9.2p320 and 1.9.3p195)
+Windows:: 1.9 only (Tested on XP with 1.9.2p290 and 1.9.3p194)
 
 
 == LINKS

data/ext/libcdb/ruby_cdb_reader.c

@@ -503,6 +503,7 @@ rcdb_reader_close(VALUE self) {
   RCDB_READER_GET(self, cdb);
   rb_iv_set(self, "closed", Qtrue);
 
+  cdb_free(cdb);
   rb_io_close(rb_iv_get(self, "@io"));
 
   return Qnil;

data/ext/libcdb/ruby_cdb_writer.c

@@ -77,8 +77,8 @@ rcdb_writer_put_value(struct cdb_make *cdbm, VALUE key, VALUE val, enum cdb_put_
         case CDB_PUT_INSERT:
           /* see if key already exists */
           switch (cdb_make_exists(cdbm,
-                RSTRING_PTR(key),
-                RSTRING_LEN(key))) {
+                    RSTRING_PTR(key),
+                    RSTRING_LEN(key))) {
             case 0:
               /* doesn't exist, add all */
               mode = CDB_PUT_ADD;

data/lib/libcdb/version.rb

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

data/lib/libcdb.rb

@@ -13,8 +13,8 @@ module LibCDB
 
     extend Forwardable
 
-    MODE_READ  = 'r'  # :nodoc:
-    MODE_WRITE = 'w'  # :nodoc:
+    MODE_READ  = 'r'.freeze  # :nodoc:
+    MODE_WRITE = 'w'.freeze  # :nodoc:
 
     class << self
 
@@ -32,20 +32,12 @@ module LibCDB
       # <tt>r+</tt>:: CDB (initially opened for reading)
       # <tt>w+</tt>:: CDB (initially opened for writing)
       def open(path, mode = MODE_READ)
-        klass, args = self, []
-
-        case mode
-          when 'r+'       then args = [mode = MODE_READ]
-          when 'w+'       then args = [       MODE_WRITE]
-          when MODE_READ  then klass        = Reader
-          when MODE_WRITE then klass,  mode = Writer, 'w+'
-          else raise ArgumentError, "illegal access mode #{mode}"
-        end
+        klass, args = _open_args(path, mode)
 
         cdb = begin
-          klass.new(io = File.open(path, mode), *args)
+          klass.new(*args)
         rescue
-          io.close if io
+          args.first.close
           raise
         end
 
@@ -86,6 +78,22 @@ module LibCDB
         }
       end
 
+      private
+
+      def _open_args(path, mode)
+        klass, args = self, []
+
+        case mode
+          when 'r+'       then args = [mode = MODE_READ]
+          when 'w+'       then args = [       MODE_WRITE]
+          when MODE_READ  then klass        = Reader
+          when MODE_WRITE then klass,  mode = Writer, 'w+'
+          else raise ArgumentError, "illegal access mode #{mode.inspect}"
+        end
+
+        [klass, args.unshift(File.open(path, mode + 'b'))]
+      end
+
     end
 
     # call-seq:
@@ -102,7 +110,7 @@ module LibCDB
       case mode
         when MODE_READ  then open_read
         when MODE_WRITE then open_write
-        else raise ArgumentError, "illegal access mode #{mode}"
+        else raise ArgumentError, "illegal access mode #{mode.inspect}"
       end
     end
 
@@ -248,7 +256,7 @@ module LibCDB
       @mode = new_mode
       new_mode += '+' if new_mode == MODE_WRITE
 
-      io.reopen(io.path, new_mode)
+      io.reopen(io.path, new_mode + 'b')
     end
 
   end

metadata

@@ -1,30 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: libcdb-ruby
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-02 00:00:00 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies: []
-
 description: Ruby bindings for CDB Constant Databases.
 email: jens.wille@uni-koeln.de
 executables: []
-
-extensions: 
+extensions:
 - ext/libcdb/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - COPYING
 - ChangeLog
@@ -32,69 +24,60 @@ extra_rdoc_files:
 - ext/libcdb/ruby_cdb.c
 - ext/libcdb/ruby_cdb_reader.c
 - ext/libcdb/ruby_cdb_writer.c
-files: 
+files:
 - lib/libcdb-ruby.rb
-- lib/libcdb/version.rb
 - lib/cdb.rb
+- lib/libcdb/version.rb
 - lib/libcdb.rb
-- ChangeLog
 - COPYING
-- README
-- Rakefile
 - TODO
-- ext/libcdb/ruby_cdb_writer.h
-- ext/libcdb/ruby_cdb.c
-- ext/libcdb/ruby_libcdb.h
-- ext/libcdb/ruby_cdb_reader.c
-- ext/libcdb/ruby_cdb.h
+- ChangeLog
+- Rakefile
+- README
 - ext/libcdb/ruby_cdb_writer.c
+- ext/libcdb/ruby_cdb.h
+- ext/libcdb/libcdb_ruby.def
 - ext/libcdb/extconf.rb
+- ext/libcdb/ruby_cdb_writer.h
+- ext/libcdb/ruby_libcdb.h
 - ext/libcdb/ruby_cdb_reader.h
 - ext/libcdb/libcdb.c
-- ext/libcdb/libcdb_ruby.def
-- spec/libcdb/writer_spec.rb
-- spec/libcdb/reader_spec.rb
+- ext/libcdb/ruby_cdb_reader.c
+- ext/libcdb/ruby_cdb.c
 - spec/spec_helper.rb
+- spec/libcdb/reader_spec.rb
+- spec/libcdb/writer_spec.rb
 - .rspec
 homepage: http://github.com/blackwinter/libcdb-ruby
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --main
-- README
+rdoc_options:
 - --charset
 - UTF-8
-- --title
-- libcdb-ruby Application documentation (v0.0.3)
-- --all
 - --line-numbers
-require_paths: 
+- --all
+- --title
+- libcdb-ruby Application documentation (v0.0.4)
+- --main
+- README
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for CDB Constant Databases.
 test_files: []
-