brotli 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db97ceae85d640608de26f0cc8930f42d8c8e97
-  data.tar.gz: e3dc5d0c2727226addd3ffad366becda46f1b39a
+  metadata.gz: 533f1ae25b8fdd5f75c4b02c543ce60066810746
+  data.tar.gz: d93a9dfbbee23934a83a28518fea21773bc63dda
 SHA512:
-  metadata.gz: 5596010d1556a0800a9b28b3512023a5624a8b3e0fc18b46d2ca5677578de44fe4e4390958f2f7832b4b3327341ffd113f00f32ca0eb9674b9ce9aa49a2ebbdd
-  data.tar.gz: 458b5a8cc280cefc6ef18fecb40dc10ad944a8179deab1cae12132cec9a5bf8018857aa0ee5fefd5ef8903967ad33563ba0ccc0f54078d26a4ac2975e8eee310
+  metadata.gz: 4c7c09a594b947d6708ed41af3816c9e2772bf7561f6bb07d5612538bdcc77b762d5d37440e4a8e5fa80826f18fa7febb3b49d6d12cc03a172e749027c34202e
+  data.tar.gz: 23ee8ab5139f369cff367d5fa8307c3ad9f9405ddebcd93306413eeca5a49f2e506750f492caf47034819ac5eab4d5f7ecf091ff9f1d1d3ff47e7e5a610ac30a

data/.travis.yml

@@ -5,6 +5,7 @@ cache:
   directories:
     - "$HOME/.ccache"
 rvm:
+  - 1.9.3
   - 2.2.0
   - 2.3.3
   - 2.4.0

data/README.md

@@ -1,8 +1,11 @@
-# Brotli ![](https://travis-ci.org/miyucy/brotli.svg)
+# Brotli [![](https://travis-ci.org/miyucy/brotli.svg)](https://travis-ci.org/miyucy/brotli)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/brotli`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Brotli is a Ruby implementation of the Brotli generic-purpose lossless
+compression algorithm that compresses data using a combination of a modern
+variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling,
+with a compression ratio comparable to the best currently available
+general-purpose compression methods. It is similar in speed with deflate but
+offers more dense compression.
 
 ## Installation
 
@@ -32,7 +35,9 @@ See spec/brotli_spec.rb
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Run `rake build` to build brotli extension for ruby. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install bundle and Brotli C library dependencies.
+
+Run `rake build` to build brotli extension for ruby. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/bin/setup

@@ -4,4 +4,5 @@ IFS=$'\n\t'
 
 bundle install
 
-# Do any other automated setup that you need to do here
+# Ensure Brotli library dependencies are available
+git submodule update --init

data/ext/brotli/brotli.c

@@ -85,7 +85,11 @@ brotli_inflate(VALUE self, VALUE str)
                                          NULL);
     args.r = BROTLI_RESULT_ERROR;
 
+#ifdef HAVE_RUBY_THREAD_H
     rb_thread_call_without_gvl(brotli_inflate_no_gvl, (void *)&args, NULL, NULL);
+#else
+    brotli_inflate_no_gvl((void *)&args);
+#endif
     if (args.r == BROTLI_DECODER_RESULT_SUCCESS) {
         value = rb_str_new(args.buffer->ptr, args.buffer->used);
         delete_buffer(args.buffer);
@@ -254,7 +258,11 @@ brotli_deflate(int argc, VALUE *argv, VALUE self)
     args.buffer = create_buffer(BUFSIZ);
     args.finished = BROTLI_FALSE;
 
+#ifdef HAVE_RUBY_THREAD_H
     rb_thread_call_without_gvl(brotli_deflate_no_gvl, (void *)&args, NULL, NULL);
+#else
+    brotli_deflate_no_gvl((void *)&args);
+#endif
     if (args.finished == BROTLI_TRUE) {
         value = rb_str_new(args.buffer->ptr, args.buffer->used);
     }

data/ext/brotli/brotli.h

@@ -2,7 +2,12 @@
 #define BROTLI_H 1
 
 #include "ruby.h"
+
+// ruby/thread.h is ruby 2.x
+#ifdef HAVE_RUBY_THREAD_H
 #include "ruby/thread.h"
+#endif
+
 #include "enc/encode.h"
 #include "dec/decode.h"
 #include "buffer.h"

data/ext/brotli/extconf.rb

@@ -8,11 +8,11 @@ create_makefile('brotli/brotli')
 
 def acopy(dir)
   # source dir
-  FileUtils.mkdir_p File.expand_path(File.join(__dir__, dir))
+  FileUtils.mkdir_p File.expand_path(File.join(File.dirname(__FILE__), dir))
   # object dir
   FileUtils.mkdir_p dir
 
-  files = Dir[File.expand_path(File.join(__dir__, '..', '..', 'vendor', 'brotli', dir, '*.[ch]'))]
+  files = Dir[File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'brotli', dir, '*.[ch]'))]
   FileUtils.cp files, dir, verbose: true
 
   srcs = files.map { |e| File.basename e }.select { |e| e.end_with? '.c' }.map { |e| File.join(dir, e) }

data/lib/brotli/version.rb

@@ -1,3 +1,3 @@
 module Brotli
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/brotli_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'zlib'
 
 describe Brotli do
-  let!(:data) { File.binread File.expand_path(File.join(__dir__, '..', 'vendor', 'brotli', 'tests', 'testdata', 'alice29.txt'), __FILE__) }
+  let!(:data) { File.binread File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'brotli', 'tests', 'testdata', 'alice29.txt'), __FILE__) }
 
   context 'deflate/inflate' do
     it 'with example data' do
@@ -82,7 +82,7 @@ describe Brotli do
   end
 
   it 'inflate' do
-    compressed = File.binread File.expand_path(File.join(__dir__, '..', 'vendor', 'brotli', 'tests', 'testdata', 'alice29.txt.compressed'), __FILE__)
+    compressed = File.binread File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'brotli', 'tests', 'testdata', 'alice29.txt.compressed'), __FILE__)
     expect(Brotli.inflate(compressed)).to eq data
   end
 end

data/spec/inflate_spec.rb

@@ -5,7 +5,7 @@ require 'thread'
 describe Brotli do
   context 'deflate' do
     let(:sample) { 10 }
-    let(:datum) { File.binread File.expand_path(File.join(__dir__, '..', 'vendor', 'brotli', 'tests', 'testdata', 'lcet10.txt'), __FILE__) }
+    let(:datum) { File.binread File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'brotli', 'tests', 'testdata', 'lcet10.txt'), __FILE__) }
     let!(:data) { sample.times.map { datum.dup } }
 
     it 'seq' do
@@ -39,7 +39,7 @@ describe Brotli do
 
   context 'inflate' do
     let(:sample) { 1000 }
-    let(:datum) { File.binread File.expand_path(File.join(__dir__, '..', 'vendor', 'brotli', 'tests', 'testdata', 'lcet10.txt.compressed'), __FILE__) }
+    let(:datum) { File.binread File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'brotli', 'tests', 'testdata', 'lcet10.txt.compressed'), __FILE__) }
     let!(:data) { sample.times.map { datum.dup } }
 
     it 'seq' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brotli
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler