jekyll-s3 2.4.0 → 2.4.1

data/changelog.md

@@ -1,8 +1,16 @@
 # Changelog
 
+This project uses [Semantic Versioning](http://semver.org).
+
+## 2.4.1
+
+* Declare internal methods private in `upload.rb`
+
+  This eases future refactorings
+
 ## 2.4.0
 
-* Add gzip support
+* Add support for specifying `Content-Encoding: gzip` HTTP header
 * Add support for specifying `Cache-Control: max-age` HTTP header
 
 ## 2.3.0

data/features/jekyll-s3-upload.feature

@@ -19,7 +19,6 @@ Feature: upload Jekyll site to S3
       """
 
   @new-files-for-sydney
-  @wip
   Scenario: Push a new Jekyll site to an S3 bucket in Sydney
     When my Jekyll site is in "features/support/test_site_dirs/my.sydney.blog.au"
     Then jekyll-s3 will push my blog to S3

data/features/jekyll-s3-website-performance.feature

@@ -33,7 +33,7 @@ Feature: improve response times of your Jekyll website
       """
 
   @new-files
-  Scenario: Set Content-Encoding: gzip HTTP header
+  Scenario: Set Content-Encoding: gzip HTTP header for HTML files
     When my Jekyll site is in "features/support/test_site_dirs/site.with.gzipped-html.com"
     Then jekyll-s3 will push my blog to S3
     And the output should equal
@@ -47,7 +47,6 @@ Feature: improve response times of your Jekyll website
       """
 
   @new-files
-  @wip
   Scenario: Set both the Content-Encoding: gzip and Cache-Control: max-age headers
     When my Jekyll site is in "features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com"
     Then jekyll-s3 will push my blog to S3

data/jekyll-s3.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "jekyll-s3"
-  s.version     = "2.4.0"
+  s.version     = "2.4.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Philippe Creux", "Lauri Lehmijoki"]
   s.email       = ["pcreux@gmail.com", "lauri.lehmijoki@iki.fi"]

data/lib/jekyll-s3/upload.rb

@@ -20,6 +20,12 @@ module Jekyll
         success
       end
 
+      def details
+        "#{path}#{" [gzipped]" if gzip?}#{" [max-age=#{max_age}]" if cache_control?}"
+      end
+
+      private
+
       def upload_file
         @upload_file ||= gzip? ? gzipped_file : file
       end
@@ -33,26 +39,22 @@ module Jekyll
 
       def gzipped_file
         tempfile = Tempfile.new(File.basename(path))
-        
+
         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
         tempfile.open
 
         tempfile
       end
 
-      def details
-        "#{path}#{" [gzipped]" if gzip?}#{" [max-age=#{max_age}]" if cache_control?}"
-      end
-
       def upload_options
         opts = {
           :content_type => mime_type,
@@ -61,7 +63,7 @@ module Jekyll
 
         opts[:content_encoding] = "gzip" if gzip?
         opts[:cache_control] = "max-age=#{max_age}" if cache_control?
-        
+
         opts
       end
 
@@ -86,4 +88,4 @@ module Jekyll
       end
     end
   end
-end
+end

data/spec/lib/upload_spec.rb

@@ -92,7 +92,7 @@ describe Jekyll::S3::Upload do
 
     describe '#gzipped_file' do
       it 'should return a gzipped version of the file' do
-        gz = Zlib::GzipReader.new(subject.gzipped_file)
+        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
@@ -126,17 +126,17 @@ describe Jekyll::S3::Upload do
 
     describe '#max_age' do
       it 'should be the universal value if one is set' do
-        subject.max_age.should == 300
+        subject.send(:max_age).should == 300
       end
 
       it 'should be the file-specific value if one is set' do
         config['max_age'] = {'*index.html' => 500}
-        subject.max_age.should == 500
+        subject.send(:max_age).should == 500
       end
 
       it 'should be zero if no file-specific value hit' do
         config['max_age'] = {'*.js' => 500}
-        subject.max_age.should == 0
+        subject.send(:max_age).should == 0
       end
     end
   end
@@ -163,4 +163,4 @@ describe Jekyll::S3::Upload do
     s3.stub(:buckets => buckets)
     s3
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk