axlsx 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e930f37405c7605025d570348ef553438e86a17e
-  data.tar.gz: 1b5a4d4eca67a123d7a9f6b83e78e686efd25cf7
+  metadata.gz: 36ce715dcecdf3de554b7683d87d35eccf159a81
+  data.tar.gz: d9550ff6639b90f612e45c0bf40f5a50ac88928e
 SHA512:
-  metadata.gz: 5c28721794fe4270cdbe656a1eae69dcf47026cc16140772ce222cf82647369b4d9316ec012fc63bf118448590f251330092f6a11807d0a6462e398147d5cebe
-  data.tar.gz: f2d55d91d8513f33d530a307a5bb48e30a12368670ebed8ba132daffea2789912fe7e72112e5b6311a32af1dcdafdc7c23e6908ca23efb958ea67cca97125df9
+  metadata.gz: 9939c4e2c0bba3911171ae36441f61175d3b4604dfe878a125ac9b391c38c88430426a2c9660e2d1bafe0f7ae1c4a039a09d4410890978bad70509204a43e9d0
+  data.tar.gz: 0b58dc0cb79601febcc3782410e36225d2154c788f7dfe38e11d98a5845554ad0cd8a649656712e058f52e0ad884dafc9a3aa2a6379d5e1784585ca66f7f5b20

data/README.md

@@ -21,7 +21,7 @@ appreciation for the gem, please don't hesitate to make a donation.
 
 **License**: MIT License
 
-**Latest Version**: 2.0.0
+**Latest Version**: 2.0.1
 
 **Ruby Version**: 1.9.2, 1.9.3, 2.0.0
 
@@ -165,6 +165,8 @@ This gem has 100% test coverage using test/unit. To execute tests for this gem,
 #Change log
 ---------
 
+- **September.12.13**:2.0.1
+  - Unpinned rubyzip version
 - **September.12.13**:2.0.0
   - DROPPED support for ruby 1.8.7
   - Altered readme to link to contributors

data/lib/axlsx.rb

@@ -23,7 +23,7 @@ require 'axlsx/workbook/workbook.rb'
 require 'axlsx/package.rb'
 #required gems
 require 'nokogiri'
-require 'zip/zip'
+require 'zip'
 
 #core dependencies
 require 'bigdecimal'
@@ -136,7 +136,7 @@ module Axlsx
     end
 
 
-  # Instructs the serializer to not try to escape cell value input. 
+  # Instructs the serializer to not try to escape cell value input.
   # This will give you a huge speed bonus, but if you content has <, > or other xml character data
   # the workbook will be invalid and excel will complain.
   def self.trust_input

data/lib/axlsx/package.rb

@@ -70,7 +70,7 @@ module Axlsx
 
     #def self.parse(input, confirm_valid = false)
     #  p = Package.new
-    #  z = Zip::ZipFile.open(input)
+    #  z = Zip::File.open(input)
     #  p.workbook = Workbook.parse z.get_entry(WORKBOOK_PN)
     #  p
     #end
@@ -101,7 +101,7 @@ module Axlsx
     def serialize(output, confirm_valid=false)
       return false unless !confirm_valid || self.validate.empty?
       Relationship.clear_cached_instances
-      Zip::ZipOutputStream.open(output) do |zip|
+      Zip::OutputStream.open(output) do |zip|
         write_parts(zip)
       end
       true
@@ -114,7 +114,7 @@ module Axlsx
     def to_stream(confirm_valid=false)
       return false unless !confirm_valid || self.validate.empty?
       Relationship.clear_cached_instances
-      zip = write_parts(Zip::ZipOutputStream.new("streamed", true))
+      zip = write_parts(Zip::OutputStream.new("streamed", true))
       stream = zip.close_buffer
       stream.rewind
       stream
@@ -154,8 +154,8 @@ module Axlsx
     private
 
     # Writes the package parts to a zip archive.
-    # @param [Zip::ZipOutputStream] zip
-    # @return [Zip::ZipOutputStream]
+    # @param [Zip::OutputStream] zip
+    # @return [Zip::OutputStream]
     def write_parts(zip)
       p = parts
       p.each do |part|
@@ -173,8 +173,8 @@ module Axlsx
       zip
     end
 
-    # Generate a ZipEntry for the given package part.
-    # The important part here is to explicitly set the timestamp for the zip entry: Serializing axlsx packages 
+    # Generate a Entry for the given package part.
+    # The important part here is to explicitly set the timestamp for the zip entry: Serializing axlsx packages
     # with identical contents should result in identical zip files – however, the timestamp of a zip entry
     # defaults to the time of serialization and therefore the zip file contents would be different every time
     # the package is serialized.
@@ -183,12 +183,12 @@ module Axlsx
     # to set this explicitly, too (eg. with `Package.new(created_at: Time.local(2013, 1, 1))`).
     #
     # @param part A hash describing a part of this pacakge (see {#parts})
-    # @return [Zip::ZipEntry]
+    # @return [Zip::Entry]
     def zip_entry_for_part(part)
       timestamp = Zip::DOSTime.at(@core.created.to_i)
-      Zip::ZipEntry.new("", part[:entry], "", "", 0, 0, Zip::ZipEntry::DEFLATED, 0, timestamp)
+      Zip::Entry.new("", part[:entry], "", "", 0, 0, Zip::Entry::DEFLATED, 0, timestamp)
     end
-    
+
     # The parts of a package
     # @return [Array] An array of hashes that define the entry, document and schema for each part of the package.
     # @private

data/lib/axlsx/version.rb

@@ -1,5 +1,5 @@
 module Axlsx
 
   # The current version
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/test/tc_package.rb

@@ -118,7 +118,7 @@ class TestPackage < Test::Unit::TestCase
     assert_nothing_raised do
       begin
         @package.serialize(@fname)
-        zf = Zip::ZipFile.open(@fname)
+        zf = Zip::File.open(@fname)
         @package.send(:parts).each{ |part| zf.get_entry(part[:entry]) }
         File.delete(@fname)
       rescue Errno::EACCES
@@ -126,7 +126,7 @@ class TestPackage < Test::Unit::TestCase
       end
     end
   end
-  
+
   # See comment for Package#zip_entry_for_part
   def test_serialization_creates_identical_files_at_any_time_if_created_at_is_set
     @package.core.created = Time.now
@@ -136,9 +136,9 @@ class TestPackage < Test::Unit::TestCase
       assert zip_content_then == zip_content_now, "zip files are not identical"
     end
   end
-  
+
   def test_serialization_creates_identical_files_for_identical_packages
-    package_1, package_2 = 2.times.map do 
+    package_1, package_2 = 2.times.map do
       Axlsx::Package.new(:created_at => Time.utc(2013, 1, 1)).tap do |p|
         p.workbook.add_worksheet(:name => "Basic Worksheet") do |sheet|
           sheet.add_row [1, 2, 3]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axlsx
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Randy Morgan
@@ -28,16 +28,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -406,7 +406,8 @@ files:
 - test/workbook/worksheet/tc_worksheet.rb
 - test/workbook/worksheet/tc_worksheet_hyperlink.rb
 homepage: https://github.com/randym/axlsx
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []