Merge pull request #1 from mojombo/master

sync

History.markdown

@@ -3,11 +3,14 @@
 ### Major Enhancements
 
 ### Minor Enhancements
+  * Decrease the specificity in the site template CSS (#1574)
+  * Add `encoding` configuration option (#1449)
 
 ### Bug Fixes
   * Fix up matching against source and destination when the two
     locations are similar (#1556)
   * Fix the missing `pathname` require in certain cases (#1255)
+  * Use `+` instead of `Array#concat` when building `Post` attribute list (#1571)
 
 ### Development Fixes
   * Add coverage reporting with Coveralls (#1539)

lib/jekyll/configuration.rb

@@ -14,6 +14,8 @@ module Jekyll
 
       'timezone'      => nil,           # use the local timezone
 
+      'encoding'      => nil,           # use the system encoding
+
       'safe'          => false,
       'detach'        => false,          # default to not detaching the server
       'show_drafts'   => nil,

lib/jekyll/convertible.rb

@@ -20,16 +20,23 @@ module Jekyll
       self.content || ''
     end
 
+    # Returns merged optin hash for File.read of self.site (if exists)
+    # and a given param
+    def merged_file_read_opts(opts)
+      (self.site ? self.site.file_read_opts : {}).merge(opts)
+    end
+
     # Read the YAML frontmatter.
     #
     # base - The String path to the dir containing the file.
     # name - The String filename of the file.
+    # opts - optional parameter to File.read, default at site configs
     #
     # Returns nothing.
-    def read_yaml(base, name)
+    def read_yaml(base, name, opts = {})
       begin
-        self.content = File.read(File.join(base, name))
+        self.content = File.read_with_options(File.join(base, name),
-
+                                              merged_file_read_opts(opts))
         if self.content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
           self.content = $POSTMATCH
           self.data = YAML.safe_load($1)

lib/jekyll/core_ext.rb

@@ -69,3 +69,18 @@ module Enumerable
     any? { |exp| File.fnmatch?(exp, e) }
   end
 end
+
+# Ruby 1.8's File.read don't support option.
+# read_with_options ignore optional parameter for 1.8,
+# and act as alias for 1.9 or later.
+class File
+  if RUBY_VERSION < '1.9'
+    def self.read_with_options(path, opts = {})
+      self.read(path)
+    end
+  else
+    def self.read_with_options(path, opts = {})
+      self.read(path, opts)
+    end
+  end
+end

lib/jekyll/post.rb

@@ -19,10 +19,10 @@ module Jekyll
     ]
 
     # Attributes for Liquid templates
-    ATTRIBUTES_FOR_LIQUID = EXCERPT_ATTRIBUTES_FOR_LIQUID.concat(%w[
+    ATTRIBUTES_FOR_LIQUID = EXCERPT_ATTRIBUTES_FOR_LIQUID + %w[
       content
       excerpt
-    ])
+    ]
 
     # Post name validator. Post filenames must be like:
     # 2008-11-05-my-awesome-post.textile

lib/jekyll/site.rb

@@ -3,7 +3,7 @@ module Jekyll
     attr_accessor :config, :layouts, :posts, :pages, :static_files,
                   :categories, :exclude, :include, :source, :dest, :lsi, :pygments,
                   :permalink_style, :tags, :time, :future, :safe, :plugins, :limit_posts,
-                  :show_drafts, :keep_files, :baseurl
+                  :show_drafts, :keep_files, :baseurl, :file_read_opts
 
     attr_accessor :converters, :generators
 
@@ -22,6 +22,9 @@ module Jekyll
       self.plugins         = plugins_path
       self.permalink_style = config['permalink'].to_sym
 
+      self.file_read_opts = {}
+      self.file_read_opts[:encoding] = config['encoding'] if config['encoding']
+
       self.reset
       self.setup
     end

lib/jekyll/tags/include.rb

@@ -70,6 +70,11 @@ eos
         end
       end
 
+      # Grab file read opts in the context
+      def file_read_opts(context)
+        context.registers[:site].file_read_opts
+      end
+
       def render(context)
         dir = File.join(context.registers[:site].source, INCLUDES_DIR)
         if error = validate_dir(dir, context.registers[:site].safe)
@@ -81,7 +86,7 @@ eos
           return error
         end
 
-        partial = Liquid::Template.parse(source(file))
+        partial = Liquid::Template.parse(source(file, context))
 
         context.stack do
           context['include'] = parse_params(context) if @params
@@ -108,8 +113,8 @@ eos
       end
 
       # This method allows to modify the file content by inheriting from the class.
-      def source(file)
+      def source(file, context)
-        File.read(file)
+        File.read_with_options(file, file_read_opts(context))
       end
     end
   end

lib/site_template/css/main.css

@@ -34,16 +34,16 @@ a:visited { color: #a0a; }
 /* Home
 /*
 /*****************************************************************************/
-ul.posts {
+.posts {
   list-style-type: none;
   margin-bottom: 2em;
 }
 
-ul.posts li {
+.posts li {
   line-height: 1.75em;
 }
 
-ul.posts span {
+.posts span {
   color: #aaa;
   font-family: Monaco, "Courier New", monospace;
   font-size: 80%;
@@ -63,38 +63,38 @@ ul.posts span {
   line-height: 1.5em;
 }
 
-.site .header a {
+.header a {
   font-weight: bold;
   text-decoration: none;
 }
 
-.site .header h1.title {
+.title {
   display: inline-block;
   margin-bottom: 2em;
 }
 
-.site .header h1.title a {
+.title a {
   color: #a00;
 }
 
-.site .header h1.title a:hover {
+.title a:hover {
   color: #000;
 }
 
-.site .header a.extra {
+.header a.extra {
   color: #aaa;
   margin-left: 1em;
 }
 
-.site .header a.extra:hover {
+.header a.extra:hover {
   color: #000;
 }
 
-.site .meta {
+.meta {
   color: #aaa;
 }
 
-.site .footer {
+.footer {
   font-size: 80%;
   color: #666;
   border-top: 4px solid #eee;
@@ -102,22 +102,22 @@ ul.posts span {
   overflow: hidden;
 }
 
-.site .footer .contact {
+.footer .contact {
   float: left;
   margin-right: 3em;
 }
 
-.site .footer .contact a {
+.footer .contact a {
   color: #8085C1;
 }
 
-.site .footer .rss {
+.footer .rss {
   margin-top: 1.1em;
   margin-right: -.2em;
   float: right;
 }
 
-.site .footer .rss img {
+.footer .rss img {
   border: 0;
 }
 

site/docs/configuration.md

@@ -99,6 +99,22 @@ class="flag">flags</code> (specified on the command-line) that control them.
         <p><code class="option">timezone: TIMEZONE</code></p>
       </td>
     </tr>
+    <tr class='setting'>
+      <td>
+        <p class='name'><strong>Encoding</strong></p>
+        <p class="description">
+            Set the encoding of files by name. Only available for Ruby
+            1.9 or later).
+            The default value is nil, which use Ruby default,
+            <code>ASCII-8BIT</code>.
+            Available encoding for the ruby in use, can be shown by
+            command <code>ruby -e 'puts Encoding::list.join("\n")'</code>
+        </p>
+      </td>
+      <td class='align-center'>
+        <p><code class="option">encoding: ENCODING</code></p>
+      </td>
+    </tr>
   </tbody>
 </table>
 </div>
@@ -266,6 +282,7 @@ include:     ['.htaccess']
 exclude:     []
 keep_files:  ['.git','.svn']
 timezone:    nil
+encoding:    nil
 
 future:      true
 show_drafts: nil

test/test_convertible.rb

@@ -40,7 +40,7 @@ class TestConvertible < Test::Unit::TestCase
       should "not parse if there is encoding error in file" do
         name = 'broken_front_matter3.erb'
         out = capture_stdout do
-          ret = @convertible.read_yaml(@base, name)
+          ret = @convertible.read_yaml(@base, name, :encoding => 'utf-8')
           assert_equal({}, ret)
         end
         assert_match(/invalid byte sequence in UTF-8/, out)