jekyll-s3 2.8.0 → 3.0.0

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-- 1.8.7
 - 1.9.2
 - 1.9.3
 - 2.0.0

data/README.md

@@ -11,6 +11,8 @@ Deploy your jekyll site to S3.
 * Help you use AWS Cloudfront to distribute your Jekyll blog
 * Create an S3 website for you
 * Improve page speed with HTTP cache control and gzipping
+* Set HTTP redirects for your website
+* (for other features, see the documentation below)
 
 ## Install
 

data/changelog.md

@@ -2,6 +2,14 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 3.0.0
+
+* Set `text/html; charset=utf-8` as the `content_type` for each `text/html`
+  object.
+
+  This change may cause unexpected behaviour for some users. As a consequence,
+  bump up major version.
+
 ## 2.8.0
 
 * Add support for simple redirects

data/features/cassettes/cucumber_tags/new-and-changed-files.yml

@@ -226,7 +226,7 @@ http_interactions:
         \   i am a new blog post\n  </body>\n</html>\n"
     headers:
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '104'
       User-Agent:

data/features/cassettes/cucumber_tags/no-new-or-changed-files.yml

@@ -211,7 +211,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '60'
       Server:
@@ -256,7 +256,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '60'
       Server:
@@ -301,7 +301,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '60'
       Server:

data/features/cassettes/cucumber_tags/one-file-to-delete.yml

@@ -211,7 +211,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '117'
       Server:
@@ -256,7 +256,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '117'
       Server:
@@ -301,7 +301,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '117'
       Server:

data/features/cassettes/cucumber_tags/only-changed-files.yml

@@ -211,7 +211,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '117'
       Server:
@@ -256,7 +256,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '117'
       Server:
@@ -301,7 +301,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '117'
       Server:
@@ -320,7 +320,7 @@ http_interactions:
         \   i got some new content for you, arnie\n  </body>\n</html>\n"
     headers:
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '121'
       User-Agent:

data/features/cassettes/cucumber_tags/s3-and-cloudfront-when-updating-a-file.yml

@@ -211,7 +211,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '60'
       Server:
@@ -256,7 +256,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '60'
       Server:
@@ -301,7 +301,7 @@ http_interactions:
       Accept-Ranges:
       - bytes
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '60'
       Server:
@@ -320,7 +320,7 @@ http_interactions:
         \   This is something for a change!\n\n\n  </body>\n</html>\n"
     headers:
       Content-Type:
-      - text/html
+      - text/html; charset=utf-8
       Content-Length:
       - '117'
       User-Agent:

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.8.0"
+  s.version     = "3.0.0"
   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

@@ -61,6 +61,7 @@ module Jekyll
           :reduced_redundancy => config['s3_reduced_redundancy']
         }
 
+        opts[:content_type] = "text/html; charset=utf-8" if mime_type == 'text/html'
         opts[:content_encoding] = "gzip" if gzip?
         opts[:cache_control] = "max-age=#{max_age}" if cache_control?
 

data/spec/lib/upload_spec.rb

@@ -11,7 +11,7 @@ describe Jekyll::S3::Upload do
       s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
         s3_object.should_receive(:write).with(
           anything(),
-          :content_type => 'text/html',
+          :content_type => 'text/html; charset=utf-8',
           :reduced_redundancy => true
         )
       end
@@ -47,7 +47,7 @@ describe Jekyll::S3::Upload do
       s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
         s3_object.should_receive(:write).with(
           anything(),
-          :content_type => 'text/html',
+          :content_type => 'text/html; charset=utf-8',
           :reduced_redundancy => false
         )
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -342,7 +342,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1250183461535379030
+      hash: 2932196294779507205
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1250183461535379030
+      hash: 2932196294779507205
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25