brotli 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d92a3a7993458434aaf46196d3369edca153048f
-  data.tar.gz: a9400e59513dbaf9b759195c80c835eda9fae32d
+  metadata.gz: 8a84cc7be2ff8f77b71c2a257ca25211a9c3ca23
+  data.tar.gz: bb07eb56c3ae937a98b6cd6c80589ca773562a0f
 SHA512:
-  metadata.gz: 6602d2c5ae2f26d3f9083a38a84fdd172e9c86e0f0cefe21fd5826c52c16c32d928c092ac91133906c9c9e18ab67142f00b010bc945b33184bbf3e87130aa8f7
-  data.tar.gz: f5f88a8cba028b0f9048786913199d82d2b2c7405478b14980ec82f31c7e7499471f42410e956fb6c17b56ad1bdef0aa424ca794c45be49eac340d3a2b5cd805
+  metadata.gz: 5fe7de8328e763d815eeaf6c031998fecf3a8e1bf85130808207de71a39311eb7c5cae3abc9f0f7fd2a31c5cc93b50184b1c097f76bf9e3a35a669d959647e72
+  data.tar.gz: f4814c98c1066b5aa9f06125d19ccbfe6ff3828abacce332baa39da79bc3eb27bf864d157e33dcc5c30ceec0c3c060b438ffb328d97c0f6d9aab120460ab3b38

data/.gitmodules

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

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
   - 2.2.0
-before_install: gem install bundler -v 1.10.6
+before_install:
+  - gem install bundler

data/README.md

@@ -1,4 +1,4 @@
-# Brotli
+# Brotli ![](https://travis-ci.org/miyucy/brotli.svg)
 
 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.
 

data/Rakefile

@@ -3,7 +3,7 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => [:compile, :spec]
 require "rake/extensiontask"
 
 task :build => :compile

data/ext/brotli/brotli.cc

@@ -3,7 +3,7 @@
 static VALUE rb_mBrotli;
 static VALUE rb_eBrotli;
 
-int
+static int
 brotli_inflate_cb(void* data, const uint8_t* buf, size_t count)
 {
     VALUE dst = (VALUE)data;

data/ext/brotli/extconf.rb

@@ -2,23 +2,81 @@ require 'mkmf'
 require 'fileutils'
 require 'rbconfig'
 
-$CXXFLAGS << ' -std=c++11'
 $CPPFLAGS << ' -DOS_MACOSX' if RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
 $INCFLAGS << ' -I./enc -I./dec'
 
-def make_srcobj(prefix, files)
-  FileUtils.mkdir_p File.join(__dir__, prefix)
-  FileUtils.cp(Dir[File.expand_path(File.join('..', '..', 'vendor', 'brotli', prefix, '*.{c,cc,h}'), __dir__)], File.join(__dir__, prefix))
-  [
-    files.flat_map { |e| Dir[File.join(__dir__, prefix, e + '.{c,cc}')] }.map { |e| e.sub(__dir__ + '/', '') },
-    files.map { |e| File.join(prefix, e + '.' + $OBJEXT) },
-  ]
-end
-
 FileUtils.mkdir_p 'enc'
 FileUtils.mkdir_p 'dec'
-encsrc, encobj = make_srcobj 'enc', %w(backward_references block_splitter brotli_bit_stream encode encode_parallel entropy_encode histogram literal_cost metablock static_dict streams)
-decsrc, decobj = make_srcobj 'dec', %w(bit_reader decode huffman state streams)
+FileUtils.mkdir_p File.join(__dir__, 'enc')
+FileUtils.mkdir_p File.join(__dir__, 'dec')
+
+srcs = []
+objs = []
+[
+  'enc/backward_references.cc',
+  'enc/block_splitter.cc',
+  'enc/brotli_bit_stream.cc',
+  'enc/encode.cc',
+  'enc/entropy_encode.cc',
+  'enc/histogram.cc',
+  'enc/literal_cost.cc',
+  'enc/metablock.cc',
+  'enc/static_dict.cc',
+  'enc/streams.cc',
+  'enc/utf8_util.cc',
+  'dec/bit_reader.c',
+  'dec/decode.c',
+  'dec/dictionary.c',
+  'dec/huffman.c',
+  'dec/streams.c',
+  'dec/state.c',
+  'enc/backward_references.h',
+  'enc/bit_cost.h',
+  'enc/block_splitter.h',
+  'enc/brotli_bit_stream.h',
+  'enc/cluster.h',
+  'enc/command.h',
+  'enc/context.h',
+  'enc/dictionary.h',
+  'enc/dictionary_hash.h',
+  'enc/encode.h',
+  'enc/entropy_encode.h',
+  'enc/fast_log.h',
+  'enc/find_match_length.h',
+  'enc/hash.h',
+  'enc/histogram.h',
+  'enc/literal_cost.h',
+  'enc/metablock.h',
+  'enc/port.h',
+  'enc/prefix.h',
+  'enc/ringbuffer.h',
+  'enc/static_dict.h',
+  'enc/static_dict_lut.h',
+  'enc/streams.h',
+  'enc/transform.h',
+  'enc/types.h',
+  'enc/utf8_util.h',
+  'enc/write_bits.h',
+  'dec/bit_reader.h',
+  'dec/context.h',
+  'dec/decode.h',
+  'dec/dictionary.h',
+  'dec/huffman.h',
+  'dec/prefix.h',
+  'dec/port.h',
+  'dec/streams.h',
+  'dec/transform.h',
+  'dec/types.h',
+  'dec/state.h',
+].each do |file|
+  FileUtils.cp(File.expand_path(File.join(__dir__, '..', '..', 'vendor', 'brotli', file)),
+               File.expand_path(File.join(__dir__, file)),
+               verbose: true)
+  if file.end_with?('.c') or file.end_with?('.cc')
+    srcs.push file
+    objs.push file.sub(/\.cc?\z/, '.' + $OBJEXT)
+  end
+end
 
 have_library('stdc++')
 create_makefile('brotli/brotli')
@@ -27,8 +85,8 @@ File.open('Makefile', 'r+') do |f|
   src = 'ORIG_SRCS = brotli.cc'
   obj = 'OBJS = brotli.o'
   txt = f.read
-        .sub(/^#{src}$/, src + ' ' + (encsrc + decsrc).join(' '))
-        .sub(/^#{obj}$/, obj + ' ' + (encobj + decobj).join(' '))
+        .sub(/^#{src}$/, src + ' ' + srcs.join(' '))
+        .sub(/^#{obj}$/, obj + ' ' + objs.join(' '))
   f.rewind
   f.write txt
 end

data/lib/brotli/version.rb

@@ -1,3 +1,3 @@
 module Brotli
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/vendor/brotli/LICENSE

@@ -1,202 +1,19 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Copyright (c) 2009, 2010, 2013-2015 by the Brotli Authors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/vendor/brotli/dec/Makefile

@@ -4,7 +4,7 @@ include ../shared.mk
 
 CFLAGS += -Wall
 
-OBJS = bit_reader.o decode.o huffman.o state.o streams.o
+OBJS = bit_reader.o decode.o dictionary.o huffman.o state.o streams.o
 
 all : $(OBJS)
 

data/vendor/brotli/dec/bit_reader.c

@@ -1,16 +1,7 @@
 /* Copyright 2013 Google Inc. All Rights Reserved.
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+   Distributed under MIT license.
+   See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
 /* Bit reading helpers */
@@ -24,30 +15,32 @@
 extern "C" {
 #endif
 
-void BrotliInitBitReader(BrotliBitReader* const br, BrotliInput input) {
-  BROTLI_DCHECK(br != NULL);
-
-  br->input_ = input;
+void BrotliInitBitReader(BrotliBitReader* const br) {
   br->val_ = 0;
-  br->bit_pos_ = 0;
-  br->avail_in = 0;
-  br->eos_ = 0;
-  br->next_in = br->buf_;
+  br->bit_pos_ = sizeof(br->val_) << 3;
 }
 
+int BrotliWarmupBitReader(BrotliBitReader* const br) {
+  size_t aligned_read_mask = (sizeof(br->val_) >> 1) - 1;
+  /* Fixing alignment after unaligned BrotliFillWindow would result accumulator
+     overflow. If unalignment is caused by BrotliSafeReadBits, then there is
+     enough space in accumulator to fix aligment. */
+  if (!BROTLI_ALIGNED_READ) {
+    aligned_read_mask = 0;
+  }
+  if (BrotliGetAvailableBits(br) == 0) {
+    if (!BrotliPullByte(br)) {
+      return 0;
+    }
+  }
 
-void BrotliWarmupBitReader(BrotliBitReader* const br) {
-  size_t i;
-  br->val_ = 0;
-  for (i = 0; i < sizeof(br->val_); ++i) {
-#if (BROTLI_64_BITS_LITTLE_ENDIAN)
-    br->val_ |= ((uint64_t)*br->next_in) << (8 * i);
-#else
-    br->val_ |= ((uint32_t)*br->next_in) << (8 * i);
-#endif
-    ++br->next_in;
-    --br->avail_in;
+  while ((((size_t)br->next_in) & aligned_read_mask) != 0) {
+    if (!BrotliPullByte(br)) {
+      /* If we consumed all the input, we don't care about the alignment. */
+      return 1;
+    }
   }
+  return 1;
 }
 
 #if defined(__cplusplus) || defined(c_plusplus)