jekyll 3.0.0.pre.beta8 → 3.0.0.pre.beta9

data/lib/jekyll/page.rb

@@ -36,7 +36,7 @@ module Jekyll
         site.frontmatter_defaults.find(File.join(dir, name), type, key)
       end
 
-      Jekyll::Hooks.trigger self, :post_init
+      Jekyll::Hooks.trigger :page, :post_init, self
     end
 
     # The generated directory into which the page will be placed

data/lib/jekyll/plugin_manager.rb

@@ -82,10 +82,10 @@ module Jekyll
     #
     # Returns an Array of plugin search paths
     def plugins_path
-      if (site.config['plugins'] == Jekyll::Configuration::DEFAULTS['plugins'])
-        [site.in_source_dir(site.config['plugins'])]
+      if (site.config['plugins_dir'] == Jekyll::Configuration::DEFAULTS['plugins_dir'])
+        [site.in_source_dir(site.config['plugins_dir'])]
       else
-        Array(site.config['plugins']).map { |d| File.expand_path(d) }
+        Array(site.config['plugins_dir']).map { |d| File.expand_path(d) }
       end
     end
 

data/lib/jekyll/post.rb

@@ -69,7 +69,7 @@ module Jekyll
       populate_categories
       populate_tags
 
-      Jekyll::Hooks.trigger self, :post_init
+      Jekyll::Hooks.trigger :post, :post_init, self
     end
 
     def published?

data/lib/jekyll/reader.rb

@@ -16,7 +16,7 @@ module Jekyll
       @site.layouts = LayoutReader.new(site).read
       read_directories
       sort_files!
-      @site.data = DataReader.new(site).read(site.config['data_source'])
+      @site.data = DataReader.new(site).read(site.config['data_dir'])
       CollectionReader.new(site).read
     end
 

data/lib/jekyll/readers/layout_reader.rb

@@ -38,11 +38,11 @@ module Jekyll
     end
 
     def layout_directory_inside_source
-      site.in_source_dir(site.config['layouts'])
+      site.in_source_dir(site.config['layouts_dir'])
     end
 
     def layout_directory_in_cwd
-      dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts'])
+      dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts_dir'])
       if File.directory?(dir) && !site.safe
         dir
       else

data/lib/jekyll/regenerator.rb

@@ -130,9 +130,7 @@ module Jekyll
     #
     # Returns nothing.
     def write_metadata
-      File.open(metadata_file, 'wb') do |f|
-        f.write(Marshal.dump(metadata))
-      end
+      File.binwrite(metadata_file, Marshal.dump(metadata))
     end
 
     # Produce the absolute path of the metadata file
@@ -158,7 +156,7 @@ module Jekyll
     # Returns the read metadata.
     def read_metadata
       @metadata = if !disabled? && File.file?(metadata_file)
-        content = File.read(metadata_file)
+        content = File.binread(metadata_file)
 
         begin
           Marshal.load(content)

data/lib/jekyll/renderer.rb

@@ -35,7 +35,7 @@ module Jekyll
         "page" => document.to_liquid
       }, site_payload || site.site_payload)
 
-      Jekyll::Hooks.trigger document, :pre_render, payload
+      Jekyll::Hooks.trigger :document, :pre_render, document, payload
 
       info = {
         filters:   [Jekyll::Filters],
@@ -138,7 +138,7 @@ module Jekyll
           layout.content,
           payload,
           info,
-          File.join(site.config['layouts'], layout.name)
+          File.join(site.config['layouts_dir'], layout.name)
         )
 
         # Add layout to dependency tree

data/lib/jekyll/site.rb

@@ -86,7 +86,7 @@ module Jekyll
         raise ArgumentError, "limit_posts must be a non-negative number"
       end
 
-      Jekyll::Hooks.trigger self, :after_reset
+      Jekyll::Hooks.trigger :site, :after_reset, self
     end
 
     # Load necessary libraries, plugins, converters, and generators.
@@ -144,7 +144,7 @@ module Jekyll
     def read
       reader.read
       limit_posts!
-      Jekyll::Hooks.trigger self, :post_read
+      Jekyll::Hooks.trigger :site, :post_read, self
     end
 
     # Run each of the Generators.
@@ -164,13 +164,13 @@ module Jekyll
 
       payload = site_payload
 
-      Jekyll::Hooks.trigger self, :pre_render, payload
+      Jekyll::Hooks.trigger :site, :pre_render, self, payload
 
       collections.each do |label, collection|
         collection.docs.each do |document|
           if regenerator.regenerate?(document)
             document.output = Jekyll::Renderer.new(self, document, payload).run
-            Jekyll::Hooks.trigger document, :post_render
+            Jekyll::Hooks.trigger :document, :post_render, document
           end
         end
       end
@@ -199,7 +199,7 @@ module Jekyll
         item.write(dest) if regenerator.regenerate?(item)
       }
       regenerator.write_metadata
-      Jekyll::Hooks.trigger self, :post_write
+      Jekyll::Hooks.trigger :site, :post_write, self
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.

data/lib/jekyll/static_file.rb

@@ -37,7 +37,7 @@ module Jekyll
 
     def destination_rel_dir
       if @collection
-        @dir.gsub(/\A_/, '')
+        File.dirname(url)
       else
         @dir
       end
@@ -61,9 +61,10 @@ module Jekyll
 
     # Whether to write the file to the filesystem
     #
-    # Returns true.
+    # Returns true unless the defaults for the destination path from
+    # _config.yml contain `published: false`.
     def write?
-      true
+      defaults.fetch('published', true)
     end
 
     # Write the static file to the destination directory (if modified).
@@ -100,5 +101,41 @@ module Jekyll
         "path"          => File.join("", relative_path)
       }
     end
+
+    def placeholders
+      {
+        collection: @collection.label,
+        path: relative_path[
+          @collection.relative_directory.size..relative_path.size],
+        output_ext: '',
+        name: '',
+        title: '',
+      }
+    end
+
+    # Applies a similar URL-building technique as Jekyll::Document that takes
+    # the collection's URL template into account. The default URL template can
+    # be overriden in the collection's configuration in _config.yml.
+    def url
+      @url ||= if @collection.nil?
+        relative_path
+      else
+        ::Jekyll::URL.new({
+          template:  @collection.url_template,
+          placeholders: placeholders,
+        })
+      end.to_s.gsub /\/$/, ''
+    end
+
+    # Returns the type of the collection if present, nil otherwise.
+    def type
+      @type ||= @collection.nil? ? nil : @collection.label.to_sym
+    end
+
+    # Returns the front matter defaults defined for the file's URL and/or type
+    # as defined in _config.yml.
+    def defaults
+      @defaults ||= @site.frontmatter_defaults.all url, type
+    end
   end
 end

data/lib/jekyll/tags/highlight.rb

@@ -64,7 +64,7 @@ eos
         if is_safe
           Hash[[
             [:startinline, opts.fetch(:startinline, nil)],
-            [:hl_linenos,  opts.fetch(:hl_linenos, nil)],
+            [:hl_lines,    opts.fetch(:hl_lines, nil)],
             [:linenos,     opts.fetch(:linenos, nil)],
             [:encoding,    opts.fetch(:encoding, 'utf-8')],
             [:cssclass,    opts.fetch(:cssclass, nil)]

data/lib/jekyll/tags/include.rb

@@ -20,7 +20,6 @@ module Jekyll
 
       def initialize(tag_name, markup, tokens)
         super
-        @includes_dir = tag_includes_dir
         matched = markup.strip.match(VARIABLE_SYNTAX)
         if matched
           @file = matched['variable'].strip
@@ -100,12 +99,13 @@ eos
         end
       end
 
-      def tag_includes_dir
-        '_includes'.freeze
+      def tag_includes_dir(context)
+        context.registers[:site].config['includes_dir'].freeze
       end
 
       def render(context)
         site = context.registers[:site]
+        @includes_dir = tag_includes_dir(context)
         dir = resolved_includes_dir(context)
 
         file = render_variable(context) || @file
@@ -161,7 +161,7 @@ eos
     end
 
     class IncludeRelativeTag < IncludeTag
-      def tag_includes_dir
+      def tag_includes_dir(context)
         '.'.freeze
       end
 

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.0.pre.beta8'
+  VERSION = '3.0.0.pre.beta9'
 end

data/lib/site_template/_includes/header.html

@@ -14,9 +14,9 @@
       </a>
 
       <div class="trigger">
-        {% for page in site.pages %}
-          {% if page.title %}
-          <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
+        {% for my_page in site.pages %}
+          {% if my_page.title %}
+          <a class="page-link" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
           {% endif %}
         {% endfor %}
       </div>

data/lib/site_template/css/main.scss

@@ -30,7 +30,7 @@ $on-laptop:        800px;
 
 
 
-// Using media queries with like this:
+// Use media queries like this:
 // @include media-query($on-palm) {
 //     .wrapper {
 //         padding-right: $spacing-unit / 2;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta8
+  version: 3.0.0.pre.beta9
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid