chunkio 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 139f7e476d3ecb148f675198f0affafc0920f9cbc4ea9b2e5cb3b3b1e9ef6cd5
-  data.tar.gz: 9e878c73d0cf18becd1167b5b86f8b29f25b4ca20047d30ad00a242b28ee9733
+  metadata.gz: 460315c74fc22187a8a9256c91bc84e51f10f965bf3b8099afed88cbff4b34ee
+  data.tar.gz: 7a835dbbf371b8fbab4e60005807f03cb231f7a0f279c59539dbc36135170d4a
 SHA512:
-  metadata.gz: 7d3569ba99d80cd2f9ccae8d945479e22ec3edca7782f361ed5c2d3e08b0a63cd709c31407ac7b1469918e32c3ffd3c5e4201cd6ba2652cc0800e44be5465f72
-  data.tar.gz: c2018918a915bdd90615dd1276d51cf607aa2b6749b2f9017e8c31b0a2fd415a16712a9e7c57ba647fc38d0600a929fdf7a3126b298833e53761b550640583ee
+  metadata.gz: 147c6a423b0cd1ba99d8e2449516aa28fa0b8419a5781f0f68a95e9cebbaccf5b7260fe9d1b0d983af5e5b7afc4e5ed31f500d42bbbc2e658ceea8ed8da8b8cb
+  data.tar.gz: 1de878786e978061335001e18ec311e0b2708ec55099d8fa1afbb072e341bbe276baa1ffd9e57883446042f433e021274bde67cf5a4cd1380477df937cf5a78c

data/.github/workflows/run_rspec.yml

@@ -0,0 +1,17 @@
+name: Run specs
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake compile
+        bundle exec rspec

data/.rspec

@@ -1,3 +1,2 @@
---format documentation
 --color
 --require spec_helper

data/README.md

@@ -1,8 +1,8 @@
-# Chunkio
+# ChunkI/O
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/chunkio`. To experiment with that code, run `bin/console` for an interactive prompt.
+[![](https://github.com/ganmacs/chunkio-rb/workflows/Run%20specs/badge.svg)](https://github.com/ganmacs/chunkio-rb/actions)
 
-TODO: Delete this and the text above, and describe your gem
+This gem is wrapper around [ChunkI/O](https://github.com/edsiper/chunkio).
 
 ## Installation
 
@@ -22,7 +22,13 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```rb
+require 'chunkio'
+c = ChunkIO.new
+c.write("test")
+c.set_metadata("this is metadata")
+c.close
+```
 
 ## Development
 
@@ -32,4 +38,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/chunkio.
+Bug reports and pull requests are welcome on GitHub at https://github.com/ganmacs/chunkio.

data/ext/chunkio/chunkio.h

@@ -8,6 +8,7 @@
 typedef struct chunkio_chunk {
     struct cio_chunk* inner;
     int closed;
+    int sync_mode;              /* 0 is false, 1 is true */
 } chunkio_chunk;
 
 

data/ext/chunkio/chunkio_chunk.c

@@ -4,7 +4,7 @@ VALUE cCIO_Chunk;
 
 void *chunkio_chunk_free(chunkio_chunk *ch)
 {
-    if (ch->inner) {
+    if (ch->inner != NULL) {
         cio_chunk_sync(ch->inner);
         cio_chunk_close(ch->inner, CIO_FALSE);
         ch->inner = NULL;
@@ -16,7 +16,9 @@ void *chunkio_chunk_free(chunkio_chunk *ch)
 static VALUE chunkio_chunk_allocate_context(VALUE klass)
 {
     chunkio_chunk *c = (chunkio_chunk *)xmalloc(sizeof(chunkio_chunk));
+    c->inner = NULL;
     c->closed = 0;
+    c->sync_mode = 0;
     return TypedData_Wrap_Struct(klass, &chunkio_chunk_type, c);
 }
 
@@ -24,9 +26,15 @@ static VALUE chunkio_chunk_initialize(VALUE self, VALUE context, VALUE stream, V
 {
     struct cio_ctx *ctx = UnwrapChunkIOContext(context);
     struct cio_stream *st = UnwrapChunkIOStream(stream);
-    const char *c_name = RSTRING_PTR(name);
+    const char *c_name = StringValuePtr(name);
+    if (strlen(c_name) == 0) {
+        rb_raise(rb_eStandardError, "chunk name is not allowed empty string");
+    }
 
     struct cio_chunk *chunk = cio_chunk_open(ctx, st, c_name, CIO_OPEN, 1000);
+    if (chunk == NULL) {
+        rb_raise(rb_eStandardError, "Failed to create chunk");
+    }
 
     ((chunkio_chunk*)DATA_PTR(self))->inner = chunk;
     return self;
@@ -77,12 +85,20 @@ static VALUE chunkio_chunk_write(VALUE self, VALUE buf)
 {
     chunkio_chunk *chunk = NULL;
     TypedData_Get_Struct(self, chunkio_chunk, &chunkio_chunk_type, chunk);
-    ssize_t len = RSTRING_LEN(buf);
     if (chunk->closed) {
         rb_raise(rb_eIOError, "IO was already closed");
     }
+    Check_Type(buf, T_STRING);
 
+    ssize_t len = RSTRING_LEN(buf);
     cio_chunk_write(chunk->inner, (void *)RSTRING_PTR(buf), len);
+
+    if (chunk->sync_mode) {
+        int ret = cio_chunk_sync(chunk->inner);
+        if (ret == -1) {
+            rb_raise(rb_eStandardError, "failed to sync");
+        }
+    }
     return INT2NUM(len);
 }
 
@@ -114,11 +130,19 @@ static VALUE chunkio_chunk_set_metadata(VALUE self, VALUE buf)
         rb_raise(rb_eIOError, "IO was already closed");
     }
 
+    Check_Type(buf, T_STRING);
     ssize_t len = RSTRING_LEN(buf);
     int ret = cio_meta_write(chunk->inner, (void *)RSTRING_PTR(buf), len);
     if (ret == -1) {
         rb_raise(rb_eStandardError, "failed to set metadata");
     }
+
+    if (chunk->sync_mode) {
+        int ret = cio_chunk_sync(chunk->inner);
+        if (ret == -1) {
+            rb_raise(rb_eStandardError, "failed to sync");
+        }
+    }
     return INT2NUM(len);
 }
 
@@ -139,9 +163,6 @@ static VALUE chunkio_chunk_metadata(VALUE self)
     }
 
     int ret = cio_meta_read(chunk->inner, &buf, &size);
-    if (ret == -1) {
-        rb_raise(rb_eStandardError, "failed to get metadata");
-    }
 
     return rb_str_new(buf, size);
 }
@@ -198,7 +219,7 @@ static VALUE chunkio_chunk_tx_begin(VALUE self)
 
     int ret = cio_chunk_tx_begin(chunk->inner);
     if (ret == -1) {
-        rb_raise(rb_eStandardError, "failed to begin transaction");
+        rb_raise(rb_eStandardError, "Failed to begin transaction");
     }
 
     return Qnil;
@@ -216,6 +237,13 @@ static VALUE chunkio_chunk_tx_commit(VALUE self)
     if (ret == -1) {
         rb_raise(rb_eStandardError, "failed to commit transaction");
     }
+
+    if (chunk->sync_mode) {
+        int ret = cio_chunk_sync(chunk->inner);
+        if (ret == -1) {
+            rb_raise(rb_eStandardError, "failed to sync");
+        }
+    }
     return Qnil;
 }
 
@@ -229,11 +257,32 @@ static VALUE chunkio_chunk_tx_rollback(VALUE self)
 
     int ret = cio_chunk_tx_rollback(chunk->inner);
     if (ret == -1) {
-        rb_raise(rb_eStandardError, "failed to rollback transaction");
+        rb_raise(rb_eStandardError, "Failed to rollback transaction");
     }
     return Qnil;
 }
 
+static VALUE chunkio_chunk_sync_mode(VALUE self) {
+    chunkio_chunk *chunk;
+    TypedData_Get_Struct(self, chunkio_chunk, &chunkio_chunk_type, chunk);
+    return chunk->sync_mode == 1 ? Qtrue : Qfalse;
+}
+
+static VALUE chunkio_chunk_sync_mode_assign(VALUE self, VALUE bool) {
+    chunkio_chunk *chunk;
+    TypedData_Get_Struct(self, chunkio_chunk, &chunkio_chunk_type, chunk);
+
+    if (bool == Qtrue) {
+        chunk->sync_mode = 1;
+    } else if (bool == Qfalse){
+        chunk->sync_mode = 0;
+    } else {
+        rb_raise(rb_eTypeError, "expected true or false");
+    }
+
+    return Qnil;
+}
+
 void Init_chunkio_chunk(VALUE mChunkIO)
 {
     cCIO_Chunk = rb_define_class_under(mChunkIO, "Chunk", rb_cObject);
@@ -251,5 +300,7 @@ void Init_chunkio_chunk(VALUE mChunkIO)
     rb_define_method(cCIO_Chunk, "tx_begin", chunkio_chunk_tx_begin, 0);
     rb_define_method(cCIO_Chunk, "tx_commit", chunkio_chunk_tx_commit, 0);
     rb_define_method(cCIO_Chunk, "tx_rollback", chunkio_chunk_tx_rollback, 0);
+    rb_define_method(cCIO_Chunk, "sync_mode", chunkio_chunk_sync_mode, 0);
+    rb_define_method(cCIO_Chunk, "sync_mode=", chunkio_chunk_sync_mode_assign, 1);
     /* rb_define_method(cCIO_Chunk, "write_at", chunkio_chunk_write_at, 2); */
 }

data/ext/chunkio/chunkio_context.c

@@ -39,9 +39,16 @@ static VALUE allocate_context(VALUE klass)
 
 static VALUE chunkio_context_initialize(VALUE self, VALUE root)
 {
-    char *p = RSTRING_PTR(root);
-    /* struct cio_ctx *ctx = cio_create(p, log_cb, CIO_DEBUG, 0); /\* TODO: flags, LOG *\/ */
-    struct cio_ctx *ctx = cio_create(p, NULL, CIO_DEBUG, 0); /* TODO: flags, LOG */
+    char *p = StringValuePtr(root);
+    if (strlen(p) == 0) {
+        rb_raise(rb_eStandardError, "Context root path is not allowed empty string");
+    }
+
+    /* permission is fixed for now */
+    rb_funcall(rb_const_get(rb_cObject, rb_intern("FileUtils")), rb_intern("mkdir_p"), 1, root);
+
+    /* struct cio_ctx *ctx = cio_create(p, log_cb, CIO_DEBUG, 0); /\* flag *\/ */
+    struct cio_ctx *ctx = cio_create(p, 0, CIO_DEBUG, 0); /* flag */
     if (!ctx) {
         rb_raise(rb_eStandardError, "failed to create cio_ctx");
     }

data/ext/chunkio/chunkio_stream.c

@@ -4,7 +4,6 @@ VALUE cCIO_Stream;
 
 void *chunkio_stream_free(struct cio_stream *st)
 {
-
     /*
       Don't call cio_chunk_close_stream(st).
       cio_chunk is freed by chunkio_chunk.
@@ -33,7 +32,11 @@ static VALUE allocate_stream(VALUE klass)
 
 static VALUE chunkio_stream_initialize(VALUE self, VALUE context, VALUE name)
 {
-    char *stream_name = RSTRING_PTR(name);
+    char *stream_name = StringValuePtr(name);
+    if (strlen(stream_name) == 0) {
+        rb_raise(rb_eStandardError, "stream_name is not allowed empty string");
+    }
+
     struct cio_ctx *ctx = UnwrapChunkIOContext(context);
     struct cio_stream *st = cio_stream_create(ctx, stream_name, CIO_STORE_FS); /* TODO CIO_STORE_FS */
     if (!st) {

data/ext/chunkio/extconf.rb

@@ -9,7 +9,7 @@ message "Building chunkio\n"
 recipe = MiniPortileCMake.new('chunkio', 'v0.0.1')
 
 recipe.files << {
-  url: 'https://github.com/ganmacs/chunkio/tarball/6a1bd00a455b410085dbae7bbf29edc6139b3e29',
+  url: 'https://github.com/ganmacs/chunkio/tarball/612777c764057c53988db3899d88adce6fe742a1',
 }
 
 class << recipe

data/lib/chunkio/chunkio.rb

@@ -5,22 +5,6 @@ require 'chunkio.so'
 module ChunkIO
   class ChunkIO
     def initialize(context_path:, stream_name:)
-      unless context_path
-        raise 'invalid'
-      end
-
-      unless stream_name
-        raise 'stream'
-      end
-
-      if  context_path.empty?
-        raise 'context_path should be at least one char'
-      end
-
-      if stream_name.empty?
-        raise 'stream_name should be at least one char'
-      end
-
       @ctx = ::ChunkIO::Context.new(context_path)
       @stream = ::ChunkIO::Stream.new(@ctx, stream_name)
       @chunks = []

data/lib/chunkio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChunkIO
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chunkio
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Yuta Iwama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -103,10 +103,10 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/run_rspec.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.3
-before_install: gem install bundler -v 2.0.1