snappy 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWYxZjliN2JhMzUxOGU5ZDI4ZWEwY2Q4ZDFlNTQ1OGY3NjdmNDliOQ==
+    YTdmZWM4Y2U4OTJkYTgxY2E3MDUyYzE2MDZjMGVhMWMyYmJmNWE4Yg==
   data.tar.gz: !binary |-
-    NWNlYzI4NmVkODgzZTgzNWM1ZThmNjBiZDJhYmEwOTY5MGUxMTg4MA==
+    NjFlNmUzMjYwYjFhZjhlZGQ4YTBmODNjZGYyNzU5NDI0ZmVlMzA0Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGRiMGI5ZjIwZDJhNzMwMGIyN2E5ODQxZDVjZDczNWI1MjA0Y2UyZDk3OGIw
-    MDcwN2Y2ZmFlYWNmNzMxYzJjMmIyODMxM2NlNTg3MWVmYzNiYTY4YzEzMjUz
-    MTQ3ZTg4NDMzZjljMWNiNzM5MzFiYWIxYzQ2MzI1OWE0MGY1Yzc=
+    MTU4ZDY5YzM5M2Q2ZmE5YTU2ZTgwYWUxOTQxZTFkYzk4Y2Q1YmZiMGUxZDBl
+    Njc5YWVjNzU2YzU3M2MxNDYwYzBiODJkNWI4MWVjZTlmY2E3MDc4YjJlZGNj
+    YTgwMThhNWExOWQyMTY2Yjc3NzAzNTAwM2ZlMTk2YmZmZWIzMDU=
   data.tar.gz: !binary |-
-    ZWIyMGEwMzgxMjRhYjA2MDE1NDZmZTIxYzUzOGVhYjI2ODY1MTQ4ODI2OGI3
-    NDcwNjc4YWUxYjBjMmIwZGRiYmUyMDczYjBiM2RhNDhjMzcwOWJjZDdkOGZj
-    NDM2YzE0OWYzNzhhNDc5ZTliMzUyN2ZhMGI4MTM0MTdiYmRlNzI=
+    OWE4YTI2NWUxODJhN2E2MjBjNWM0OWYzNDJhMzdjMzA4YTFiNjA4YmEwNzUy
+    MWUxNDdjZmQxMWJmNWNkYmQ5MTE4ODNiMTYwY2I2MDJiMDQ5ZjdmNzM1OGRh
+    NmYxMzY2YzAwNzI0NjlhYWU2NjRkMGRmZWFjYzBhZTlkMGI2NmE=

data/ext/api.c

@@ -0,0 +1,98 @@
+#include "ruby.h"
+#include "snappy-c.h"
+
+static VALUE rb_mSnappy;
+static VALUE rb_eSnappy;
+
+static VALUE
+snappy_raise(snappy_status result)
+{
+    if (result == SNAPPY_INVALID_INPUT) {
+        rb_raise(rb_eSnappy, "INVALID INPUT");
+    } else if (result == SNAPPY_BUFFER_TOO_SMALL) {
+        rb_raise(rb_eSnappy, "BUFFER TOO SMALL");
+    } else {
+        rb_raise(rb_eSnappy, "ERROR");
+    }
+    return Qnil;
+}
+
+static VALUE
+snappy_deflate(int argc, VALUE *argv, VALUE self)
+{
+    VALUE src, dst;
+    size_t  output_length;
+    snappy_status result;
+
+    rb_scan_args(argc, argv, "11", &src, &dst);
+    StringValue(src);
+
+    output_length = snappy_max_compressed_length(RSTRING_LEN(src));
+
+    if (NIL_P(dst)) {
+        dst = rb_str_new(NULL, output_length);
+    } else {
+    	StringValue(dst);
+    	rb_str_resize(dst, output_length);
+    }
+
+    result = snappy_compress(RSTRING_PTR(src), RSTRING_LEN(src), RSTRING_PTR(dst), &output_length);
+    if (result == SNAPPY_OK) {
+        rb_str_resize(dst, output_length);
+        return dst;
+    } else {
+        return snappy_raise(result);
+    }
+}
+
+static VALUE
+snappy_inflate(int argc, VALUE *argv, VALUE self)
+{
+    VALUE src, dst;
+    size_t output_length;
+    snappy_status result;
+
+    rb_scan_args(argc, argv, "11", &src, &dst);
+    StringValue(src);
+
+    result = snappy_uncompressed_length(RSTRING_PTR(src), RSTRING_LEN(src), &output_length);
+    if (result != SNAPPY_OK) {
+        return snappy_raise(result);
+    }
+
+    if (NIL_P(dst)) {
+        dst = rb_str_new(NULL, output_length);
+    } else {
+    	StringValue(dst);
+    	rb_str_resize(dst, output_length);
+    }
+
+    result = snappy_uncompress(RSTRING_PTR(src), RSTRING_LEN(src), RSTRING_PTR(dst), &output_length);
+    if (result != SNAPPY_OK) {
+        return snappy_raise(result);
+    }
+
+    StringValue(dst);
+    rb_str_resize(dst, output_length);
+
+    return dst;
+}
+
+void Init_snappy()
+{
+    rb_mSnappy = rb_define_module("Snappy");
+    rb_eSnappy = rb_define_class_under(rb_mSnappy, "Error", rb_eStandardError);
+    rb_define_singleton_method(rb_mSnappy, "deflate", snappy_deflate, -1);
+    rb_define_singleton_method(rb_mSnappy, "inflate", snappy_inflate, -1);
+
+    VALUE rb_mSnappy_singleton = rb_singleton_class(rb_mSnappy);
+
+    rb_define_alias(rb_mSnappy_singleton, "compress", "deflate");
+    rb_define_alias(rb_mSnappy_singleton, "load", "deflate");
+
+    rb_define_alias(rb_mSnappy_singleton, "uncompress", "inflate");
+    rb_define_alias(rb_mSnappy_singleton, "dump", "inflate");
+
+    rb_require("snappy/writer");
+    rb_require("snappy/reader");
+}

data/ext/extconf.rb

@@ -36,5 +36,4 @@ snappy.h
   end
 end
 
-have_library 'stdc++'
 create_makefile 'snappy'

data/lib/snappy/version.rb

@@ -1,3 +1,3 @@
 module Snappy
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/test-snappy.rb

@@ -9,4 +9,16 @@ describe Snappy do
     s = Array.new(1024){T.sample}.join
     Snappy.inflate(Snappy.deflate s).must_equal(s)
   end
+
+  it "well done (pair)" do
+    s = Array.new(1024){T.sample}.join
+    [
+     [:deflate,  :inflate],
+     [:compress, :uncompress],
+     [:load,     :dump],
+    ].each do |(i, o)|
+      Snappy.__send__(o, (Snappy.__send__ i,  s)).must_equal(s)
+      eval %{Snappy.#{o}(Snappy.#{i} s).must_equal(s)}
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snappy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- ext/api.cc
+- ext/api.c
 - ext/extconf.rb
 - lib/snappy/reader.rb
 - lib/snappy/version.rb

data/ext/api.cc

@@ -1,72 +0,0 @@
-#include "ruby.h"
-#include "snappy.h"
-
-static VALUE rb_mSnappy;
-static VALUE rb_eSnappy;
-
-static VALUE
-snappy_deflate(int argc, VALUE *argv, VALUE self)
-{
-    VALUE src, dst;
-    size_t  output_length;
-
-    rb_scan_args(argc, argv, "11", &src, &dst);
-    StringValue(src);
-
-    output_length = snappy::MaxCompressedLength(RSTRING_LEN(src));
-
-    if (NIL_P(dst)) {
-        dst = rb_str_new(NULL, output_length);
-    } else {
-    	StringValue(dst);
-    	rb_str_resize(dst, output_length);
-    }
-
-    snappy::RawCompress(RSTRING_PTR(src), RSTRING_LEN(src), RSTRING_PTR(dst), &output_length);
-    rb_str_resize(dst, output_length);
-
-    return dst;
-}
-
-static VALUE
-snappy_inflate(int argc, VALUE *argv, VALUE self)
-{
-    VALUE src, dst;
-    size_t output_length;
-
-    rb_scan_args(argc, argv, "11", &src, &dst);
-    StringValue(src);
-
-    if (!snappy::GetUncompressedLength(RSTRING_PTR(src), RSTRING_LEN(src), &output_length)) {
-        rb_raise(rb_eSnappy, "snappy::GetUncompressedLength");
-    }
-
-    if (NIL_P(dst)) {
-        dst = rb_str_new(NULL, output_length);
-    } else {
-    	StringValue(dst);
-    	rb_str_resize(dst, output_length);
-    }
-
-    if (!snappy::RawUncompress(RSTRING_PTR(src), RSTRING_LEN(src), RSTRING_PTR(dst))) {
-        rb_raise(rb_eSnappy, "snappy::RawUncompress");
-    }
-
-    return dst;
-}
-
-extern "C" {
-void Init_snappy()
-{
-    rb_mSnappy = rb_define_module("Snappy");
-    rb_eSnappy = rb_define_class_under(rb_mSnappy, "Error", rb_eStandardError);
-    rb_define_singleton_method(rb_mSnappy, "deflate", (VALUE (*)(...))snappy_deflate, -1);
-    rb_define_singleton_method(rb_mSnappy, "inflate", (VALUE (*)(...))snappy_inflate, -1);
-
-    rb_define_singleton_method(rb_mSnappy, "compress", (VALUE (*)(...))snappy_deflate, -1);
-    rb_define_singleton_method(rb_mSnappy, "uncompress", (VALUE (*)(...))snappy_inflate, -1);
-
-    rb_require("snappy/writer");
-    rb_require("snappy/reader");
-}
-}