gnista 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceb37e2f495af129a1626ca3cc184252378a2200
-  data.tar.gz: a61becb74a8c88c437e918c9ac5771fe3e06134e
+  metadata.gz: d47bb0cb81b09f7ec00ad3f9af92538158afcdec
+  data.tar.gz: 839bc1ef781bedc07e258da534cadde3629102b8
 SHA512:
-  metadata.gz: 76b51e8b8e8764535b94cb7c163519c6e6024e8a7d8cb165f23a73283e2bcf8994f11cf36fde211c922a924f88f0639a0c3be8fb7567b4d4ca7d50423bb02e1a
-  data.tar.gz: 60320d0666a4bd17a27290f2aebbf15eff3f2cac1909ec4f4bd9026dd20f5d65631107f9f968529a0d98c82bcedf1a5cf02e37b8fac1f0952a7063188ff91c42
+  metadata.gz: 0ac005d6a3316c3f2dfe7ec3d8f1eea9f3e57ca43d70f5fe3cc5aa92cd898c27bd84f81c0f6664bac07211af3a93cbec4df007b994d1fb91d2d374e7f018cb02
+  data.tar.gz: 528360e116b17fb6a4472c5f5ce850b0fed5eec588804cdaa17eb109be3eb11de1cfd8e5c0588ef4b2c5d3d913520a65847a322026b363c14e4553f76af344a8

data/HISTORY.md

@@ -1,3 +1,11 @@
+# Version 1.0.0
+
+Release date 2014-05-28
+
+### Fixed
+
+* SEGFAULT on close during iteration.
+
 # Version 0.0.5
 
 Release date 2014-03-26

data/ext/gnista/gnista.c

@@ -228,6 +228,10 @@ static VALUE method_logreader_each(VALUE self) {
 	instance_logreader *i_logreader = get_logreader(self);
 	check_open(i_logreader->open);
 
+	if (!rb_block_given_p()) {
+		return rb_funcall(self, rb_intern("to_enum"), 0);
+	}
+
 	returncode = sparkey_logiter_create(&logiter, i_logreader->logreader);
 
 	if (returncode != SPARKEY_SUCCESS) {
@@ -238,7 +242,7 @@ static VALUE method_logreader_each(VALUE self) {
 	VALUE del_sym = ID2SYM(rb_intern("delete"));
 	uint8_t *keybuf = malloc(sparkey_logreader_maxkeylen(i_logreader->logreader));
 	uint8_t *valuebuf = malloc(sparkey_logreader_maxvaluelen(i_logreader->logreader));
-	while (true) {
+	while (i_logreader->open) {
 		returncode = sparkey_logiter_next(logiter, i_logreader->logreader);
 
 		if (sparkey_logiter_state(logiter) != SPARKEY_ITER_ACTIVE) {
@@ -284,7 +288,9 @@ static VALUE method_logreader_each(VALUE self) {
 	free(valuebuf);
 	sparkey_logiter_close(&logiter);
 
-	return Qnil;
+	check_open(i_logreader->open);
+
+	return self;
 }
 
 static VALUE method_logreader_open(VALUE self) {
@@ -402,8 +408,12 @@ static VALUE method_hash_each(VALUE self) {
 	instance_hashreader *i_hashreader = get_hashreader(self);
 	sparkey_logiter *logiter;
 	check_open(i_hashreader->open);
-	sparkey_logreader *logreader = sparkey_hash_getreader(i_hashreader->hashreader);
 
+	if (!rb_block_given_p()) {
+		return rb_funcall(self, rb_intern("to_enum"), 0);
+	}
+
+	sparkey_logreader *logreader = sparkey_hash_getreader(i_hashreader->hashreader);
 	returncode = sparkey_logiter_create(&logiter, logreader);
 
 	if (returncode != SPARKEY_SUCCESS) {
@@ -412,7 +422,7 @@ static VALUE method_hash_each(VALUE self) {
 
 	uint8_t *keybuf = malloc(sparkey_logreader_maxkeylen(logreader));
 	uint8_t *valuebuf = malloc(sparkey_logreader_maxvaluelen(logreader));
-	while (true) {
+	while (i_hashreader->open) {
 		returncode = sparkey_logiter_hashnext(logiter, i_hashreader->hashreader);
 
 		if (sparkey_logiter_state(logiter) != SPARKEY_ITER_ACTIVE) {
@@ -448,14 +458,15 @@ static VALUE method_hash_each(VALUE self) {
 		}
 
 		rb_yield_values(2, rb_str_new((char *)keybuf, actual_keylen), rb_str_new((char *)valuebuf, actual_valuelen));
-
 	}
 
 	free(keybuf);
 	free(valuebuf);
 	sparkey_logiter_close(&logiter);
 
-	return Qnil;
+	check_open(i_hashreader->open);
+
+	return self;
 }
 
 static VALUE method_hash_get(VALUE self, VALUE key) {

data/lib/gnista/version.rb

@@ -1,3 +1,3 @@
 module Gnista
-  VERSION = "0.0.5"
+  VERSION = "1.0.0"
 end

data/test/test_commands.rb

@@ -36,10 +36,10 @@ describe Gnista do
     @logwriter.delete "key2"
     @logwriter.flush
 
-    lograder = Gnista::Logreader.new log_path
+    logreader = Gnista::Logreader.new log_path
 
     a = true
-    lograder.each do |key,value,type|
+    logreader.each do |key,value,type|
       if a
         key.must_equal "key1"
         value.must_equal "value1"
@@ -54,7 +54,31 @@ describe Gnista do
 
     a.must_equal false
 
-    lograder.close
+    assert_raises GnistaException do
+      logreader.each do
+        logreader.close
+      end
+    end
+  end
+
+  it "can iterate each log with an enumerator" do
+    @logwriter.put "key1", "value1"
+    @logwriter.delete "key2"
+    @logwriter.flush
+
+    logreader = Gnista::Logreader.new log_path
+
+    iter = logreader.each
+    iter.next.must_equal ["key1", "value1", :put]
+    iter.next.must_equal ["key2", nil, :delete]
+
+    iter = logreader.each
+    iter.next.must_equal ["key1", "value1", :put]
+    logreader.close
+
+    assert_raises GnistaException do
+      iter.next.must_equal ["key2", nil, :delete]
+    end
   end
 
   it "can read hash max key/value length" do
@@ -92,7 +116,35 @@ describe Gnista do
 
     a.must_equal false
 
+    assert_raises GnistaException do
+      hash.each do
+        hash.close
+      end
+    end
+
+    FileUtils.rm hash_path
+  end
+
+  it "can iterate each hash with an enumerator" do
+    @logwriter.put "key1", "value1"
+    @logwriter.put "key2", "value2"
+    @logwriter.flush
+    Gnista::Hash.write hash_path, log_path
+
+    hash = Gnista::Hash.new hash_path, log_path
+
+    iter = hash.each
+    iter.next.must_equal ["key1", "value1"]
+    iter.next.must_equal ["key2", "value2"]
+
+    iter = hash.each
+    iter.next.must_equal ["key1", "value1"]
     hash.close
+
+    assert_raises GnistaException do
+      iter.next.must_equal ["key2", "value2"]
+    end
+
     FileUtils.rm hash_path
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnista
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Emanuel Andersson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler