rbzip2 0.2.0 → 0.3.0

data/lib/rbzip2/{input_data.rb → ruby/input_data.rb}

@@ -1,11 +1,11 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011, Sebastian Staudt
+# Copyright (c) 2011-2017, Sebastian Staudt
 
-class RBzip2::InputData
+class RBzip2::Ruby::InputData
 
-  include RBzip2::Constants
+  include RBzip2::Ruby::Constants
 
   attr_reader :base, :cftab, :get_and_move_to_front_decode_yy, :in_use,
               :limit, :ll8, :min_lens, :perm, :receive_decoding_tables_pos,
@@ -21,31 +21,21 @@ class RBzip2::InputData
 
     @unzftab = Array.new 256, 0
 
-    @base = Array.new N_GROUPS
-    N_GROUPS.times { |i| @base[i] = Array.new(MAX_ALPHA_SIZE, 0) }
-    @limit = Array.new N_GROUPS
-    N_GROUPS.times { |i| @limit[i] = Array.new(MAX_ALPHA_SIZE, 0) }
-    @perm = Array.new N_GROUPS
-     N_GROUPS.times { |i| @perm[i] = Array.new(MAX_ALPHA_SIZE, 0) }
+    @base = Array.new(N_GROUPS) { Array.new(MAX_ALPHA_SIZE, 0) }
+    @limit = Array.new(N_GROUPS) { Array.new(MAX_ALPHA_SIZE, 0) }
+    @perm = Array.new(N_GROUPS) { Array.new(MAX_ALPHA_SIZE, 0) }
     @min_lens = Array.new N_GROUPS, 0
 
     @cftab = Array.new 257, 0
     @get_and_move_to_front_decode_yy = Array.new 256
-    @temp_char_array_2d = Array.new N_GROUPS
-    N_GROUPS.times { |i| @temp_char_array_2d[i] = Array.new(MAX_ALPHA_SIZE, 0) }
+    @temp_char_array_2d = Array.new(N_GROUPS) { Array.new(MAX_ALPHA_SIZE, 0) }
     @receive_decoding_tables_pos = Array.new N_GROUPS, 0
 
     @ll8 = Array.new block_size * BASEBLOCKSIZE
   end
 
   def init_tt(size)
-    tt_shadow = @tt
-
-    if tt_shadow.nil? || tt_shadow.size < size
-      @tt = tt_shadow = Array.new(size)
-    end
-
-    tt_shadow
+    @tt = Array.new(size) if @tt.nil? || @tt.size < size
   end
 
 end

data/lib/rbzip2/{output_data.rb → ruby/output_data.rb}

@@ -1,11 +1,11 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011, Sebastian Staudt
+# Copyright (c) 2011-2013, Sebastian Staudt
 
-class RBzip2::OutputData
+class RBzip2::Ruby::OutputData
 
-  include RBzip2::Constants
+  include RBzip2::Ruby::Constants
 
   attr_reader :block, :ftab, :fmap, :generate_mtf_values_yy, :heap, :in_use,
               :main_sort_big_done, :main_sort_copy, :main_sort_running_order,
@@ -30,14 +30,11 @@ class RBzip2::OutputData
     @unseq_to_seq = Array.new 256
 
     @generate_mtf_values_yy = Array.new 256
-    @send_mtf_values_code   = Array.new N_GROUPS
-    N_GROUPS.times { |i| @send_mtf_values_code[i] = Array.new MAX_ALPHA_SIZE }
+    @send_mtf_values_code   = Array.new(N_GROUPS) { Array.new MAX_ALPHA_SIZE }
     @send_mtf_values_cost   = Array.new N_GROUPS
     @send_mtf_values_fave   = Array.new N_GROUPS
-    @send_mtf_values_len    = Array.new N_GROUPS
-    N_GROUPS.times { |i| @send_mtf_values_len[i] = Array.new MAX_ALPHA_SIZE }
-    @send_mtf_values_rfreq  = Array.new N_GROUPS
-    N_GROUPS.times { |i| @send_mtf_values_rfreq[i] = Array.new MAX_ALPHA_SIZE, 0 }
+    @send_mtf_values_len    = Array.new(N_GROUPS) { Array.new MAX_ALPHA_SIZE }
+    @send_mtf_values_rfreq  = Array.new(N_GROUPS) { Array.new MAX_ALPHA_SIZE }
     @send_mtf_values2_pos   = Array.new N_GROUPS
     @send_mtf_values4_in_use_16 = Array.new 16
 

data/lib/rbzip2/version.rb

@@ -1,10 +1,10 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011, Sebastian Staudt
+# Copyright (c) 2011-2017, Sebastian Staudt
 
 module RBzip2
 
-  VERSION = '0.2.0' unless const_defined? :VERSION
+  VERSION = '0.3.0' unless const_defined? :VERSION
 
 end

data/spec/common/compressor_spec.rb

@@ -0,0 +1,68 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2017, Sebastian Staudt
+
+require 'base64'
+
+require 'helper'
+
+shared_examples_for 'a compressor' do
+
+  before do
+    @io = StringIO.new
+    @bz2_compressor = described_class.new @io
+  end
+
+  it 'acts like a standard IO' do
+    methods = described_class.instance_methods.map &:to_sym
+    expect(methods).to include(:close, :putc, :puts, :write)
+  end
+
+  it 'should be able to compress raw data' do
+    txt_file = fixture 'fixtures/test.txt'
+    bz2_file  = fixture 'fixtures/test.bz2'
+    @bz2_compressor.write txt_file.read
+    @bz2_compressor.close
+
+    expect(@io.string).to eq(bz2_file.read)
+  end
+
+  it 'should be able to compress large raw data' do
+    txt_file = fixture 'fixtures/big_test.txt'
+    suffix = '.' + described_class.name.split('::')[1].downcase
+    suffix = '' if suffix == '.ffi'
+    bz2_file = fixture "fixtures/big_test#{suffix}.bz2"
+    @bz2_compressor.write txt_file.read
+    @bz2_compressor.close
+
+    expect(@io.string).to eq(bz2_file.read)
+  end
+
+  it 'should be able to compress a single character' do
+    @bz2_compressor.putc 'T'
+    @bz2_compressor.putc 'e'
+    @bz2_compressor.putc 's'
+    @bz2_compressor.putc 't'
+    @bz2_compressor.close
+
+    base64_result = Base64.encode64 @io.string
+
+    expect(`echo "#{base64_result}" | base64 --decode | bzcat`).to eq('Test')
+  end
+
+  it 'should be able to compress a line of text' do
+    @bz2_compressor.puts 'Test 1'
+    @bz2_compressor.puts 'Test 2'
+    @bz2_compressor.close
+
+    base64_result = Base64.encode64 @io.string
+
+    expect(`echo "#{base64_result}" | base64 --decode | bzcat`).to eq("Test 1#{$/}Test 2#{$/}")
+  end
+
+  after do
+    @bz2_compressor.close unless @bz2_compressor.nil?
+  end
+
+end

data/spec/common/decompressor_spec.rb

@@ -0,0 +1,63 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2017, Sebastian Staudt
+
+require 'helper'
+
+shared_examples_for 'a decompressor' do
+
+  it 'acts like a standard IO' do
+    methods = described_class.instance_methods.map { |m| m.to_sym }
+    expect(methods).to include(:close, :getc, :gets, :read)
+  end
+
+  it 'knows its size' do
+    bz2_file = fixture 'fixtures/test.bz2'
+    bz2_decompressor = described_class.new bz2_file
+
+    expect(bz2_decompressor.size).to eq(375)
+  end
+
+  it 'knows the size of the uncompressed data' do
+    bz2_file = fixture 'fixtures/test.bz2'
+    bz2_decompressor = described_class.new bz2_file
+
+    expect(bz2_decompressor.uncompressed).to eq(704)
+  end
+
+  it 'should be able to decompress compressed data' do
+    bz2_file = fixture 'fixtures/test.bz2'
+    bz2_decompressor = described_class.new bz2_file
+    txt_file = fixture 'fixtures/test.txt'
+
+    expect(bz2_decompressor.read).to eq(txt_file.read)
+  end
+
+  it 'should be able to decompress large compressed data' do
+    txt_file = fixture 'fixtures/big_test.txt'
+    bz2_file = fixture 'fixtures/big_test.bz2'
+    bz2_decompressor = described_class.new bz2_file
+
+    expect(bz2_decompressor.read).to eq(txt_file.read)
+  end
+
+  it 'should be able to decompress a single character from compressed data' do
+    bz2_file = fixture 'fixtures/test.bz2'
+    bz2_decompressor = described_class.new bz2_file
+
+    expect(bz2_decompressor.getc).to eq('T')
+    expect(bz2_decompressor.getc).to eq('h')
+    expect(bz2_decompressor.getc).to eq('i')
+    expect(bz2_decompressor.getc).to eq('s')
+    expect(bz2_decompressor.getc).to eq(' ')
+  end
+
+  it 'should be able to decompress a single line from compressed data' do
+    bz2_file = fixture 'fixtures/test.bz2'
+    bz2_decompressor = described_class.new bz2_file
+
+    expect(bz2_decompressor.gets).to eq("This is a test fixture for RBzip2.\n")
+  end
+
+end

data/spec/ffi/compressor_spec.rb

@@ -0,0 +1,12 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2013-2017, Sebastian Staudt
+
+require 'helper'
+
+describe RBzip2::FFI::Compressor do
+
+  it_behaves_like 'a compressor'
+
+end

data/spec/ffi/decompressor_spec.rb

@@ -0,0 +1,12 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2013-2017, Sebastian Staudt
+
+require 'helper'
+
+describe RBzip2::FFI::Decompressor do
+
+  it_behaves_like 'a decompressor'
+
+end

data/spec/java/compressor_spec.rb

@@ -0,0 +1,12 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2013-2017, Sebastian Staudt
+
+require 'helper'
+
+describe RBzip2::Java::Compressor do
+
+  it_behaves_like 'a compressor'
+
+end if java?

data/spec/java/decompressor_spec.rb

@@ -0,0 +1,12 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2013-2017, Sebastian Staudt
+
+require 'helper'
+
+describe RBzip2::Java::Decompressor do
+
+  it_behaves_like 'a decompressor'
+
+end if java?

data/spec/ruby/compressor_spec.rb

@@ -0,0 +1,12 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2011-2017, Sebastian Staudt
+
+require 'helper'
+
+describe RBzip2::Ruby::Compressor do
+
+  it_behaves_like 'a compressor'
+
+end

data/spec/ruby/decompressor_spec.rb

@@ -0,0 +1,12 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2011-2017, Sebastian Staudt
+
+require 'helper'
+
+describe RBzip2::Ruby::Decompressor do
+
+  it_behaves_like 'a decompressor'
+
+end

metadata

@@ -1,175 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbzip2
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Sebastian Staudt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
-        version: 0.10.0
-  prerelease: false
-  name: mocha
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  prerelease: false
-  name: rake
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 2
-        - 7
-        - 1
-        version: 2.7.1
-  prerelease: false
-  name: rspec-core
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
-  prerelease: false
-  name: rspec-expectations
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
-        version: 0.7.3
-  prerelease: false
-  name: yard
-  version_requirements: *id005
-description: A pure Ruby implementation of the bzip2 compression algorithm.
-email: 
+date: 2017-02-16 00:00:00.000000000 Z
+dependencies: []
+description: Various bzip2 implementations for Ruby.
+email:
 - koraktor@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gemtest
-- .gitignore
-- .travis.yml
-- Gemfile
-- Gemfile.lock
+files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/core_ext/io.rb
 - lib/rbzip2.rb
-- lib/rbzip2/compressor.rb
-- lib/rbzip2/constants.rb
-- lib/rbzip2/crc.rb
-- lib/rbzip2/decompressor.rb
-- lib/rbzip2/input_data.rb
+- lib/rbzip2/adapter.rb
+- lib/rbzip2/ffi.rb
+- lib/rbzip2/ffi/compressor.rb
+- lib/rbzip2/ffi/constants.rb
+- lib/rbzip2/ffi/decompressor.rb
+- lib/rbzip2/ffi/errors.rb
 - lib/rbzip2/io.rb
-- lib/rbzip2/output_data.rb
+- lib/rbzip2/java.rb
+- lib/rbzip2/java/compressor.rb
+- lib/rbzip2/java/decompressor.rb
+- lib/rbzip2/ruby.rb
+- lib/rbzip2/ruby/compressor.rb
+- lib/rbzip2/ruby/constants.rb
+- lib/rbzip2/ruby/crc.rb
+- lib/rbzip2/ruby/decompressor.rb
+- lib/rbzip2/ruby/input_data.rb
+- lib/rbzip2/ruby/output_data.rb
 - lib/rbzip2/version.rb
-- rbzip2.gemspec
-- spec/compressor_spec.rb
-- spec/decompressor_spec.rb
-- spec/fixtures/big_test.bz2
-- spec/fixtures/big_test.txt
-- spec/fixtures/test.bz2
-- spec/fixtures/test.txt
-- spec/helper.rb
+- spec/common/compressor_spec.rb
+- spec/common/decompressor_spec.rb
+- spec/ffi/compressor_spec.rb
+- spec/ffi/decompressor_spec.rb
+- spec/java/compressor_spec.rb
+- spec/java/decompressor_spec.rb
+- spec/ruby/compressor_spec.rb
+- spec/ruby/decompressor_spec.rb
 homepage: https://github.com/koraktor/rbzip2
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.6.10
 signing_key: 
-specification_version: 3
-summary: Pure Ruby impementation of bzip2
-test_files: 
-- spec/compressor_spec.rb
-- spec/decompressor_spec.rb
-- spec/fixtures/big_test.bz2
-- spec/fixtures/big_test.txt
-- spec/fixtures/test.bz2
-- spec/fixtures/test.txt
-- spec/helper.rb
+specification_version: 4
+summary: bzip2 for Ruby
+test_files:
+- spec/common/compressor_spec.rb
+- spec/common/decompressor_spec.rb
+- spec/ffi/compressor_spec.rb
+- spec/ffi/decompressor_spec.rb
+- spec/java/compressor_spec.rb
+- spec/java/decompressor_spec.rb
+- spec/ruby/compressor_spec.rb
+- spec/ruby/decompressor_spec.rb