lz4-ruby 0.3.1-java → 0.3.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0550566ae8059fe9f3fd846db15c7ee8ad0631
-  data.tar.gz: 0c71cc2ea1124c5ec44239b4f9d74923ef4104ce
+  metadata.gz: 46342a69f114dbe815b41b9c16e576ccba9d3e54
+  data.tar.gz: b5d4f6518cb521d7a20686518cca2056d62d866e
 SHA512:
-  metadata.gz: 56e8cf48de27bd2c6a20e4348db88def98775306cae4f2b3c41ea19205d187211245db97018ca4768df444aac6d822dc40c7262d1becea0c366cc7fc1e7733ae
-  data.tar.gz: afeb6ced50eb7e54e2aebac74eab64ecb372b1366f146a1f3f547ebf406ed262ce5c045a35e4e5df07b527bfe9e64ed26fff53b59607add26ca6dfe5f68495f8
+  metadata.gz: f15c4c7f11535570d7d3cb2d07d4fca537e7e6f123985648a43e9be26fca26fb5385192a5df2a3e25702f4e14466e6415cc57eafff145c84413d38339c4a0083
+  data.tar.gz: 4649de937928772cf82a390643af99dff4a48c91a691addc03e09784e05d2b843551c6b1dba46918c83c07c363a6bb9f54b5f19abb1de06066c026d5049dcc22

data/CHANGELOG.rdoc

@@ -1,9 +1,13 @@
 = ChangeLog
 
+== 0.3.1
+
+* Support raw data handling methods in JRuby
+
 == 0.3.0
 
-* Support raw data stream handling methods (but not worked in JRuby). 
-  * +LZ4.Raw.compress()+
-  * +LZ4.Raw.compressHC()+
-  * +LZ4.Raw.decompress()+
-* Rename +LZ4.uncompress()+ to +LZ4.decompress()+ .
+* Support raw data handling methods (but not worked in JRuby). 
+  * LZ4.Raw.compress()
+  * LZ4.Raw.compressHC()
+  * LZ4.Raw.decompress()
+* Rename LZ4.uncompress() to LZ4.decompress().

data/Rakefile

@@ -28,6 +28,8 @@ jeweler_tasks = Jeweler::Tasks.new do |gem|
   
   gem.files.include("ext/lz4ruby/*.c")
   gem.files.include("ext/lz4ruby/*.h")
+
+  gem.required_ruby_version = '>= 1.9'
   
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/lz4-ruby.rb

@@ -17,15 +17,18 @@ class LZ4
     return _compress(input, in_size, true)
   end
   
-  def self.decompress(input, in_size = nil)
-    in_size = input.length if in_size == nil
+  def self.decompress(input, in_size = nil, encoding = nil)
+    in_size = input.bytesize if in_size == nil
     out_size, varbyte_len = decode_varbyte(input)
 
     if out_size < 0 || varbyte_len < 0
       raise "Compressed data is maybe corrupted"
     end
     
-    return LZ4Internal::uncompress(input, in_size, varbyte_len, out_size)
+    result = LZ4Internal::uncompress(input, in_size, varbyte_len, out_size)
+    result.force_encoding(encoding) if encoding != nil
+
+    return result
   end
 
   # @deprecated Use {#decompress} and will be removed.
@@ -35,7 +38,7 @@ class LZ4
 
   private
   def self._compress(input, in_size, high_compression)
-    in_size = input.length if in_size == nil
+    in_size = input.bytesize if in_size == nil
     header = encode_varbyte(in_size)
 
     if high_compression
@@ -66,7 +69,7 @@ class LZ4
 
   private
   def self.decode_varbyte(text)
-    len = [text.length, 5].min
+    len = [text.bytesize, 5].min
     bytes = text[0, len].unpack("C*")
 
     varbyte_len = 0
@@ -86,7 +89,7 @@ class LZ4
     #
     # @param [String] source string to be compressed
     # @param [Hash] options
-    # @option options [Fixnum] :input_size length of source to compress (must be less than or equal to `source.length`)
+    # @option options [Fixnum] :input_size byte size of source to compress (must be less than or equal to `source.bytesize`)
     # @option options [String] :dest output buffer which will receive compressed string
     # @option options [Fixnum] :max_output_size acceptable maximum output size
     # @return [String, Fixnum] compressed string and its length.
@@ -98,7 +101,7 @@ class LZ4
     #
     # @param [String] source string to be compressed
     # @param [Hash] options
-    # @option options [Fixnum] :input_size length of source to compress (must be less than or equal to `source.length`)
+    # @option options [Fixnum] :input_size byte size of source to compress (must be less than or equal to `source.bytesize`)
     # @option options [String] :dest output buffer which will receive compressed string
     # @option options [Fixnum] :max_output_size acceptable maximum output size
     # @return [String, Fixnum] compressed string and its length.
@@ -106,15 +109,15 @@ class LZ4
       return _compress(source, true, options)
     end
 
-    private 
+    private
     def self._compress(source, high_compression, options = {})
       input_size = options[:input_size]
       if input_size == nil
-        input_size = source.length
+        input_size = source.bytesize
 
       else
-        if source.length < input_size
-          raise ArgumentError, "`:input_size` (#{input_size}) must be less than or equal `source.length` (#{source.length})"
+        if source.bytesize < input_size
+          raise ArgumentError, "`:input_size` (#{input_size}) must be less than or equal `source.bytesize` (#{source.bytesize})"
         end
       end
 
@@ -123,14 +126,14 @@ class LZ4
       max_output_size = options[:max_output_size]
       if max_output_size == nil
         if dest != nil
-          max_output_size = dest.length
+          max_output_size = dest.bytesize
         else
           max_output_size = input_size + (input_size / 255) + 16 if dest == nil
         end
 
       else
-        if dest != nil && dest.length < max_output_size
-          raise ArgumentError, "`:dest` buffer size (#{dest.length}) must be greater than or equal `:max_output_size` (#{max_output_size})"
+        if dest != nil && dest.bytesize < max_output_size
+          raise ArgumentError, "`:dest` buffer size (#{dest.bytesize}) must be greater than or equal `:max_output_size` (#{max_output_size})"
         end
       end
 
@@ -153,24 +156,24 @@ class LZ4
     # @param [String] source
     # @param [Fixnum] max_output_size
     # @param [Hash] options
-    # @option options [Fixnum] :input_size length of source to decompress (must be less than or equal to `source.length`)
+    # @option options [Fixnum] :input_size byte size of source to decompress (must be less than or equal to `source.bytesize`)
     # @option options [String] :dest output buffer which will receive decompressed string
     # @return [String, Fixnum] decompressed string and its length.
     def self.decompress(source, max_output_size, options = {})
       input_size = options[:input_size]
       if input_size == nil
-        input_size = source.length
+        input_size = source.bytesize
 
       else
-        if source.length < input_size
-          raise ArgumentError, "`:input_size` (#{input_size}) must be less than or equal `source.length` (#{source.length})"
+        if source.bytesize < input_size
+          raise ArgumentError, "`:input_size` (#{input_size}) must be less than or equal `source.bytesize` (#{source.bytesize})"
         end
       end
 
       dest = options[:dest]
 
-      if dest != nil && dest.length < max_output_size
-        raise ArgumentError, "`:dest` buffer size (#{dest.length}) must be greater than or equal `max_output_size` (#{max_output_size})"
+      if dest != nil && dest.bytesize < max_output_size
+        raise ArgumentError, "`:dest` buffer size (#{dest.bytesize}) must be greater than or equal `max_output_size` (#{max_output_size})"
       end
 
       result = LZ4Internal.decompress_raw(source, input_size, dest, max_output_size)

data/spec/lz4_compressHC_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require './spec/helper'
 
 describe "LZ4::compress" do
@@ -5,24 +7,24 @@ describe "LZ4::compress" do
 
   context "give empty text" do
     compressed = LZ4.compressHC("")
-    uncompressed = LZ4.uncompress(compressed)
+    decompressed = LZ4.decompress(compressed)
 
-    it "should be able to uncompress" do
-      expect(uncompressed).to eql("")
+    it "should be able to decompress" do
+      expect(decompressed).to eql("")
     end
   end
 
   context "give long text" do
     text = "a" * 131073
     compressed = LZ4.compressHC(text)
-    uncompressed = LZ4.uncompress(compressed)
+    decompressed = LZ4.decompress(compressed)
 
     it "should be compressed length less than original text" do
-      expect(compressed.size).to be < text.length
+      expect(compressed.bytesize).to be < text.bytesize
     end
 
-    it "should be able to uncompress" do
-      expect(uncompressed).to eql(text)
+    it "should be able to decompress" do
+      expect(decompressed).to eql(text)
     end
   end
 
@@ -32,12 +34,12 @@ describe "LZ4::compress" do
 
     context "give text of #{len} \"a\"'s" do
       compressed = LZ4.compressHC(text)
-      uncompressed = LZ4.uncompress(compressed)
-      it "should be able to uncompress" do
-        expect(uncompressed).to eql(text)
+      decompressed = LZ4.decompress(compressed)
+      it "should be able to decompress" do
+        expect(decompressed).to eql(text)
       end
     end
-  end  
+  end
 
   LOOP_COUNT.times do |t|
     len = t + 1
@@ -45,10 +47,19 @@ describe "LZ4::compress" do
 
     context "give text of #{len} bytes" do
       compressed = LZ4.compressHC(text)
-      uncompressed = LZ4.uncompress(compressed)
-      it "should be able to uncompress" do
-        expect(uncompressed).to eql(text)
+      decompressed = LZ4.decompress(compressed)
+      it "should be able to decompress" do
+        expect(decompressed).to eql(text)
       end
     end
-  end  
+  end
+
+  context "give UTF-8 text" do
+    text = "いろはにほへと"
+    compressed = LZ4.compressHC(text)
+    decompressed = LZ4.decompress(compressed, compressed.bytesize, "UTF-8")
+    it "should be able to decompress" do
+      expect(decompressed).to eql(text)
+    end
+  end
 end

data/spec/lz4_compress_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require './spec/helper'
 
 describe "LZ4::compress" do
@@ -5,24 +7,24 @@ describe "LZ4::compress" do
 
   context "give empty text" do
     compressed = LZ4.compress("")
-    uncompressed = LZ4.uncompress(compressed)
+    decompressed = LZ4.decompress(compressed)
 
-    it "should be able to uncompress" do
-      expect(uncompressed).to eql("")
+    it "should be able to decompress" do
+      expect(decompressed).to eql("")
     end
   end
 
   context "give long text" do
     text = "a" * 131073
     compressed = LZ4.compress(text)
-    uncompressed = LZ4.uncompress(compressed)
+    decompressed = LZ4.decompress(compressed)
 
     it "should be compressed length less than original text" do
       expect(compressed.size).to be < text.length
     end
 
-    it "should be able to uncompress" do
-      expect(uncompressed).to eql(text)
+    it "should be able to decompress" do
+      expect(decompressed).to eql(text)
     end
   end
 
@@ -32,9 +34,9 @@ describe "LZ4::compress" do
 
     context "give text of #{len} \"a\"'s" do
       compressed = LZ4.compress(text)
-      uncompressed = LZ4.uncompress(compressed)
-      it "should be able to uncompress" do
-        expect(uncompressed).to eql(text)
+      decompressed = LZ4.decompress(compressed)
+      it "should be able to decompress" do
+        expect(decompressed).to eql(text)
       end
     end
   end  
@@ -45,10 +47,19 @@ describe "LZ4::compress" do
 
     context "give text of #{len} bytes" do
       compressed = LZ4.compress(text)
-      uncompressed = LZ4.uncompress(compressed)
-      it "should be able to uncompress" do
-        expect(uncompressed).to eql(text)
+      decompressed = LZ4.decompress(compressed)
+      it "should be able to decompress" do
+        expect(decompressed).to eql(text)
       end
     end
   end  
+
+  context "give UTF-8 text" do
+    text = "いろはにほへと"
+    compressed = LZ4.compress(text)
+    decompressed = LZ4.decompress(compressed, compressed.bytesize, "UTF-8")
+    it "should be able to decompress" do
+      expect(decompressed).to eql(text)
+    end
+  end
 end

data/spec/lz4_raw_compress_spec.rb

@@ -54,7 +54,7 @@ describe "LZ4::Raw::compress" do
         it "should be thrown ArgumentError" do
           expect {
             compressed, size = LZ4::Raw.compress(text, :input_size => input_size)
-          }.to raise_error(ArgumentError, "`:input_size` (30) must be less than or equal `source.length` (20)")
+          }.to raise_error(ArgumentError, "`:input_size` (30) must be less than or equal `source.bytesize` (20)")
         end
       end
     end

data/spec/lz4_raw_decompress_spec.rb

@@ -55,7 +55,7 @@ describe "LZ4::Raw.decompress" do
         it "should be thrown ArgumentError" do
           expect {
             decompressed, size = LZ4::Raw.decompress(compressed.pack("C*"), 30, :input_size => input_size)
-          }.to raise_error ArgumentError, "`:input_size` (20) must be less than or equal `source.length` (#{compressed.length})"
+          }.to raise_error ArgumentError, "`:input_size` (20) must be less than or equal `source.bytesize` (#{compressed.length})"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lz4-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: java
 authors:
 - KOMIYA Atsushi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='