lmdb 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65d2930d0d2e7812f17f527cec9e28227ff86d3
-  data.tar.gz: 9b1be0c534d29babf1ecfb665bc0a93f1cadc158
+  metadata.gz: c192851303ba3bd76a139142c94322233284d3ed
+  data.tar.gz: b9482f90f6599d71f49989246fe9f2c526f47986
 SHA512:
-  metadata.gz: 79f1fa24f25e0c3dc0971df47ed6eea2d5f2e388a244f6354586c1a15c0cd9934ff302391a7a51b46f50534ddeb5c1b126e842ffb6e59773967e5e5ef49e35dd
-  data.tar.gz: 29a36534234f8da14bce75b157add7d4f259e94addf60e32a2faaf2edf4f84d168580e85090803d4eb16bf095a05c5546c6ea172835ba0d2098305d78d02c4cd
+  metadata.gz: e8fa0b74c2854ebd13ba07663ee65be141cefe08ae55075f6fd8817c805e21f48d32c886d687f4e85334958bfa1d9f39935a9764d343755dec3adbd7b3d67b08
+  data.tar.gz: c760928ef6d4fb1edb6a5a5d5432b9a8823af38e12457efaef74640aef3b7a6e7956bd258cf22b68c54a89136742fc48329c78ac0ce9db2bbfa1b135d8dd3a8a

data/.travis.yml

@@ -6,3 +6,9 @@ rvm:
   - ruby-head
   - rbx-18mode
   - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: 1.8.7
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode

data/CHANGES

@@ -1,3 +1,7 @@
+0.3.1
+
+  * Minor fixes
+
 0.3.0
 
   * Higher level API improved and stabilized

data/README.md

@@ -13,7 +13,27 @@ gem install lmdb
 
 ### API
 
-For now take a look at the specs.
+~~~ ruby
+require 'lmdb'
+
+env = LMDB.new(path)
+
+maindb = env.database
+subdb = env.database('subdb', create: true)
+
+maindb['key'] = 'value'
+
+env.transaction do
+  maindb['key'] = 'value'
+  subdb['key'] = 'value'
+end
+
+env.close
+~~~
+
+For details take a look at the specs. If you want to have a simpler interface
+to LMDB databases please consider using [Moneta](https://github.com/minad/moneta).
+The Moneta gem provides an LMDB adapter which uses this gem.
 
 ### Licence (MIT)
 

data/Rakefile

@@ -2,13 +2,9 @@
 
 require 'bundler/setup'
 require 'rspec/core/rake_task'
-require "rake/extensiontask"
+require 'rake/extensiontask'
 
-# Install spec tasks
 RSpec::Core::RakeTask.new :spec
+Rake::ExtensionTask.new :lmdb_ext
 
-# Install compile task
-Rake::ExtensionTask.new('lmdb_ext')
-
-desc 'Default: compile & run specs.'
-task default: [:compile, :spec]
+task :default => [:compile, :spec]

data/ext/lmdb_ext/extconf.rb

@@ -3,24 +3,20 @@ require 'mkmf'
 $CFLAGS = '-std=c99 -Wall -g'
 
 # Embed lmdb if we cannot find it
-def have_lmbd
-  find_header('lmdb.h') && have_library('lmdb', 'mdb_env_create')
-end
-
-if enable_config("bundled-lmdb", false) || !have_lmbd
-  $VPATH << "$(srcdir)/liblmdb"
+if enable_config("bundled-lmdb", false) || !(find_header('lmdb.h') && have_library('lmdb', 'mdb_env_create'))
   $INCFLAGS << " -I$(srcdir)/liblmdb"
+  $VPATH << "$(srcdir)/liblmdb"
   $srcs = Dir.glob("#{$srcdir}/{,liblmdb/}*.c").map {|n| File.basename(n) }
+end
 
-  have_header 'limits.h'
-  have_header 'string.h'
-  have_header 'stdlib.h'
-  have_header 'errno.h'
-  have_header 'sys/types.h'
-  have_header 'assert.h'
+have_header 'limits.h'
+have_header 'string.h'
+have_header 'stdlib.h'
+have_header 'errno.h'
+have_header 'sys/types.h'
+have_header 'assert.h'
 
-  have_header 'ruby.h'
-  find_header 'lmdb.h'
-end
+have_header 'ruby.h'
+have_func 'rb_funcall_passing_block'
 
 create_makefile('lmdb_ext')

data/ext/lmdb_ext/liblmdb/lmdb.h

@@ -180,7 +180,7 @@ typedef int mdb_filehandle_t;
 	MDB_VERINT(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH)
 
 /** The release date of this library version */
-#define MDB_VERSION_DATE	"August 29, 2013"
+#define MDB_VERSION_DATE	"September 9, 2013"
 
 /** A stringifier for the version info */
 #define MDB_VERSTR(a,b,c,d)	"MDB " #a "." #b "." #c ": (" d ")"

data/ext/lmdb_ext/liblmdb/mdb.c

@@ -5231,9 +5231,10 @@ mdb_cursor_set(MDB_cursor *mc, MDB_val *key, MDB_val *data,
 		if (!mc->mc_top) {
 			/* There are no other pages */
 			mc->mc_ki[mc->mc_top] = 0;
-			if (op == MDB_SET_RANGE)
+			if (op == MDB_SET_RANGE) {
+				rc = 0;
 				goto set1;
-			else 
+			} else
 				return MDB_NOTFOUND;
 		}
 	}
@@ -5298,6 +5299,7 @@ set1:
 			if (rc) {
 				if (op == MDB_GET_BOTH || rc > 0)
 					return MDB_NOTFOUND;
+				rc = 0;
 			}
 
 		} else {
@@ -7248,8 +7250,11 @@ mdb_rebalance(MDB_cursor *mc)
 	else {
 		if (mc->mc_ki[ptop] == 0)
 			rc = mdb_page_merge(&mn, mc);
-		else
+		else {
+			mn.mc_ki[mn.mc_top] += mc->mc_ki[mn.mc_top] + 1;
 			rc = mdb_page_merge(mc, &mn);
+			mdb_cursor_copy(&mn, mc);
+		}
 		mc->mc_flags &= ~(C_INITIALIZED|C_EOF);
 	}
 	return rc;

data/ext/lmdb_ext/lmdb_ext.c

@@ -84,10 +84,17 @@ static void transaction_finish(VALUE self, int commit) {
         check(ret);
 }
 
+// Ruby 1.8.7 compatibility
+#ifndef HAVE_RB_FUNCALL_PASSING_BLOCK
+static VALUE call_with_transaction_helper(VALUE arg) {
+        #error "Not implemented"
+}
+#else
 static VALUE call_with_transaction_helper(VALUE arg) {
         HelperArgs* a = (HelperArgs*)arg;
         return rb_funcall_passing_block(a->self, rb_intern(a->name), a->argc, a->argv);
 }
+#endif
 
 static VALUE call_with_transaction(VALUE venv, VALUE self, const char* name, int argc, const VALUE* argv, int flags) {
         HelperArgs arg = { self, name, argc, argv };

data/ext/lmdb_ext/lmdb_ext.h

@@ -4,6 +4,26 @@
 #include "ruby.h"
 #include "lmdb.h"
 
+// Ruby 1.8 compatibility
+#ifndef SIZET2NUM
+#  if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
+#   define SIZET2NUM(v) ULL2NUM(v)
+#  elif SIZEOF_SIZE_T == SIZEOF_LONG
+#   define SIZET2NUM(v) ULONG2NUM(v)
+#  else
+#   define SIZET2NUM(v) UINT2NUM(v)
+#  endif
+#endif
+
+// Ruby 1.8 compatibility
+#ifndef NUM2SSIZET
+#  if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG
+#   define NUM2SSIZET(x) ((ssize_t)NUM2LL(x))
+#else
+#   define NUM2SSIZET(x) NUM2LONG(x)
+#  endif
+#endif
+
 #define ENVIRONMENT(var, var_env)                       \
         Environment* var_env;                           \
         Data_Get_Struct(var, Environment, var_env);     \
@@ -22,8 +42,6 @@
         Data_Get_Struct(var, Cursor, var_cur);  \
         cursor_check(var_cur)
 
-typedef struct Transaction Transaction;
-
 typedef struct Transaction {
         VALUE    env;
         VALUE    parent;

data/lib/lmdb/version.rb

@@ -1,3 +1,3 @@
 module LMDB
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lmdb.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary     = 'Ruby bindings to Lightning MDB'
   s.email       = 'mail@daniel-mendler.de'
   s.homepage    = 'https://github.com/minad/lmdb'
-  s.description = 'imdb is a Ruby binding to OpenLDAP Lightning MDB.'
+  s.description = 'lmdb is a Ruby binding to OpenLDAP Lightning MDB.'
   s.authors     = ['Daniel Mendler']
   s.extensions  = Dir['ext/**/extconf.rb']
 
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rake-compiler'
+  s.add_development_dependency 'rake-compiler', '<=0.8.2'
   s.add_development_dependency 'rspec'
 end

data/spec/helper.rb

@@ -17,7 +17,7 @@ module LMDB::SpecHelper
   end
 
   def env
-    @env ||= LMDB::Environment.new path: path
+    @env ||= LMDB::Environment.new :path => path
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmdb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Daniel Mendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,16 +28,16 @@ dependencies:
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: imdb is a Ruby binding to OpenLDAP Lightning MDB.
+description: lmdb is a Ruby binding to OpenLDAP Lightning MDB.
 email: mail@daniel-mendler.de
 executables: []
 extensions: