snappy 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc5a419cf7d20b6b439f767ad8fe39ad291e0fe8
-  data.tar.gz: 2bf91b961d0f32227f2bad3fff85a832ee1d6393
+  metadata.gz: b4a1e7596c5afb723e2ce4a83f2fb7cb93209437
+  data.tar.gz: 04e9a2a418c1c689171973cd0c6dcac7eac8ce14
 SHA512:
-  metadata.gz: 43acb4a258b8c4d5f20810833bd21f33ada143da1b142d6028e67fe59dc460773c65dfb9c6fddd497c037246e122b4fb092511a6578fd614f58a73875591e788
-  data.tar.gz: 6c3fb1b4b998caf2b19bb966f88b4511320561179404954dfd053dc32b82cc60e9acf2570b337b277abd3e33c94e5e049f15e084e70eef2d32f491b52bfa2328
+  metadata.gz: 223724133a803ebebfc86d956885fdd9294910e86dbc3759714ee42e8332407254b6c0d6bb8325827f2acfa3c1c1edf1b337e537144c4d2721cafcfbf6e6e25d
+  data.tar.gz: 09de13c3bcbd183976ca76208b28c903811a3b96b7d327ac7762fe127208b536500a58fbbf9af3f8d8fd83dad6def9115fa40c0334cc95b27bd003480c2c8e6b

data/.gitmodules

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

data/Rakefile

@@ -2,6 +2,7 @@ require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rbconfig"
+DLEXT = RbConfig::CONFIG['DLEXT']
 
 Rake::TestTask.new do |t|
   t.warning = true
@@ -33,12 +34,6 @@ if defined?(JRUBY_VERSION)
     end
   end
 
-  desc 'Clean up build artifacts'
-  task :clean do
-    rm_rf 'ext/java/build'
-    rm_rf 'lib/snappy_ext.jar'
-  end
-
   desc 'Package the jar'
   file 'lib/snappy_ext.jar' => :compile do |t|
     ant.jar destfile: 'lib/snappy_ext.jar', basedir: '${build.dir}' do
@@ -50,19 +45,23 @@ if defined?(JRUBY_VERSION)
   task :test => 'lib/snappy_ext.jar'
   task :build => [:clean, 'lib/snappy_ext.jar']
 else
-  DLEXT = RbConfig::CONFIG["DLEXT"]
-
   file "ext/snappy_ext.#{DLEXT}" => Dir.glob("ext/*{.rb,.c}") do
     Dir.chdir("ext") do
-       ruby "extconf.rb"
-       sh "make"
+      ruby "extconf.rb"
+      sh "make"
     end
     cp "ext/snappy_ext.#{DLEXT}", "lib/snappy_ext.#{DLEXT}"
   end
 
-  task :clean do
-    rm_rf(["ext/snappy_ext.#{DLEXT}", "lib/snappy_ext.#{DLEXT}", "ext/mkmf.log", "ext/config.h", "ext/api.o", "ext/Makefile", "ext/snappy.cc", "ext/snappy.h", "ext/snappy.o"] + Dir["ext/snappy-*"])
-  end
 
   task :test => "ext/snappy_ext.#{DLEXT}"
 end
+
+desc 'Clean up build artifacts'
+task :clean do
+  rm_rf 'ext/java/build'
+  rm_rf 'lib/snappy_ext.jar'
+  rm_rf(["ext/snappy_ext.#{DLEXT}", "lib/snappy_ext.#{DLEXT}", 'ext/mkmf.log', 'ext/config.h', 'ext/api.o', 'ext/Makefile', 'ext/snappy.cc', 'ext/snappy.h', 'ext/snappy.o'] + Dir['ext/snappy-*'])
+end
+
+task :default => :test

data/ext/extconf.rb

@@ -1,39 +1,30 @@
 require 'mkmf'
 require 'fileutils'
 
-unless have_library 'snappy_ext'
-  dst = File.dirname File.expand_path __FILE__
-
-  tar = 'tar'
-  tar = 'gnutar' if find_executable 'gnutar'
-
-  ver = "1.1.1"
-  src = "snappy-#{ver}"
-
-  FileUtils.rm_rf File.join dst, src
-  system "curl -s http://snappy.googlecode.com/files/#{src}.tar.gz | #{tar} xz"
-
-  src = File.join dst, src
-
-  Dir.chdir src do
-    system "./configure --disable-option-checking --disable-dependency-tracking --disable-gtest --without-gflags"
+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'
   end
 
-  %w(
-config.h
-snappy-c.cc
-snappy-c.h
-snappy-internal.h
-snappy-sinksource.cc
-snappy-sinksource.h
-snappy-stubs-internal.cc
-snappy-stubs-internal.h
-snappy-stubs-public.h
-snappy.cc
-snappy.h
-  ).each do |file|
-    FileUtils.copy File.join(src, file), File.join(dst, file) if FileTest.exist? File.join(src, file)
-  end
+  src = %w(
+   config.h
+   snappy-c.cc
+   snappy-c.h
+   snappy-internal.h
+   snappy-sinksource.cc
+   snappy-sinksource.h
+   snappy-stubs-internal.cc
+   snappy-stubs-internal.h
+   snappy-stubs-public.h
+   snappy.cc
+   snappy.h
+  ).map { |e| File.join dir, e }
+  FileUtils.cp src, pwd, :verbose => true
 end
 
 create_makefile 'snappy_ext'

data/lib/snappy/reader.rb

@@ -11,8 +11,12 @@ module Snappy
 
     def each
       until @io.eof?
-        size = @chunked ? @io.read(4).unpack("N").first : @io.length
-        yield Snappy.inflate(@io.read(size)) if block_given?
+        if @chunked
+          size = @io.read(4).unpack('N').first
+          yield Snappy.inflate(@io.read(size)) if block_given?
+        else
+          yield Snappy.inflate @io.read if block_given?
+        end
       end
     end
 
@@ -40,13 +44,12 @@ module Snappy
     private
 
     def read_header!
-      magic_byte = @io.readchar
-      @io.ungetc(magic_byte)
-
-      if @io.length >= 16 && magic_byte == Snappy::Writer::MAGIC[0]
-        @magic, @default_version, @minimum_compatible_version = @io.read(16).unpack("a8NN")
+      header = @io.read Snappy::Writer::MAGIC.length
+      if header.length == Snappy::Writer::MAGIC.length && header == Snappy::Writer::MAGIC
+        @magic, @default_version, @minimum_compatible_version = header, *@io.read(8).unpack('NN')
         @chunked = true
       else
+        @io.rewind
         @chunked = false
       end
     end

data/lib/snappy/version.rb

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

data/snappy.gemspec

@@ -29,4 +29,28 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
+
+  # get an array of submodule dirs by executing 'pwd' inside each submodule
+  `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|
+    # for each submodule, change working directory to that submodule
+    Dir.chdir(submodule_path) do
+
+      # issue git ls-files in submodule's directory
+      submodule_files = `git ls-files`.split($\)
+
+      # prepend the submodule path to create absolute file paths
+      submodule_files_fullpaths = submodule_files.map do |filename|
+        "#{submodule_path}/#{filename}"
+      end
+
+      # remove leading path parts to get paths relative to the gem's root dir
+      # (this assumes, that the gemspec resides in the gem's root dir)
+      submodule_files_paths = submodule_files_fullpaths.map do |filename|
+        filename.gsub "#{File.dirname(__FILE__)}/", ""
+      end
+
+      # add relative paths to gem.files
+      spec.files += submodule_files_paths
+    end
+  end
 end

data/test/test-snappy-reader.rb

@@ -45,12 +45,28 @@ describe Snappy::Reader do
     it "should inflate with a magic header" do
       subject.read.must_equal "HelloWorld" * 10
     end
+
+    it "should not receive `length' in eaching" do
+      length = MiniTest::Mock.new.expect(:call, 0)
+      @buffer.stub(:length, length) do
+        subject.read
+      end
+      -> { length.verify }.must_raise MockExpectationError
+    end
   end
 
   describe :io do
     it "should be a constructor argument" do
       subject.io.must_equal @buffer
     end
+
+    it "should not receive `length' in initializing" do
+      length = MiniTest::Mock.new.expect(:call, 0)
+      @buffer.stub(:length, length) do
+        Snappy::Reader.new @buffer
+      end
+      -> { length.verify }.must_raise MockExpectationError
+    end
   end
 
   describe :each do

data/vendor/snappy/AUTHORS

@@ -0,0 +1 @@
+opensource@google.com

data/vendor/snappy/COPYING

@@ -0,0 +1,54 @@
+Copyright 2011, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===
+
+Some of the benchmark data in util/zippy/testdata is licensed differently:
+
+ - fireworks.jpeg is Copyright 2013 Steinar H. Gunderson, and
+   is licensed under the Creative Commons Attribution 3.0 license
+   (CC-BY-3.0). See https://creativecommons.org/licenses/by/3.0/
+   for more information.
+
+ - kppkn.gtb is taken from the Gaviota chess tablebase set, and
+   is licensed under the MIT License. See
+   https://sites.google.com/site/gaviotachessengine/Home/endgame-tablebases-1
+   for more information.
+
+ - paper-100k.pdf is an excerpt (bytes 92160 to 194560) from the paper
+   “Combinatorial Modeling of Chromatin Features Quantitatively Predicts DNA
+   Replication Timing in _Drosophila_” by Federico Comoglio and Renato Paro,
+   which is licensed under the CC-BY license. See
+   http://www.ploscompbiol.org/static/license for more ifnormation.
+
+ - alice29.txt, asyoulik.txt, plrabn12.txt and lcet10.txt are from Project
+   Gutenberg. The first three have expired copyrights and are in the public
+   domain; the latter does not have expired copyright, but is still in the
+   public domain according to the license information
+   (http://www.gutenberg.org/ebooks/53).