snappy 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/ext/api.cc

@@ -2,44 +2,68 @@
 #include "snappy.h"
 
 static VALUE rb_mSnappy;
-static ID    i_to_s;
+static VALUE rb_eSnappy;
 
 static VALUE
-snappy_deflate(VALUE self, VALUE source)
+snappy_deflate(int argc, VALUE *argv, VALUE self)
 {
-    snappy::string output;
+    VALUE src, dst;
     size_t  output_length;
 
-    source = rb_funcall(source, i_to_s, 0);
-    output_length = snappy::Compress(RSTRING_PTR(source), RSTRING_LEN(source), &output);
+    rb_scan_args(argc, argv, "11", &src, &dst);
+    StringValue(src);
 
-    return rb_str_new(output.data(), output_length);
+    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(VALUE self, VALUE source)
+snappy_inflate(int argc, VALUE *argv, VALUE self)
 {
-    snappy::string output;
+    VALUE src, dst;
+    size_t output_length;
+
+    rb_scan_args(argc, argv, "11", &src, &dst);
+    StringValue(src);
 
-    source = rb_funcall(source, i_to_s, 0);
-    if (!snappy::IsValidCompressedBuffer(RSTRING_PTR(source), RSTRING_LEN(source)) ||
-        !snappy::Uncompress(RSTRING_PTR(source), RSTRING_LEN(source), &output)) {
-        rb_raise(rb_eRuntimeError, "Couldn't inflate");
+    if (!snappy::GetUncompressedLength(RSTRING_PTR(src), RSTRING_LEN(src), &output_length)) {
+        rb_raise(rb_eSnappy, "snappy::GetUncompressedLength");
     }
 
-    return rb_str_new(output.data(), output.size());
+    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_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_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);
 
-    i_to_s = rb_intern("to_s");
+    rb_define_singleton_method(rb_mSnappy, "compress", (VALUE (*)(...))snappy_deflate, -1);
+    rb_define_singleton_method(rb_mSnappy, "uncompress", (VALUE (*)(...))snappy_inflate, -1);
 }
 }

data/ext/extconf.rb

@@ -20,11 +20,14 @@ def try_configure
   have_header 'stdlib.h'
   have_header 'strings.h'
   have_header 'string.h'
+  have_header 'sys/byteswap.h'
+  have_header 'sys/endian.h'
   have_header 'sys/mman.h'
+  have_header 'sys/resource.h'
   have_header 'sys/stat.h'
   have_header 'sys/types.h'
-  have_header 'sys/resource.h'
   have_header 'unistd.h'
+  have_header 'windows.h'
 
   if try_run 'int main(int argc, char** argv){ int i = 1; return *((char*)&i); }'
     $defs << '-DWORDS_BIGENDIAN'
@@ -37,7 +40,7 @@ unless have_library 'snappy'
   tar = 'tar'
   tar = 'gnutar' if find_executable 'gnutar'
 
-  ver = "1.0.2"
+  ver = "1.0.4"
   src = "snappy-#{ver}"
 
   FileUtils.rm_rf File.join dst, src
@@ -51,6 +54,8 @@ unless have_library 'snappy'
 
   %w(
 config.h
+snappy-c.cc
+snappy-c.h
 snappy-internal.h
 snappy-sinksource.cc
 snappy-sinksource.h
@@ -68,7 +73,7 @@ snappy.h
     %r'#if @ac_cv_have_stddef_h@' => '#ifdef HAVE_STDDEF_H',
     %r'@SNAPPY_MAJOR@'            => '1',
     %r'@SNAPPY_MINOR@'            => '0',
-    %r'@SNAPPY_PATCHLEVEL@'       => '2',
+    %r'@SNAPPY_PATCHLEVEL@'       => '4',
   }.each { |ptn, str| hdr.gsub! ptn, str }
   File.open(File.join(dst, 'snappy-stubs-public.h'), 'wb'){ |f| f.write hdr }
 

data/snappy.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{snappy}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["miyucy"]
-  s.date = %q{2011-05-09}
+  s.authors = [%q{miyucy}]
+  s.date = %q{2011-10-13}
   s.description = %q{libsnappy binding for Ruby}
   s.email = %q{miyucy@gmail.com}
-  s.extensions = ["ext/extconf.rb"]
+  s.extensions = [%q{ext/extconf.rb}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -33,9 +33,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/miyucy/snappy}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.9}
   s.summary = %q{libsnappy binding for Ruby}
   s.test_files = [
     "spec/snappy_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: snappy
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - miyucy
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 +09:00
-default_executable: 
+date: 2011-10-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -30,9 +29,9 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  prerelease: false
-  type: :development
   requirement: *id001
+  type: :development
+  prerelease: false
   name: rspec
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
@@ -46,9 +45,9 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
-  type: :development
   requirement: *id002
+  type: :development
+  prerelease: false
   name: bundler
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
@@ -62,9 +61,9 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  prerelease: false
-  type: :development
   requirement: *id003
+  type: :development
+  prerelease: false
   name: jeweler
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
@@ -76,9 +75,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id004
+  type: :development
+  prerelease: false
   name: rcov
 description: libsnappy binding for Ruby
 email: miyucy@gmail.com
@@ -103,7 +102,6 @@ files:
 - snappy.gemspec
 - spec/snappy_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/miyucy/snappy
 licenses: 
 - MIT
@@ -133,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: libsnappy binding for Ruby