ngzip 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.0.4 (2013-09-20)
+
+* Fixed issue #1 ("+" character in filename)
+
 ### 1.0.3 (2013-08-05)
 
 * Added the :base_dir option

data/lib/ngzip/builder.rb

@@ -29,7 +29,7 @@ module Ngzip
         sprintf('%s %d %s %s',
                 compute_crc32(f, settings),
                 File.size(f).to_i,
-                URI.escape(f),
+                Builder.encode(f),
                 f.gsub(prefix, '')
         )
       end.join("\n")
@@ -42,6 +42,14 @@ module Ngzip
       "X-Archive-Files: zip"
     end
     
+    
+    # Public: Encode the string 
+    #
+    # Returns the encoded string using URL escape formatting
+    def self.encode(string)
+      URI.encode(string).sub('+', "%2B")
+    end
+    
     private
     
     # Internal: Compute a common prefix from a list of path elements

data/lib/ngzip/version.rb

@@ -1,3 +1,3 @@
 module Ngzip
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/data/c/A filename with space and + in it.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

@@ -15,6 +15,7 @@ describe Ngzip::Builder do
   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(:plused) {File.expand_path('../../../data/c/A filename with space and + in it.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__)}
@@ -105,8 +106,14 @@ describe Ngzip::Builder do
       options = {:base_dir => Pathname.new(lorem).parent.parent.to_s + '/'}
       pathes = builder.build([lorem, ipsum], options).split("\n").map{|line| line.split.last}
       expected = ["a/lorem.txt", "a/ipsum.txt"]
-      pathes.must_equal expected
-      
+      pathes.must_equal expected      
+    end
+    
+    it 'must correctly encode filenames with a "+"' do
+      options = {}
+      name = File.join(Pathname.new(plused).parent.to_s, 'A%20filename%20with%20space%20and%20%2B%20in%20it.txt') 
+      expected = "8f92322f 446 #{name} A filename with space and + in it.txt"
+      builder.build([plused], options).must_equal expected
     end
     
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ngzip
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - test/data/a/lorem.txt
 - test/data/b/Cargo.png
 - test/data/b/dolor.txt
+- test/data/c/A filename with space and + in it.txt
 - test/data/sit.txt
 - test/lib/ngzip/builder_test.rb
 - test/lib/ngzip/version_test.rb
@@ -86,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4140413543763942870
+      hash: 870021569406491909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4140413543763942870
+      hash: 870021569406491909
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -108,6 +109,7 @@ test_files:
 - test/data/a/lorem.txt
 - test/data/b/Cargo.png
 - test/data/b/dolor.txt
+- test/data/c/A filename with space and + in it.txt
 - test/data/sit.txt
 - test/lib/ngzip/builder_test.rb
 - test/lib/ngzip/version_test.rb