ngzip 1.0.5 → 1.0.6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.0.6 (2013-12-12)
+
+* Fixed a regression from 1.0.5 where directories were included due to the changed pattern
+
+
 ### 1.0.5 (2013-12-12)
 
 * Fixed issue #2 (files without extensions being ignored)

data/lib/ngzip/builder.rb

@@ -75,7 +75,7 @@ module Ngzip
     def file_list(files)
       Array(files).map do |e|
         if File.directory?(e)
-          Dir.glob("#{e}/**/*")
+          Dir.glob("#{e}/**/*").reject { |f| File.directory?(f) }
         else
           e
         end

data/lib/ngzip/version.rb

@@ -1,3 +1,3 @@
 module Ngzip
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/test/data/a/d/my_file.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(:without_dot) {File.expand_path('../../../data/a/filename-without-a-dot', __FILE__)}
+  let(:my_file) {File.expand_path('../../../data/a/d/my_file.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__)}
@@ -62,6 +63,7 @@ describe Ngzip::Builder do
     
     it 'must return a correct list for all files in a directory' do
       expected = "8f92322f 446 #{URI.escape(whitespaced)} A filename with whitespace.txt"
+      expected << "\n8f92322f 446 #{my_file} d/my_file.txt"
       expected << "\n8f92322f 446 #{without_dot} filename-without-a-dot"
       expected << "\n8f92322f 446 #{ipsum} ipsum.txt"
       expected << "\n8f92322f 446 #{lorem} lorem.txt"
@@ -70,6 +72,7 @@ describe Ngzip::Builder do
     
     it 'must allow to mix files and directories' do
       expected = "8f92322f 446 #{URI.escape(whitespaced)} a/A filename with whitespace.txt"
+      expected << "\n8f92322f 446 #{my_file} a/d/my_file.txt"
       expected << "\n8f92322f 446 #{without_dot} a/filename-without-a-dot"
       expected << "\n8f92322f 446 #{ipsum} a/ipsum.txt"
       expected << "\n8f92322f 446 #{lorem} a/lorem.txt"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ngzip
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -63,6 +63,7 @@ files:
 - lib/ngzip/version.rb
 - ngzip.gemspec
 - test/data/a/A filename with whitespace.txt
+- test/data/a/d/my_file.txt
 - test/data/a/filename-without-a-dot
 - test/data/a/ipsum.txt
 - test/data/a/lorem.txt
@@ -88,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3162045522527369733
+      hash: 4602707169932349817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3162045522527369733
+      hash: 4602707169932349817
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -106,6 +107,7 @@ 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/d/my_file.txt
 - test/data/a/filename-without-a-dot
 - test/data/a/ipsum.txt
 - test/data/a/lorem.txt