archive-zip 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 59daa5f87eab1ea370009ef382698306f6e7640d
+  data.tar.gz: dc0a201e3f195cd5e4e2cd3ee969a3714b8269b9
+SHA512:
+  metadata.gz: 2ce65d15084aa253f08de57da4d766df70aeffcc4f97d093f1ef3ea94b9291c93dd99fc2472216ac601d1341d134a8af43baf0646224cce4a65bcc22fce0617b
+  data.tar.gz: 2f9e2aeb4b470d880ecb8e1ade69fd5a9b2ea0eb2cf74cc7dccef5275ba224b1e0cae74b3784c8cec1ce306707fa587226174da0141f8a5bc382d5aee68e18a6

data/NEWS

@@ -6,6 +6,25 @@ detailed information is available in the rest of the documentation.
 <b>NOTE:</b> Date stamps in the following entries are in YYYY/MM/DD format.
 
 
+== v0.6.0 (2013/03/24)
+
+=== Fixes
+
+* Only define Zlib constants when they are not already defined.
+  * Fixes constant redefinition warnings under MRI 2.0.0-p0.
+* Force Zlib::ZWriter and Zlib::ZReader #checksum methods to return nil for raw
+  streams.
+  * The behavior of the underlying Zlib::Deflate and Zlib::Inflate classes'
+    #adler methods appear inconsistent for raw streams and really aren't
+    necessary in this case anyway.
+
+=== Notes
+
+* Broke backward compatibility with the behavior of Zlib::ZWriter#checksum and
+  Zlib::ZReader#checksum when working with raw streams.
+  * This should not affect direct users of Archive::Zip because the checksum
+    methods of those classes are never used.
+
 == v0.5.0 (2012/03/01)
 
 === Fixes

data/lib/archive/support/zlib.rb

@@ -5,17 +5,20 @@ require 'zlib'
 require 'archive/support/io-like'
 
 module Zlib # :nodoc:
-  if ! const_defined?(:MAX_WBITS) then
-    MAX_WBITS = Deflate::MAX_WBITS
-  end
+  # The maximum size of the zlib history buffer.  Note that zlib allows larger
+  # values to enable different inflate modes.  See Zlib::Inflate.new for details.
+  # Provided here only for Ruby versions that do not provide it.
+  MAX_WBITS = Deflate::MAX_WBITS unless const_defined?(:MAX_WBITS)
 
   # A deflate strategy which limits match distances to 1, also known as
-  # run-length encoding.
-  RLE = 3
+  # run-length encoding.  Provided here only for Ruby versions that do not
+  # provide it.
+  RLE = 3 unless const_defined?(:RLE)
 
   # A deflate strategy which does not use dynamic Huffman codes, allowing for a
-  # simpler decoder to be used to inflate.
-  FIXED = 4
+  # simpler decoder to be used to inflate.  Provided here only for Ruby versions
+  # that do not provide it.
+  FIXED = 4 unless const_defined?(:FIXED)
 
   # Zlib::ZWriter is a writable, IO-like object (includes IO::Like) which wraps
   # other writable, IO-like objects in order to facilitate writing data to those
@@ -85,7 +88,7 @@ module Zlib # :nodoc:
     #
     # Finally, negating the base value of _window_bits_ indicates that a raw
     # zlib stream is to be produced without any header or trailer.  In this case
-    # the checksum method of this object will always return <tt>1</tt>.  This is
+    # the checksum method of this object will always return <tt>nil</tt>.  This is
     # for use with other formats that use the deflate compressed data format
     # such as zip.  Such formats should provide their own check values.
     #
@@ -161,6 +164,7 @@ module Zlib # :nodoc:
     # processed, so calling #flush prior to calling this method may be necessary
     # for an accurate checksum.
     def checksum
+      return nil if @window_bits < 0
       @deflater.closed? ? @checksum : @deflater.adler
     end
 
@@ -312,7 +316,7 @@ module Zlib # :nodoc:
     #
     # Finally, negating the base value of _window_bits_ indicates that a raw
     # zlib stream is expected without any header or trailer.  In this case the
-    # checksum method of this object will always return <tt>1</tt>.  This is for
+    # checksum method of this object will always return <tt>nil</tt>.  This is for
     # use with other formats that use the deflate compressed data format such as
     # zip.  Such formats should provide their own check values.
     #
@@ -372,6 +376,7 @@ module Zlib # :nodoc:
     # processed any time the internal buffer is filled, so this checksum is only
     # accurate if all data has been read out of this object.
     def checksum
+      return nil if @window_bits < 0
       @inflater.closed? ? @checksum : @inflater.adler
     end
 

data/lib/archive/zip/version.rb

@@ -2,5 +2,5 @@
 
 module Archive; class Zip
   # The current version of this gem.
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end; end

data/spec/zlib/zreader/checksum_spec.rb

@@ -31,10 +31,10 @@ describe "Zlib::ZReader#checksum" do
     closed_zr = ZlibSpecs.compressed_data_raw do |f|
       Zlib::ZReader.open(f, -15) do |zr|
         zr.read
-        zr.checksum.should == 1
+        zr.checksum.should == nil
         zr
       end
     end
-    closed_zr.checksum.should == 1
+    closed_zr.checksum.should == nil
   end
 end

data/spec/zlib/zwriter/checksum_spec.rb

@@ -33,9 +33,9 @@ describe "Zlib::ZWriter#checksum" do
     closed_zw = Zlib::ZWriter.open(compressed_data, nil, -15) do |zw|
       zw.write(ZlibSpecs.test_data)
       zw.flush
-      zw.checksum.should == 1
+      zw.checksum.should == nil
       zw
     end
-    closed_zw.checksum.should == 1
+    closed_zw.checksum.should == nil
   end
 end

metadata

@@ -1,59 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: archive-zip
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Jeremy Bopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-like
-  requirement: &12753840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *12753840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12752440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *12752440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: mspec
-  requirement: &12750780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.12
   type: :development
   prerelease: false
-  version_requirements: *12750780
-description: ! 'Archive::Zip provides a simple Ruby-esque interface to creating, extracting,
-  and
-
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.12
+description: |
+  Archive::Zip provides a simple Ruby-esque interface to creating, extracting, and
   updating ZIP archives.  This implementation is 100% Ruby and loosely modeled on
-
-  the archive creation and extraction capabilities of InfoZip''s zip and unzip
-
+  the archive creation and extraction capabilities of InfoZip's zip and unzip
   tools.
-
-'
 email:
 - jeremy@bopp.net
 executables: []
@@ -194,27 +197,26 @@ files:
 - spec/archive/zip/codec/traditional_encryption/decrypt/seek_spec.rb
 homepage: http://github.com/javanthropus/archive-zip
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: archive-zip
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0.rc.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple, extensible, pure Ruby ZIP archive support.
 test_files:
 - default.mspec