doo_dah 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/doo_dah.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{doo_dah}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Collas"]
-  s.date = %q{2012-06-18}
+  s.date = %q{2012-06-22}
   s.description = %q{      This gem creates zip files using the STORE method - i.e. with no compression. This enables the generation of
       zip files with a known size from streamed data, providing the size of the input files is known. 
 }
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "lib/doo_dah/zip_entry.rb",
     "lib/doo_dah/zip_header.rb",
     "lib/doo_dah/zip_output_stream.rb",
+    "lib/doo_dah/zip_size_calculator.rb",
     "spec/central_directory_spec.rb",
     "spec/dos_time_spec.rb",
     "spec/local_directory_header_spec.rb",

data/lib/doo_dah/zip_entry.rb

@@ -5,6 +5,11 @@ module DooDah
   class ZipEntry
     include LocalDirectoryHeader
     include CentralDirectoryHeader
+    
+    def self.overhead(name, size=0, crc=0)
+      LocalDirectoryHeader.local_header_size(name) + ((size == 0 || crc == 0) ? LocalDirectoryHeader.local_footer_size : 0) +
+        CentralDirectoryHeader.central_header_size(name)  
+    end
 
     attr_reader :name, :closed
     alias_method :closed?, :closed

data/lib/doo_dah/zip_header.rb

@@ -23,9 +23,15 @@ module DooDah
   end
 
   module ZipHeader
+    
+    def self.signature_size
+      4
+    end
+    
     def write_signature(signature)
       write([signature].pack('V'))
     end
+    
   end
 
   module ZipEntryHeader
@@ -42,6 +48,14 @@ module DooDah
     VERSION_NEEDED_TO_EXTRACT = 10
     GP_FLAGS_CRC_UNKNOWN = 0x0008
     GP_FLAGS_UTF8 = 0x0800
+    
+    def self.common_header_size
+      14 + 12
+    end
+    
+    def self.name_size(name)
+      name.length
+    end
 
     def write_common_header()
       flags = GP_FLAGS_UTF8
@@ -72,6 +86,14 @@ module DooDah
 
   module LocalDirectoryHeader
     include ZipEntryHeader
+    
+    def self.local_header_size(name)
+      ZipHeader.signature_size + ZipEntryHeader.common_header_size + ZipEntryHeader.name_size(name)
+    end
+    
+    def self.local_footer_size
+      ZipHeader.signature_size + 12
+    end
 
     def write_local_header
       self.local_header_offset = current_offset
@@ -89,6 +111,18 @@ module DooDah
 
   module CentralDirectoryHeader
     include ZipEntryHeader
+    
+    def self.central_header_size(name)
+      ZipHeader.signature_size + version_made_by_size + ZipEntryHeader.common_header_size + 6 + 8 + ZipEntryHeader.name_size(name) 
+    end
+    
+    def self.end_of_central_directory_size
+      ZipHeader.signature_size + 10 + 8
+    end
+    
+    def self.version_made_by_size
+      2
+    end
 
     def write_central_header
       write_signature(CENTRAL_ENTRY_HEADER_SIGNATURE)

data/lib/doo_dah/zip_size_calculator.rb

@@ -0,0 +1,20 @@
+module DooDah
+  
+  class ZipSizeCalculator
+    
+    attr_accessor :size, :overhead
+    
+    def initialize
+      @overhead = CentralDirectoryHeader.end_of_central_directory_size
+      @size = @overhead
+    end
+    
+    def add_file(name, size=0, crc=0)
+      new_overhead = ZipEntry.overhead(name, size, crc) 
+      @overhead += new_overhead
+      @size += (size + new_overhead)
+    end
+    
+  end
+  
+end

data/lib/doo_dah.rb

@@ -2,3 +2,4 @@ require 'doo_dah/dos_time'
 require 'doo_dah/zip_header'
 require 'doo_dah/zip_entry'
 require 'doo_dah/zip_output_stream'
+require 'doo_dah/zip_size_calculator'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: doo_dah
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Michael Collas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-18 00:00:00 +10:00
+date: 2012-06-22 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ files:
 - lib/doo_dah/zip_entry.rb
 - lib/doo_dah/zip_header.rb
 - lib/doo_dah/zip_output_stream.rb
+- lib/doo_dah/zip_size_calculator.rb
 - spec/central_directory_spec.rb
 - spec/dos_time_spec.rb
 - spec/local_directory_header_spec.rb