s3_website 1.6.13 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 602d8ae25b6312db999a5506cec95d599a7e174a
-  data.tar.gz: 8c730aee62d51d15548f9fdc0b6202f887189321
+  metadata.gz: 5e6c59e118fa7b84134238ddee3b47dc3edc237c
+  data.tar.gz: 10b1b6a851278f874986b24ccdee15caa1aed821
 SHA512:
-  metadata.gz: 724205beb553e6f17373bf89c820faa62ac853f5f60838ef85d9ffe8b280f5c7e0bb1f2f642438037309ef49345604878ce1482619c1b627beb2914998fbebc2
-  data.tar.gz: 22be4f555bd4df4bc074f6add890013bfda33b0f4d5ea31df3a57ea61883184bfc6a0559408222fa1c515fdd35e151c73cfea99776ca3c3daee6d1b0fbc92979
+  metadata.gz: a265484452a3a261a7a2607f05d4183ecc73c4ce04dde5c8fd3fbc73b84f0cb24c5416aecd44c9c12b1f0725ec2fcc38ef8b59660edb9fcd9db187157e2b5f17
+  data.tar.gz: 9c75e3fddd4525adf01760e7182fa8f776fd28a84e2d6e39465201ed3badbae7ff46be317413b716007085264b77e5c81aac9a8a3bd9d6cc471dc1b2bb86f485

data/README.md

@@ -140,6 +140,13 @@ gzip:
 Remember that the extensions here are referring to the *compiled* extensions,
 not the pre-processed extensions.
 
+#### Gzip zopfli
+
+By adding the line `gzip_zopfli: true` into the config file, you can benefit
+from the zopfli algorithm, which is 100% compatible with the traditional gzip
+algorithm. A zopfli compression takes longer but results in about 5% smaller
+files.
+
 ### Specifying a MIME type for files without extensions
 
 `s3_website` will look up the MIME type of each file it uploads, and infer the Content-Type from it automatically. By default, files without an extension will have a blank Content-Type.
@@ -436,6 +443,7 @@ Contributors (in alphabetical order)
 * Chris Moos
 * Christopher Petersen
 * David Michael Barr
+* David Raffensperger
 * Greg Karékinian
 * John Allison
 * Jordan White

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 1.7.0
+
+* Add zopfli compression support
+
 ## 1.6.13
 
 * Depend on any 1-series version of the aws-sdk gem

data/lib/s3_website/upload.rb

@@ -1,5 +1,6 @@
 require 'tempfile'
 require 'zlib'
+require 'zopfli'
 
 module S3Website
   class Upload
@@ -51,16 +52,20 @@ module S3Website
       tempfile = Tempfile.new(File.basename(path))
       tempfile.binmode
 
-      gz = Zlib::GzipWriter.new(tempfile, Zlib::BEST_COMPRESSION, Zlib::DEFAULT_STRATEGY)
-
-      gz.mtime = File.mtime(full_path)
-      gz.orig_name = File.basename(path)
-      gz.write(file.read)
-
-      gz.flush
-      tempfile.flush
-
-      gz.close
+      if config['gzip_zopfli']
+        gz_data = Zopfli.deflate file.read, format: :gzip
+        tempfile.write(gz_data)
+        tempfile.flush
+      else
+        gz = Zlib::GzipWriter.new(tempfile, Zlib::BEST_COMPRESSION, Zlib::DEFAULT_STRATEGY)
+        gz.mtime = File.mtime(full_path)
+        gz.orig_name = File.basename(path)
+        gz.write(file.read)
+
+        gz.flush
+        tempfile.flush
+        gz.close
+      end
       tempfile.open
 
       tempfile

data/s3_website.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "s3_website"
-  s.version     = "1.6.13"
+  s.version     = "1.7.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mime-types', '~> 1'
   s.add_dependency 'thor', '= 0.18.1'
   s.add_dependency 'configure-s3-website', '= 1.5.2'
+  s.add_dependency 'zopfli', '~> 0.0.3'
 
   s.add_development_dependency 'rspec', '2.14.0'
   s.add_development_dependency 'rspec-expectations', '2.14.4'

data/spec/lib/upload_spec.rb

@@ -114,7 +114,7 @@ describe S3Website::Upload do
         }
       end
     end
-  end
+  end  
 
   describe 'gzip compression' do
     let(:config){
@@ -146,8 +146,28 @@ describe S3Website::Upload do
         subject.stub(:path).and_return('index.bork')
         subject.should be_gzip
       end
+    end       
+
+    describe '#gzipped_file' do
+      it 'should return a gzipped version of the file' do
+        gz = Zlib::GzipReader.new(subject.send(:gzipped_file))
+        gz.read.should == File.read('features/support/test_site_dirs/my.blog.com/_site/index.html')
+      end
     end
+  end
+  
+  describe 'gzip zopfli' do
+    let(:config){
+      {
+        's3_reduced_redundancy' => false,
+        'gzip' => true,
+        'gzip_zopfli' => true
+      }
+    }
+
+    subject{ S3Website::Upload.new("index.html", mock(), config, 'features/support/test_site_dirs/my.blog.com/_site') }
 
+    # Zopfli should be compatible with the gzip format
     describe '#gzipped_file' do
       it 'should return a gzipped version of the file' do
         gz = Zlib::GzipReader.new(subject.send(:gzipped_file))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 1.6.13
+  version: 1.7.0
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: zopfli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement