mochilo 1.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 64991c41216b4fb7659230eb433f7cb6c3f4ffff
-  data.tar.gz: 21e5f81fdf2be02ad17303ca98636020fa2f8f78
+SHA256:
+  metadata.gz: 0b97afc4fd9e2920c58c61e96065c377681018aefe07c15cc072e59922157997
+  data.tar.gz: ab5665e26e73884dd6e6faf2fe4df2ca1ca9ba421283f996d59c9b16dfa9509b
 SHA512:
-  metadata.gz: 8258d48406e1674370d61cf42562db462908a6239f8471f2033a157bc4547fe4e7793d74a516046f6326d4473e73162be9b467b35f4e6fe55f43aa09c763fec7
-  data.tar.gz: 4e44d9ab0960cadaa4b70c15c1da0b2b10447dfe3790f80189d6ee70f697966b52bdbb9ae9546b446f7bfa860274efb8cd212f80ca26c858ddc1ad8850fc1f66
+  metadata.gz: 05f5f210fcd4052a278ca9344f37ee1c00a9e9a966ac843843d6deeaacd61aac8d58fbf83886719e241f90d12d9cc852d3a5819b2f3cc10124c105d71d761e5e
+  data.tar.gz: f129d81959c7173d1eb2fa82e14f7271c2cbb585d9f18728fe1fb05cbcaaf3b6fbc10a871139674427c5c252d631ed457d82ce9201039f7495aa6d5e021a9e27

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 script:
   - bundle exec rake test
+install: ./script/bootstrap
 rvm:
   - 2.3.0
   - 2.2

data/Gemfile

@@ -3,3 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "pry"
+
+group :benchmark do
+  gem "msgpack"
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mochilo (1.2)
+    mochilo (1.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -28,6 +28,3 @@ DEPENDENCIES
   msgpack
   pry
   rake-compiler (>= 0.8.1)
-
-BUNDLED WITH
-   1.11.2

data/docs/format-spec.md

@@ -17,6 +17,32 @@ Length is stored in unsigned 8-bit integer.
 => XXXXXXXX (=N) bytes of raw bytes.
 ```
 
+#### Regexp
+
+Stores a regular expression, with options and encoding, up to (2^16)-1 bytes long.
+
+```
++--------+--------+--------+--------+--------+--------+--------+--------+----------
+|  0xd5  |XXXXXXXX|XXXXXXXX|YYYYYYYY|YYYYYYYY|YYYYYYYY|YYYYYYYY|ZZZZZZZZ|...N bytes
++--------+--------+--------+--------+--------+--------+--------+--------+----------
+=> XXXXXXXX_XXXXXXXX (=N) bytes of raw bytes.
+=> YYYYYYYY_YYYYYYYY_YYYYYYYY_YYYYYYYY 32-bit int options
+=> ZZZZZZZZ encoding flag
+```
+
+#### Time
+
+Stores a Ruby time, with usec resolution and UTC offset.
+
+```
++--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+|  0xd6  |XXXXXXXX|XXXXXXXX|XXXXXXXX|XXXXXXXX|XXXXXXXX|XXXXXXXX|XXXXXXXX|XXXXXXXX|YYYYYYYY|YYYYYYYY|YYYYYYYY|YYYYYYYY|YYYYYYYY|YYYYYYYY|YYYYYYYY|YYYYYYYY|ZZZZZZZZ|ZZZZZZZZ|ZZZZZZZZ|ZZZZZZZZ|
++--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+=> XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX 64-bit unsigned seconds since the epoch
+=> YYYYYYYY_YYYYYYYY_YYYYYYYY_YYYYYYYY_YYYYYYYY_YYYYYYYY_YYYYYYYY_YYYYYYYY 64-bit unsigned microseconds
+=> ZZZZZZZZ_ZZZZZZZZ_ZZZZZZZZ_ZZZZZZZZ 32-bit signed seconds offset from UTC
+```
+
 #### String16
 
 For storing text up to (2^16)-1 bytes.

data/ext/mochilo/buffer.c

@@ -19,7 +19,7 @@ static mochilo_buf_chunk *init_cur_chunk(mochilo_buf *buf, size_t chunk_size)
 
 	buf->last_alloc = chunk->ptr = malloc(chunk_size);
 	if (!chunk->ptr)
-		return NULL;
+		rb_raise(rb_eNoMemError, "Failed to allocate new chunk");
 
 	chunk->end = chunk->ptr + chunk_size;
 	return chunk;
@@ -38,7 +38,7 @@ static void skip_last_chunk(mochilo_buf *buf)
 
 static void free_buf(mochilo_buf *buf)
 {
-	uint16_t i;
+	uint32_t i;
 
 	for (i = 0; i < buf->cur_chunk; ++i)
 		free(buf->chunks[i].ptr);
@@ -61,7 +61,7 @@ VALUE mochilo_buf_flush(mochilo_buf *buf)
 {
 	VALUE rb_str;
 	char *ptr;
-	uint16_t i;
+	uint32_t i;
 
 	skip_last_chunk(buf);
 
@@ -95,15 +95,20 @@ VALUE mochilo_buf_flush(mochilo_buf *buf)
 
 mochilo_buf_chunk *mochilo_buf_rechunk2(mochilo_buf *buf, size_t chunk_size)
 {
+	mochilo_buf_chunk *chunks;
+
 	skip_last_chunk(buf);
 
 	if (buf->cur_chunk == buf->chunk_count) {
-		buf->chunk_count *= 2;
+		if ((buf->chunk_count * 2) < buf->chunk_count)
+			rb_raise(rb_eArgError, "Too many chunks required to serialize");
 
-		buf->chunks = realloc(buf->chunks, buf->chunk_count * sizeof(mochilo_buf_chunk));
-		if (!buf->chunks)
-			return NULL;
+		chunks = realloc(buf->chunks, buf->chunk_count * 2 * sizeof(mochilo_buf_chunk));
+		if (!chunks)
+			rb_raise(rb_eNoMemError, "Failed to realloc chunks");
 
+		buf->chunks = chunks;
+		buf->chunk_count *= 2;
 	}
 
 	return init_cur_chunk(buf, chunk_size);
@@ -118,10 +123,8 @@ void mochilo_buf_put(mochilo_buf *buf, const char *data, size_t len)
 {
 	mochilo_buf_chunk *chunk = &buf->chunks[buf->cur_chunk];
 
-	if (unlikely(chunk->ptr + len > chunk->end)) {
-		if (!(chunk = mochilo_buf_rechunk2(buf, len)))
-			return;
-	}
+	if (unlikely(chunk->ptr + len > chunk->end))
+		chunk = mochilo_buf_rechunk2(buf, len);
 
 	memmove(chunk->ptr, data, len);
 	chunk->ptr += len;

data/ext/mochilo/buffer.h

@@ -59,7 +59,7 @@ typedef struct {
 	mochilo_buf_chunk *chunks;
 	char *last_alloc;
 	size_t total_size;
-	uint16_t chunk_count, cur_chunk;
+	uint32_t chunk_count, cur_chunk;
 } mochilo_buf;
 
 typedef struct {
@@ -81,7 +81,7 @@ const char *mochilo_src_peek(mochilo_src *buf, size_t need);
 #define BUF_ENSURE_AVAIL(b, d) \
 	mochilo_buf_chunk *chunk = &b->chunks[b->cur_chunk]; \
 	if (unlikely(chunk->ptr + (d) > chunk->end)) { \
-		if ((chunk = mochilo_buf_rechunk(b)) == NULL) return; };
+		chunk = mochilo_buf_rechunk(b); };
 
 #define SRC_CHECK_AVAIL(src, bytes) (src->ptr + bytes <= src->end) 
 

data/ext/mochilo/mochilo.h

@@ -28,6 +28,8 @@ enum msgpack_t {
 	MSGPACK_T_INT32 = 0xd2,
 	MSGPACK_T_INT64	 = 0xd3,
 	MSGPACK_T_SYM = 0xd4,
+	MSGPACK_T_REGEXP = 0xd5,
+	MSGPACK_T_TIME = 0xd6,
 	MSGPACK_T_STR16 = 0xd8, /* reserved in the spec */
 	MSGPACK_T_STR32 = 0xd9, /* reserved in the spec */
 	MSGPACK_T_RAW16	= 0xda,

data/ext/mochilo/mochilo_api.h

@@ -18,6 +18,29 @@ MOAPI mo_value moapi_sym_new(const char *src, size_t len)
 	return (mo_value)ID2SYM(rb_intern(symbol));
 }
 
+#ifdef HAVE_RUBY_ENCODING_H
+MOAPI mo_value moapi_regexp_new(const char *src, size_t len, enum msgpack_enc_t encoding, int reg_options)
+{
+	int index = 0;
+	VALUE re;
+
+	if (encoding < sizeof(mochilo_enc_lookup)/sizeof(mochilo_enc_lookup[0]))
+		index = rb_enc_find_index(mochilo_enc_lookup[encoding]);
+
+	re = rb_reg_new(src, len, reg_options);
+	rb_enc_set_index(re, index);
+
+	return (mo_value)re;
+}
+#endif
+
+MOAPI mo_value moapi_time_new(uint64_t sec, uint64_t usec, int32_t utc_offset)
+{
+	VALUE utc_time = rb_time_new(sec, usec);
+	return (mo_value)rb_funcall(utc_time,
+		rb_intern("getlocal"), 1, INT2FIX(utc_offset));
+}
+
 #ifdef HAVE_RUBY_ENCODING_H
 MOAPI mo_value moapi_str_new(const char *src, size_t len, enum msgpack_enc_t encoding)
 {

data/ext/mochilo/mochilo_pack.c

@@ -73,6 +73,56 @@ void mochilo_pack_bignum(mochilo_buf *buf, VALUE rb_bignum)
 	}
 }
 
+#ifdef HAVE_RUBY_ENCODING_H
+void mochilo_pack_regexp(mochilo_buf *buf, VALUE rb_regexp)
+{
+	size_t size;
+	rb_encoding *encoding;
+	char *enc_name;
+	const struct mochilo_enc_map *enc2id;
+	uint32_t options;
+	const char *regexp;
+
+	size = RREGEXP_SRC_LEN(rb_regexp);
+
+	if (size < (1<<16)) {
+		uint16_t packed_size = size;
+
+		encoding = rb_enc_get(rb_regexp);
+		enc_name = rb_enc_name(encoding);
+		enc2id = mochilo_encoding_to_id(enc_name, (unsigned int)strlen(enc_name));
+
+		options = rb_reg_options(rb_regexp);
+		regexp = RREGEXP_SRC_PTR(rb_regexp);
+
+		mochilo_buf_putc(buf, MSGPACK_T_REGEXP);
+		mochilo_buf_put16be(buf, &packed_size);
+		mochilo_buf_put32be(buf, &options);
+		mochilo_buf_putc(buf, enc2id ? enc2id->id : 0);
+		mochilo_buf_put(buf, regexp, size);
+	} else {
+		rb_raise(rb_eMochiloPackError,
+			"Regexp too long: must be under %d bytes, %ld given", 1<<16, size);
+	}
+}
+#endif
+
+void mochilo_pack_time(mochilo_buf *buf, VALUE rb_time)
+{
+	uint64_t sec;
+	uint64_t usec;
+	int32_t utc_offset;
+
+	sec = NUM2ULONG(rb_funcall(rb_time, rb_intern("to_i"), 0));
+	usec = NUM2ULONG(rb_funcall(rb_time, rb_intern("usec"), 0));
+	utc_offset = NUM2INT(rb_funcall(rb_time, rb_intern("utc_offset"), 0));
+
+	mochilo_buf_putc(buf, MSGPACK_T_TIME);
+	mochilo_buf_put64be(buf, &sec);
+	mochilo_buf_put64be(buf, &usec);
+	mochilo_buf_put32be(buf, &utc_offset);
+}
+
 struct mochilo_hash_pack {
 	mochilo_buf *buf;
 	int trusted;
@@ -268,8 +318,16 @@ void mochilo_pack_one(mochilo_buf *buf, VALUE rb_object, int trusted)
 		mochilo_pack_bignum(buf, rb_object);
 		return;
 
+#ifdef HAVE_RUBY_ENCODING_H
+	case T_REGEXP:
+		mochilo_pack_regexp(buf, rb_object);
+		return;
+#endif
+
 	default:
-		if (rb_respond_to(rb_object, rb_intern("to_bpack"))) {
+		if (rb_cTime == rb_obj_class(rb_object)) {
+			mochilo_pack_time(buf, rb_object);
+		} else if (rb_respond_to(rb_object, rb_intern("to_bpack"))) {
 			VALUE bpack = rb_funcall(rb_object, rb_intern("to_bpack"), 0);
 
 			mochilo_buf_put(buf, RSTRING_PTR(bpack), RSTRING_LEN(bpack));

data/ext/mochilo/mochilo_unpack.c

@@ -178,6 +178,42 @@ int mochilo_unpack_one(mo_value *_value, mochilo_src *src)
 			return 0;
 		}
 
+#ifdef HAVE_RUBY_ENCODING_H
+		case MSGPACK_T_REGEXP:
+		{
+			uint16_t length;
+			uint32_t options;
+			uint8_t encoding;
+			const char *ptr;
+
+			SRC_ENSURE_AVAIL(src, 2+4+1);
+			mochilo_src_get16be(src, &length);
+			mochilo_src_get32be(src, &options);
+			mochilo_src_get8be(src, &encoding);
+
+			if (!(ptr = mochilo_src_peek(src, length)))
+				return -1;
+
+			*_value = moapi_regexp_new(ptr, length, encoding, options);
+			return 0;
+		}
+#endif
+
+		case MSGPACK_T_TIME:
+		{
+			uint64_t sec;
+			uint64_t usec;
+			int32_t utc_offset;
+
+			SRC_ENSURE_AVAIL(src, 8+8+4);
+			mochilo_src_get64be(src, &sec);
+			mochilo_src_get64be(src, &usec);
+			mochilo_src_get32be(src, &utc_offset);
+
+			*_value = moapi_time_new(sec, usec, utc_offset);
+			return 0;
+		}
+
 #ifdef HAVE_RUBY_ENCODING_H
 		case MSGPACK_T_STR16:
 		{

data/lib/mochilo/version.rb

@@ -1,3 +1,3 @@
 module Mochilo
-  VERSION = "1.2"
+  VERSION = "1.3.0"
 end

data/mochilo.gemspec

@@ -19,6 +19,4 @@ Gem::Specification.new do |s|
   # tests
   s.add_development_dependency 'rake-compiler', ">= 0.8.1"
   s.add_development_dependency 'minitest', ">= 4.1.0"
-  # benchmarks
-  s.add_development_dependency 'msgpack'
 end

data/script/bootstrap

@@ -12,5 +12,5 @@ cd "$(dirname "$0")/.."
 if bundle check 1>/dev/null 2>&1; then
     echo "Gem environment up-to-date"
 else
-    exec bundle install --binstubs --path vendor/gems "$@"
+    exec bundle install --binstubs --path vendor/gems --without benchmark "$@"
 fi

data/test/pack_test.rb

@@ -175,4 +175,28 @@ class MochiloPackTest < MiniTest::Unit::TestCase
       Mochilo.pack(Object.new)
     end
   end
+
+  def test_pack_regexp
+    expected = "\xD5\x00\x07\x00\x00\x00\x00\x01pa.tern"
+    assert_equal expected, Mochilo.pack(/pa.tern/)
+    [
+      /pa.tern/,
+      /thing/im,
+    ].each do |re|
+      assert_equal re, Mochilo.unpack(Mochilo.pack(re))
+    end
+  end
+
+  def test_time
+    offset = -13*60*60 # I don't know if this is possible. There shouldn't be anything with a greater absolute value.
+    t = Time.gm(2042, 7, 21, 3, 32, 37, 974010).getlocal(offset)
+    expected = "\xD6" +
+      "\x00\x00\x00\x00\x88\x77\x66\x55" + # sec
+      "\x00\x00\x00\x00\x00\x0E\xDC\xBA" + # usec
+      "\xFF\xFF\x49\x30"                   # utc_offset
+    assert_equal expected, Mochilo.pack(t)
+    unpacked = Mochilo.unpack(expected)
+    assert_equal t, unpacked
+    assert_equal t.utc_offset, unpacked.utc_offset
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mochilo
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.3.0
 platform: ruby
 authors:
 - Vicent Martí
 - Brian Lopez
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -39,21 +39,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
-- !ruby/object:Gem::Dependency
-  name: msgpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
+description:
 email: vicent@github.com seniorlopez@gmail.com
 executables: []
 extensions:
@@ -94,7 +80,7 @@ files:
 homepage: http://github.com/brianmario/mochilo
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -110,9 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.10
+signing_key:
 specification_version: 4
 summary: A ruby library for BananaPack
 test_files: