ngzip 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+### 1.0.2 (2013-07-15)
+
+* Fixed the escaping of path names
+
+### 1.0.1 (2013-07-14)
+
+* Added URL to the gemspec
+
+### 1.0.0 (2013-07-14)
+
+* Initial public release
+

data/lib/ngzip.rb

@@ -2,7 +2,7 @@ require "ngzip/version"
 require "ngzip/builder"
 
 module Ngzip
-  def self.build
-    
+  def self.build(files, options)
+    Ngzip::Builder.new().build(files, options)
   end
 end

data/lib/ngzip/builder.rb

@@ -1,11 +1,12 @@
 require 'zlib'
+require 'uri'
 
 module Ngzip
   
   class Builder
     
     BUFFER_SIZE = 8 * 1024
-
+    
     # Public: Build the files manifest for mod_zip, see http://wiki.nginx.org/NginxNgxZip for the specs.
     # 
     # files - An Array of absolute file path elements
@@ -23,14 +24,13 @@ module Ngzip
       list = file_list(files)
       prefix = detect_common_prefix(list)
       list.map do |f|
-        sprintf("%s %d %s %s",
+        sprintf('%s %d %s %s',
                 compute_crc32(f, settings),
                 File.size(f).to_i,
-                f,
+                URI.escape(f),
                 f.gsub(prefix, '')
         )
-      end.join("\n")      
-      
+      end.join("\n")
     end
 
     # Public: Get the special header to signal the mod_zip
@@ -70,7 +70,6 @@ module Ngzip
           e
         end
       end.flatten
-      
     end
     
     
@@ -99,8 +98,6 @@ module Ngzip
       crc32.to_s(16)
     end
     
-    
-    
   end
   
 end

data/lib/ngzip/version.rb

@@ -1,3 +1,3 @@
 module Ngzip
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/data/a/A filename with whitespace.txt

@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/test/lib/ngzip/builder_test.rb

@@ -1,4 +1,5 @@
 require_relative "../../test_helper"
+require 'uri'
 
 describe Ngzip do
 
@@ -13,6 +14,7 @@ describe Ngzip::Builder do
   let(:builder) {Ngzip::Builder.new()}
   let(:lorem) {File.expand_path('../../../data/a/lorem.txt', __FILE__)}
   let(:ipsum) {File.expand_path('../../../data/a/ipsum.txt', __FILE__)}
+  let(:whitespaced) {File.expand_path('../../../data/a/A filename with whitespace.txt', __FILE__)}
   let(:cargo) {File.expand_path('../../../data/b/Cargo.png', __FILE__)}
   let(:sit) {File.expand_path('../../../data/sit.txt', __FILE__)}
   let(:a) {File.expand_path('../../../data/a', __FILE__)}
@@ -51,13 +53,21 @@ describe Ngzip::Builder do
       builder.build(cargo, options).must_equal expected
     end
     
+    it 'must escape the path name' do
+      expected = "8f92322f 446 #{URI.escape(whitespaced)} A filename with whitespace.txt"
+      builder.build(whitespaced, options).must_equal expected
+    end
+    
     it 'must return a correct list for all files in a directory' do
-      expected = "8f92322f 446 #{ipsum} ipsum.txt\n8f92322f 446 #{lorem} lorem.txt"
+      expected = "8f92322f 446 #{URI.escape(whitespaced)} A filename with whitespace.txt"
+      expected << "\n8f92322f 446 #{ipsum} ipsum.txt"
+      expected << "\n8f92322f 446 #{lorem} lorem.txt"
       builder.build(a,options).must_equal expected
     end
     
     it 'must allow to mix files and directories' do
-      expected = "8f92322f 446 #{ipsum} a/ipsum.txt"
+      expected = "8f92322f 446 #{URI.escape(whitespaced)} a/A filename with whitespace.txt"
+      expected << "\n8f92322f 446 #{ipsum} a/ipsum.txt"
       expected << "\n8f92322f 446 #{lorem} a/lorem.txt"
       expected << "\nf7c0867d 1342 #{sit} sit.txt"
       builder.build([a,sit], options).must_equal expected      
@@ -77,13 +87,7 @@ describe Ngzip::Builder do
       expected = "#{invalid_but_cached} 446 #{lorem} lorem.txt"
       builder.build(lorem, options.merge(:crc_cache => {lorem => invalid_but_cached})).must_equal expected
     end
-    
       
   end
   
-  
-  
-  
-  
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ngzip
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -53,7 +53,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -62,6 +62,7 @@ files:
 - lib/ngzip/builder.rb
 - lib/ngzip/version.rb
 - ngzip.gemspec
+- test/data/a/A filename with whitespace.txt
 - test/data/a/ipsum.txt
 - test/data/a/lorem.txt
 - test/data/b/Cargo.png
@@ -85,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1083019108818318405
+      hash: 3803006848080428378
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1083019108818318405
+      hash: 3803006848080428378
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -102,6 +103,7 @@ signing_key:
 specification_version: 3
 summary: Provides a nginx mod_zip compatible file manifest for streaming support
 test_files:
+- test/data/a/A filename with whitespace.txt
 - test/data/a/ipsum.txt
 - test/data/a/lorem.txt
 - test/data/b/Cargo.png

data/CHANGELOG

@@ -1,7 +0,0 @@
-### 1.0.0 (2013-07-14)
-
-* Initial public release
-
-### 1.0.1 (2013-07-14)
-
-* Added URL to the gemspec