snappy 0.0.3 → 0.0.4

data/Gemfile

@@ -6,8 +6,8 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "rspec", "~> 2.11.0"
+  gem "bundler", "~> 1.1.0"
+  gem "jeweler", "~> 1.8.4"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -1,28 +1,32 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
+      rdoc
+    json (1.7.5)
+    rake (0.9.2.2)
     rcov (0.9.9)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  bundler (~> 1.1.0)
+  jeweler (~> 1.8.4)
   rcov
-  rspec (~> 2.3.0)
+  rspec (~> 2.11.0)

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler'
+require 'rbconfig'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -9,6 +10,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
+DLEXT = RbConfig::CONFIG['DLEXT']
+
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
@@ -48,3 +51,17 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('ext/**/*.cc')
 end
+
+task :spec => "ext/snappy.#{DLEXT}"
+
+file "ext/snappy.#{DLEXT}" => Dir.glob("ext/*{.rb,.c}") do
+  Dir.chdir("ext") do
+     ruby "extconf.rb"
+     sh "make"
+  end
+  cp "ext/snappy.#{DLEXT}", "lib"
+end
+
+task :clean do
+  rm_rf(["ext/snappy.#{DLEXT}", "lib/snappy.#{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

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/ext/api.cc

@@ -65,5 +65,8 @@ void Init_snappy()
 
     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");
 }
 }

data/lib/snappy/reader.rb

@@ -0,0 +1,54 @@
+module Snappy
+  class Reader
+    attr_reader :io, :magic, :default_version, :minimum_compatible_version
+
+    def initialize io
+      @io = io
+      @io.set_encoding Encoding::ASCII_8BIT unless RUBY_VERSION =~ /^1\.8/
+      read_header!
+      yield self if block_given?
+    end
+
+    def each
+      until @io.eof?
+        size = @chunked ? @io.read(4).unpack("N").first : @io.length
+        yield Snappy.inflate(@io.read(size)) if block_given?
+      end
+    end
+
+    def read
+      @buff = StringIO.new
+      each do |chunk|
+        @buff << chunk
+      end
+      @buff.string
+    end
+
+    def each_line(sep_string=$/)
+      last = ""
+      each do |chunk|
+        chunk = last + chunk
+        lines = chunk.split(sep_string)
+        last = lines.pop
+        lines.each do |line|
+          yield line if block_given?
+        end
+      end
+      yield last
+    end
+
+    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")
+        @chunked = true
+      else
+        @chunked = false
+      end
+    end
+  end
+end

data/lib/snappy/writer.rb

@@ -0,0 +1,42 @@
+module Snappy
+  class Writer
+    MAGIC = "\202SNAPPY\000"
+    DEFAULT_VERSION = 1
+    MINIMUM_COMPATIBLE_VERSION = 1
+    DEFAULT_BLOCK_SIZE = 32 * 1024
+
+    attr_reader :io, :block_size
+
+    def initialize io, block_size = DEFAULT_BLOCK_SIZE
+      @block_size = block_size
+      @buffer = ""
+      @io = io
+      @io.set_encoding Encoding::ASCII_8BIT unless RUBY_VERSION =~ /^1\.8/
+      write_header!
+      if block_given?
+        yield self
+        dump!
+      end
+    end
+
+    def << msg
+      @buffer << msg.to_s
+      dump! if @buffer.size > @block_size
+    end
+
+    def dump!
+      compressed = Snappy.deflate(@buffer)
+      @io << [compressed.size, compressed].pack("Na#{compressed.size}")
+      @io.flush
+      @buffer = ""
+    end
+
+    alias_method :flush, :dump!
+
+    private
+
+    def write_header!
+      @io << [MAGIC, DEFAULT_VERSION, MINIMUM_COMPATIBLE_VERSION].pack("a8NN")
+    end
+  end
+end

data/snappy.gemspec

@@ -4,15 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{snappy}
-  s.version = "0.0.3"
+  s.name = "snappy"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  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 = [%q{ext/extconf.rb}]
+  s.authors = ["miyucy"]
+  s.date = "2012-12-17"
+  s.description = "libsnappy binding for Ruby"
+  s.email = "miyucy@gmail.com"
+  s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -28,38 +28,37 @@ Gem::Specification.new do |s|
     "VERSION",
     "ext/api.cc",
     "ext/extconf.rb",
+    "lib/snappy/reader.rb",
+    "lib/snappy/writer.rb",
     "snappy.gemspec",
-    "spec/snappy_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/miyucy/snappy}
-  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",
+    "spec/snappy/reader_spec.rb",
+    "spec/snappy/writer_spec.rb",
     "spec/spec_helper.rb"
   ]
+  s.homepage = "http://github.com/miyucy/snappy"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "libsnappy binding for Ruby"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rspec>, ["~> 2.11.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rspec>, ["~> 2.11.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end
 end

data/spec/snappy/reader_spec.rb

@@ -0,0 +1,112 @@
+require "spec_helper"
+
+module Snappy
+  describe Reader do
+    before do
+      @buffer = StringIO.new
+      Writer.new @buffer do |w|
+        w << "foo"
+        w << "bar"
+        w << "baz"
+        w << "quux"
+      end
+      @buffer.rewind
+    end
+
+    subject do
+      Reader.new @buffer
+    end
+
+    describe :initialize do
+      it "should yield itself to the block" do
+        yielded = nil
+        returned = Reader.new @buffer do |r|
+          yielded = r
+        end
+        returned.should == yielded
+      end
+
+      it "should read the header" do
+        subject.magic.should == Writer::MAGIC
+        subject.default_version.should == Writer::DEFAULT_VERSION
+        subject.minimum_compatible_version == Writer::MINIMUM_COMPATIBLE_VERSION
+      end
+    end
+
+    describe :initialize_without_headers do
+      before do
+        @buffer = StringIO.new
+        @buffer << Snappy.deflate("HelloWorld" * 10)
+        @buffer.rewind
+      end
+
+      it "should inflate with a magic header" do
+        subject.read.should == ("HelloWorld" * 10)
+      end
+    end
+
+    describe :io do
+      it "should be a constructor argument" do
+        subject.io.should == @buffer
+      end
+    end
+
+    describe :each do
+      before do
+        Writer.new @buffer do |w|
+          w << "foo"
+          w << "bar"
+          w.dump!
+          w << "baz"
+          w << "quux"
+        end
+        @buffer.rewind
+      end
+
+      it "should yield each chunk" do
+        chunks = []
+        Reader.new(@buffer).each do |chunk|
+          chunks << chunk
+        end
+        chunks.should == ["foobar", "bazquux"]
+      end
+    end
+
+    describe :read do
+      before do
+        Writer.new @buffer do |w|
+          w << "foo"
+          w << "bar"
+          w << "baz"
+          w << "quux"
+        end
+        @buffer.rewind
+      end
+
+      it "should return the bytes" do
+        Reader.new(@buffer).read.should == "foobarbazquux"
+      end
+    end
+
+    describe :each_line do
+      before do
+        Writer.new @buffer do |w|
+          w << "foo\n"
+          w << "bar"
+          w.dump!
+          w << "baz\n"
+          w << "quux\n"
+        end
+        @buffer.rewind
+      end
+
+      it "should yield each line" do
+        lines = []
+        Reader.new(@buffer).each_line do |line|
+          lines << line
+        end
+        lines.should == ["foo", "barbaz", "quux"]
+      end
+    end
+  end
+end

data/spec/snappy/writer_spec.rb

@@ -0,0 +1,52 @@
+require "spec_helper"
+
+module Snappy
+  describe Writer do
+    before do
+      @buffer = StringIO.new
+    end
+
+    subject do
+      Writer.new @buffer
+    end
+
+    describe :initialize do
+      it "should yield itself to the block" do
+        yielded = nil
+        returned = Writer.new @buffer do |w|
+          yielded = w
+        end
+        returned.should == yielded
+      end
+
+      it "should write the header" do
+        subject.io.string.should == [Writer::MAGIC, Writer::DEFAULT_VERSION, Writer::MINIMUM_COMPATIBLE_VERSION].pack("a8NN")
+      end
+
+      it "should dump on the end of yield" do
+        Writer.new @buffer do |w|
+          w << "foo"
+        end
+        foo = Snappy.deflate "foo"
+        @buffer.string[16, @buffer.size - 16].should == [foo.size, foo].pack("Na#{foo.size}")
+      end
+    end
+
+    describe :io do
+      it "should be a constructor argument" do
+        io = StringIO.new
+        Writer.new(io).io.should == io
+      end
+    end
+
+    describe :block_size do
+      it "should default to DEFAULT_BLOCK_SIZE" do
+        Writer.new(StringIO.new).block_size.should == Writer::DEFAULT_BLOCK_SIZE
+      end
+
+      it "should be settable via the constructor" do
+        Writer.new(StringIO.new, 42).block_size.should == 42
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rbconfig'
 require 'rspec'
-require 'snappy'
+require "snappy.#{RbConfig::CONFIG['DLEXT']}"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,94 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: snappy
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - miyucy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-12-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  requirement: *id001
+      - !ruby/object:Gem::Version
+        version: 2.11.0
   type: :development
   prerelease: false
-  name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id002
-  type: :development
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
   name: bundler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  requirement: *id003
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
   name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: libsnappy binding for Ruby
 email: miyucy@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -99,42 +94,38 @@ files:
 - VERSION
 - ext/api.cc
 - ext/extconf.rb
+- lib/snappy/reader.rb
+- lib/snappy/writer.rb
 - snappy.gemspec
-- spec/snappy_spec.rb
+- spec/snappy/reader_spec.rb
+- spec/snappy/writer_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/miyucy/snappy
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3623024739862961287
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: libsnappy binding for Ruby
-test_files: 
-- spec/snappy_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/snappy_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Snappy" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end