jekyll 3.2.0.pre.beta2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b7bb5f6deedf2cb6282ffec118cc3f9a3f76759
-  data.tar.gz: 77353178dc51e04a8b773150beb7c987ec49f8c0
+  metadata.gz: fb6d09c543908a9e92a03dec3e709e25bb0a291f
+  data.tar.gz: 3b306c86e96b2cf1ec0a4f7bf00abc1ef5970d02
 SHA512:
-  metadata.gz: a3b5990ea04d2f19653f522a1e0f853ad6b005c470483ecf37b93e37d872629963c50eed480b833afb9ea6af548d686ffd032f1f8e051a5b699547f22e414872
-  data.tar.gz: 1430e36ff3d6e8a08cf7b708d90eb27d584b21a2e4243f2e5465761a63814b2aeef40ac0f2861d1b8cc058166380a167ff90a8fa40a857446e966cf4c8cf5b13
+  metadata.gz: 4df49dea68ad05648ea7d75a7142b57948f11a011d78810150253190de4c17e074278394a0e757ff4ac868883ad0ca7d7cc8a868a4e2d9bdad7da3bb2fb00042
+  data.tar.gz: 6a31318b580d36092a51a128f2ad8e8cec93251ac5c83c2b9be8517e965515520914013938c1c2babe3a51afb2685f42fb0aea0e6b61ae84c6fb02b259d84ed6

data/lib/jekyll/collection.rb

@@ -25,7 +25,7 @@ module Jekyll
 
     # Override of normal respond_to? to match method_missing's logic for
     # looking in @data.
-    def respond_to?(method, include_private = false)
+    def respond_to_missing?(method, include_private = false)
       docs.respond_to?(method.to_sym, include_private) || super
     end
 

data/lib/jekyll/command.rb

@@ -55,6 +55,8 @@ module Jekyll
         c.option "limit_posts", "--limit_posts MAX_POSTS", Integer,
           "Limits the number of posts to parse and publish"
         c.option "watch", "-w", "--[no-]watch", "Watch for changes and rebuild"
+        c.option "baseurl", "-b", "--baseurl URL",
+          "Serve the website from the given base URL"
         c.option "force_polling", "--force_polling", "Force watch to use polling"
         c.option "lsi", "--lsi", "Use LSI for improved related posts"
         c.option "show_drafts", "-D", "--drafts", "Render posts in the _drafts folder"

data/lib/jekyll/commands/serve.rb

@@ -9,7 +9,6 @@ module Jekyll
           "detach"             => ["-B", "--detach", "Run the server in the background"],
           "ssl_key"            => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
           "port"               => ["-P", "--port [PORT]", "Port to listen on"],
-          "baseurl"            => ["-b", "--baseurl [URL]", "Base URL"],
           "show_dir_listing"   => ["--show-dir-listing",
             "Show a directory listing instead of loading your index file."],
           "skip_initial_build" => ["skip_initial_build", "--skip-initial-build",

data/lib/jekyll/configuration.rb

@@ -374,7 +374,7 @@ module Jekyll
 
     private
     def check_maruku(config)
-      if config.fetch("markdown", "kramdown").to_s.casecmp("maruku") == 0
+      if config.fetch("markdown", "kramdown").to_s.casecmp("maruku").zero?
         Jekyll.logger.abort_with "Error:", "You're using the 'maruku' " \
           "Markdown processor, which has been removed as of 3.0.0. " \
           "We recommend you switch to Kramdown. To do this, replace " \

data/lib/jekyll/convertible.rb

@@ -114,16 +114,16 @@ module Jekyll
     #
     # Returns the converted content
     def render_liquid(content, payload, info, path)
-      site.liquid_renderer.file(path).parse(content).render!(payload, info)
-    rescue Tags::IncludeTagError => e
-      Jekyll.logger.error(
-        "Liquid Exception:",
-        "#{e.message} in #{e.path}, included in #{path || self.path}"
-      )
-      raise e
+      template = site.liquid_renderer.file(path).parse(content)
+      template.warnings.each do |e|
+        Jekyll.logger.warn "Liquid Warning:",
+          LiquidRenderer.format_error(e, path || self.path)
+      end
+      template.render!(payload, info)
     # rubocop: disable RescueException
     rescue Exception => e
-      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || self.path}"
+      Jekyll.logger.error "Liquid Exception:",
+        LiquidRenderer.format_error(e, path || self.path)
       raise e
     end
     # rubocop: enable RescueException

data/lib/jekyll/document.rb

@@ -367,7 +367,7 @@ module Jekyll
     def <=>(other)
       return nil unless other.respond_to?(:data)
       cmp = data["date"] <=> other.data["date"]
-      cmp = path <=> other.path if cmp.nil? || cmp == 0
+      cmp = path <=> other.path if cmp.nil? || cmp.zero?
       cmp
     end
 

data/lib/jekyll/drops/document_drop.rb

@@ -25,7 +25,7 @@ module Jekyll
       def <=>(other)
         return nil unless other.is_a? DocumentDrop
         cmp = self["date"] <=> other["date"]
-        cmp = self["path"] <=> other["path"] if cmp.nil? || cmp == 0
+        cmp = self["path"] <=> other["path"] if cmp.nil? || cmp.zero?
         cmp
       end
 

data/lib/jekyll/filters.rb

@@ -233,11 +233,11 @@ module Jekyll
     #
     # Returns the filtered array of objects
     def where(input, property, value)
-      return input unless input.is_a?(Enumerable)
+      return input unless input.respond_to?(:select)
       input = input.values if input.is_a?(Hash)
       input.select do |object|
         Array(item_property(object, property)).map(&:to_s).include?(value.to_s)
-      end
+      end || []
     end
 
     # Filters an array of objects against an expression
@@ -248,7 +248,7 @@ module Jekyll
     #
     # Returns the filtered array of objects
     def where_exp(input, variable, expression)
-      return input unless input.is_a?(Enumerable)
+      return input unless input.respond_to?(:select)
       input = input.values if input.is_a?(Hash) # FIXME
 
       condition = parse_condition(expression)
@@ -257,7 +257,7 @@ module Jekyll
           @context[variable] = object
           condition.evaluate(@context)
         end
-      end
+      end || []
     end
 
     # Convert the input into integer
@@ -373,8 +373,8 @@ module Jekyll
       when Numeric
         Time.at(input)
       else
-        Jekyll.logger.error "Invalid Date:", "'#{input}' is not a valid datetime."
-        exit(1)
+        raise Errors::InvalidDateError,
+          "Invalid Date: '#{input.inspect}' is not a valid datetime."
       end.localtime
     end
 

data/lib/jekyll/liquid_renderer.rb

@@ -39,5 +39,12 @@ module Jekyll
     def stats_table(n = 50)
       LiquidRenderer::Table.new(@stats).to_s(n)
     end
+
+    def self.format_error(e, path)
+      if e.is_a? Tags::IncludeTagError
+        return "#{e.message} in #{e.path}, included in #{path}"
+      end
+      "#{e.message} in #{path}"
+    end
   end
 end

data/lib/jekyll/liquid_renderer/file.rb

@@ -30,6 +30,10 @@ module Jekyll
         end
       end
 
+      def warnings
+        @template.warnings
+      end
+
       private
 
       def measure_bytes

data/lib/jekyll/liquid_renderer/table.rb

@@ -43,7 +43,7 @@ module Jekyll
       str = ""
 
       row_data.each_with_index do |cell_data, cell_index|
-        str << if cell_index == 0
+        str << if cell_index.zero?
                  cell_data.ljust(widths[cell_index], " ")
                else
                  cell_data.rjust(widths[cell_index], " ")

data/lib/jekyll/renderer.rb

@@ -106,15 +106,16 @@ module Jekyll
     #
     # Returns the content, rendered by Liquid.
     def render_liquid(content, payload, info, path = nil)
-      site.liquid_renderer.file(path).parse(content).render!(payload, info)
-    rescue Tags::IncludeTagError => e
-      Jekyll.logger.error "Liquid Exception:",
-        "#{e.message} in #{e.path}, included in #{path || document.relative_path}"
-      raise e
+      template = site.liquid_renderer.file(path).parse(content)
+      template.warnings.each do |e|
+        Jekyll.logger.warn "Liquid Warning:",
+          LiquidRenderer.format_error(e, path || document.relative_path)
+      end
+      template.render!(payload, info)
     # rubocop: disable RescueException
     rescue Exception => e
       Jekyll.logger.error "Liquid Exception:",
-        "#{e.message} in #{path || document.relative_path}"
+        LiquidRenderer.format_error(e, path || document.relative_path)
       raise e
     end
     # rubocop: enable RescueException

data/lib/jekyll/site.rb

@@ -172,7 +172,8 @@ module Jekyll
       generators.each do |generator|
         start = Time.now
         generator.generate(self)
-        Jekyll.logger.debug "Generating:", "#{generator.class} finished in #{Time.now - start} seconds."
+        Jekyll.logger.debug "Generating:",
+          "#{generator.class} finished in #{Time.now - start} seconds."
       end
     end
 

data/lib/jekyll/theme_builder.rb

@@ -16,7 +16,6 @@ class Jekyll::ThemeBuilder
     create_starter_files
     create_gemspec
     create_accessories
-    create_example_site
     initialize_git_repo
   end
 
@@ -57,7 +56,6 @@ class Jekyll::ThemeBuilder
 
   def create_directories
     mkdir_p(SCAFFOLD_DIRECTORIES)
-    mkdir_p(%w(example example/_posts))
   end
 
   def create_starter_files
@@ -72,23 +70,13 @@ class Jekyll::ThemeBuilder
   end
 
   def create_accessories
-    accessories = %w(README.md Rakefile LICENSE.txt)
+    accessories = %w(README.md LICENSE.txt)
     accessories << "CODE_OF_CONDUCT.md" if code_of_conduct
     accessories.each do |filename|
       write_file(filename, template(filename))
     end
   end
 
-  def create_example_site
-    %w(example/_config.yml example/index.html example/style.scss).each do |filename|
-      write_file(filename, template(filename))
-    end
-    write_file(
-      "example/_posts/#{Time.now.strftime("%Y-%m-%d")}-my-example-post.md",
-      template("example/_post.md")
-    )
-  end
-
   def initialize_git_repo
     Jekyll.logger.info "initialize", path.join(".git").to_s
     Dir.chdir(path.to_s) { `git init` }

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.2.0.pre.beta2".freeze
+  VERSION = "3.2.0".freeze
 end

data/lib/site_template/about.md

@@ -7,8 +7,8 @@ permalink: /about/
 This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
 
 You can find the source code for the Jekyll new theme at:
-{% include icon-github.html username="jglovier" %} /
-[jekyll-new](https://github.com/jglovier/jekyll-new)
+{% include icon-github.html username="jekyll" %} /
+[minima](https://github.com/jekyll/minima)
 
 You can find the source code for Jekyll at
 {% include icon-github.html username="jekyll" %} /

data/lib/theme_template/README.md.erb

@@ -38,7 +38,9 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 
 To set up your environment to develop this theme, run `bundle install`.
 
-To test your theme, run `bundle exec rake preview` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme and the contents of the `example/` directory. As you make modifications to your theme and to the example site, your site will regenerate and you should see the changes in the browser after a refresh.
+You theme is setup just like a normal Jelyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
+
+When your theme is released, only the files in `_layouts`, `_includes`, and `_sass` tracked with Git will be released.
 
 ## License
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.2.0.pre.beta2
+  version: 3.2.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -234,7 +234,6 @@ files:
 - lib/theme_template/Gemfile
 - lib/theme_template/LICENSE.txt.erb
 - lib/theme_template/README.md.erb
-- lib/theme_template/Rakefile.erb
 - lib/theme_template/_layouts/default.html
 - lib/theme_template/_layouts/page.html
 - lib/theme_template/_layouts/post.html
@@ -260,12 +259,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.

data/lib/theme_template/Rakefile.erb

@@ -1,74 +0,0 @@
-require "bundler/gem_tasks"
-require "jekyll"
-require "listen"
-
-def listen_ignore_paths(base, options)
-  [
-    /_config\.ya?ml/,
-    /_site/,
-    /\.jekyll-metadata/
-  ]
-end
-
-def listen_handler(base, options)
-  site = Jekyll::Site.new(options)
-  Jekyll::Command.process_site(site)
-  proc do |modified, added, removed|
-    t = Time.now
-    c = modified + added + removed
-    n = c.length
-    relative_paths = c.map{ |p| Pathname.new(p).relative_path_from(base).to_s }
-    print Jekyll.logger.message("Regenerating:", "#{relative_paths.join(", ")} changed... ")
-    begin
-      Jekyll::Command.process_site(site)
-      puts "regenerated in #{Time.now - t} seconds."
-    rescue => e
-      puts "error:"
-      Jekyll.logger.warn "Error:", e.message
-      Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information."
-    end
-  end
-end
-
-task :preview do
-  base = Pathname.new('.').expand_path
-  options = {
-    "source"        => base.join('example').to_s,
-    "destination"   => base.join('example/_site').to_s,
-    "force_polling" => false,
-    "serving"       => true,
-    "theme"         => <%= theme_name.inspect %>
-  }
-
-  options = Jekyll.configuration(options)
-
-  ENV["LISTEN_GEM_DEBUGGING"] = "1"
-  listener = Listen.to(
-    base.join("_includes"),
-    base.join("_layouts"),
-    base.join("_sass"),
-    options["source"],
-    :ignore => listen_ignore_paths(base, options),
-    :force_polling => options['force_polling'],
-    &(listen_handler(base, options))
-  )
-
-  begin
-    listener.start
-    Jekyll.logger.info "Auto-regeneration:", "enabled for '#{options["source"]}'"
-
-    unless options['serving']
-      trap("INT") do
-        listener.stop
-        puts "     Halting auto-regeneration."
-        exit 0
-      end
-
-      loop { sleep 1000 }
-    end
-  rescue ThreadError
-    # You pressed Ctrl-C, oh my!
-  end
-
-  Jekyll::Commands::Serve.process(options)
-end