snappy 0.0.11-java → 0.0.12-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae43704311dd9c266a56ea3db47155a802af4678
-  data.tar.gz: 249e896fe57ef12e526e886ab8f03565021e0445
+  metadata.gz: ad3c31a8a7d40bdd357a4604828f89212a4808af
+  data.tar.gz: ed9fd36c6e42df33b37203722d5f680545902fb4
 SHA512:
-  metadata.gz: 560ecc38c945f8c129a92b8250650cbf81efd6f3a83067009eb4eb7740e209fa1be1dde9e09243ee62ae5a53a3fc2acba47396d1e4b739f0521369ce7fc96056
-  data.tar.gz: 98caa4b5bddd555800e8189cae2f7b9a1c169aa6f45ef2ad741813ed96bdfd349868d78844e11c52db14369bd08f62eba45e7feac42ba7c5c001c2c26b8e310f
+  metadata.gz: d326d3a46cd91ccd2ded284e65f2a0929cf7712355b83c7a839a3c3ed60e38dd39e5cea3badfb07aed8af944749488dc8cab9e6f4d1883f033fd4fb638e18cd2
+  data.tar.gz: 4dcc660ffffc348070ca7db7653baadcb2e44d583c3930b18b3dac0dfbc2bc8faa2bdc933df12a92d11973dcd84e10c2dc8e6a1a31c3164dad1558a1b2a812ac

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "vendor/snappy"]
 	path = vendor/snappy
-	url = git@github.com:google/snappy.git
+	url = git://github.com/google/snappy.git

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.2.2
+  - jruby-19mode

data/README.md

@@ -1,6 +1,16 @@
-# Snappy
+# Snappy ![](https://travis-ci.org/miyucy/snappy.svg?branch=master)
 
-see http://code.google.com/p/snappy
+see https://github.com/google/snappy
+
+## Preparation
+
+Use libsnappy
+
+    $ brew install snappy
+
+Or
+
+    $ brew install autoconf automake libtool
 
 ## Installation
 

data/ext/api.c

@@ -21,7 +21,7 @@ static VALUE
 snappy_deflate(int argc, VALUE *argv, VALUE self)
 {
     VALUE src, dst;
-    size_t  output_length;
+    size_t output_length;
     snappy_status result;
 
     rb_scan_args(argc, argv, "11", &src, &dst);
@@ -37,12 +37,12 @@ snappy_deflate(int argc, VALUE *argv, VALUE self)
     }
 
     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 {
+    if (result != SNAPPY_OK) {
         return snappy_raise(result);
     }
+
+    rb_str_resize(dst, output_length);
+    return dst;
 }
 
 static VALUE
@@ -72,24 +72,39 @@ snappy_inflate(int argc, VALUE *argv, VALUE self)
         return snappy_raise(result);
     }
 
-    StringValue(dst);
     rb_str_resize(dst, output_length);
-
     return dst;
 }
 
+static VALUE
+snappy_valid_p(VALUE self, VALUE str)
+{
+    snappy_status result;
+
+    StringValue(str);
+    result = snappy_validate_compressed_buffer(RSTRING_PTR(str), RSTRING_LEN(str));
+    if (result == SNAPPY_OK) {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
 void Init_snappy_ext()
 {
+    VALUE rb_mSnappy_singleton;
+
     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);
+    rb_define_singleton_method(rb_mSnappy, "valid?",  snappy_valid_p, 1);
 
-    VALUE rb_mSnappy_singleton = rb_singleton_class(rb_mSnappy);
+    rb_mSnappy_singleton = rb_singleton_class(rb_mSnappy);
 
     rb_define_alias(rb_mSnappy_singleton, "compress", "deflate");
     rb_define_alias(rb_mSnappy_singleton, "dump", "deflate");
 
     rb_define_alias(rb_mSnappy_singleton, "uncompress", "inflate");
     rb_define_alias(rb_mSnappy_singleton, "load", "inflate");
-  }
+}

data/ext/extconf.rb

@@ -1,14 +1,22 @@
 require 'mkmf'
 require 'fileutils'
 
+def patch_autogen
+  # s/libtoolize/glibtoolize/
+  File.write('autogen.sh', File.read('autogen.sh').gsub(/libtoolize/, 'glibtoolize'))
+end
+
 unless have_library 'snappy'
   # build vendor/snappy
   pwd = File.dirname File.expand_path __FILE__
   dir = File.join pwd, '..', 'vendor', 'snappy'
 
   Dir.chdir dir do
-    system './autogen.sh'
-    system './configure --disable-option-checking --disable-dependency-tracking --disable-gtest --without-gflags'
+    unless system './autogen.sh'
+      patch_autogen
+      raise '`autogen.sh` failed' unless system './autogen.sh'
+    end
+    raise '`configure` failed'  unless system './configure --disable-option-checking --disable-dependency-tracking --disable-gtest --without-gflags'
   end
 
   src = %w(

data/lib/snappy/version.rb

@@ -1,3 +1,3 @@
 module Snappy
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/test/test-snappy.rb

@@ -1,16 +1,16 @@
-require "minitest/autorun"
-require "minitest/spec"
-require "snappy"
+require 'minitest/autorun'
+require 'minitest/spec'
+require 'snappy'
 
 describe Snappy do
-  T = [*"a".."z", *"A".."Z", *"0".."9"]
+  T = [*'a'..'z', *'A'..'Z', *'0'..'9']
 
-  it "well done" do
+  it 'well done' do
     s = Array.new(1024){T.sample}.join
     Snappy.inflate(Snappy.deflate s).must_equal(s)
   end
 
-  it "well done (pair)" do
+  it 'well done (pair)' do
     s = Array.new(1024){T.sample}.join
     [
      [:deflate,  :inflate],
@@ -21,4 +21,38 @@ describe Snappy do
       eval %{Snappy.#{o}(Snappy.#{i} s).must_equal(s)}
     end
   end
+
+  describe '#deflate' do
+    it 'can pass buffer' do
+      skip 'cannot pass buffer in jruby' if defined? JRUBY_VERSION
+      s = 'a' * 1024
+      d = ' ' * 1024
+      r = Snappy.deflate(s, d)
+      d.must_be_same_as r
+    end
+  end
+
+  describe '#inflate' do
+    it 'can pass buffer' do
+      skip 'cannot pass buffer in jruby' if defined? JRUBY_VERSION
+      s = Snappy.deflate('a' * 1024)
+      d = ' ' * 1024
+      r = Snappy.inflate(s, d)
+      d.must_be_same_as r
+    end
+  end
+
+  describe '#valid?' do
+    it 'return true when passed deflated data' do
+      skip 'snappy-jars does not have valid?' if defined? JRUBY_VERSION
+      d = Snappy.deflate(Array.new(1024){T.sample}.join)
+      Snappy.valid?(d).must_equal true
+    end
+
+    it 'return false when passed invalid data' do
+      skip 'snappy-jars does not have valid?' if defined? JRUBY_VERSION
+      d = Snappy.deflate(Array.new(1024){T.sample}.join).reverse
+      Snappy.valid?(d).must_equal false
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snappy
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: java
 authors:
 - miyucy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -87,11 +88,11 @@ files:
 - lib/snappy/reader.rb
 - lib/snappy/version.rb
 - lib/snappy/writer.rb
+- lib/snappy_ext.jar
 - snappy.gemspec
 - test/test-snappy-reader.rb
 - test/test-snappy-writer.rb
 - test/test-snappy.rb
-- lib/snappy_ext.jar
 - vendor/snappy/AUTHORS
 - vendor/snappy/COPYING
 - vendor/snappy/ChangeLog
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: libsnappy binding for Ruby