lanyon 0.3.4 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c6cb7a805a0eb3c37772d55e691f36ac3e1c2ab6
-  data.tar.gz: 3269b6445233679a7aa0f5cdf120950e8674bb78
+SHA256:
+  metadata.gz: a2f2ed82be1b1a0e4a4ca74b9ef4bf855fd321fbfdab480711e19b506c29e79e
+  data.tar.gz: e8713bd319fb150aa8763f9b977a6d3407cef1f2fe1edef01e712a8d0c5f09e4
 SHA512:
-  metadata.gz: ec3bc073134f90350a6b8129c811fae79c6f4284b95c830ee01662e2480f3fbf97eea1e75e232ef5e3a97a83f8a9b8e5fb65d0c94d4988b4b2906c804739fdb4
-  data.tar.gz: 573de99ab0c5d7255dbdde58464797a64f7c2f9f3c54b7bd3e0874b007ea115d6e3cd594e03ff26d534d76a96a54ba6224fdd3b22e584417dd53553dc37ad1af
+  metadata.gz: b4acef77523d343f1dcf1b2c13037cf2ca3aafd9c34613daf52aaae6697811a2b571278e52c2b75db653881fe467ddcb54abdbc991aca7ab8fed87a7cbebf946
+  data.tar.gz: 02b0eb0279f08fde9307f01c5190efc3d2197d5b7f6205aea87383811091582a9d85fd11cddd656f33a7ef5de850dd671e9770cb92a062c4af7530116321c7f4

data/History.md

@@ -1,6 +1,29 @@
 Release History
 ===============
 
+## 0.4.3
+
+* Use Rack::ContentLength middleware to fix missing
+  Content-Length headers for rack 2.1.0 and later
+* Update development dependencies
+
+## 0.4.2
+
+* Avoid deprecation warnings for minitest expectations
+* Improve code style
+
+## 0.4.1
+
+* Drop pessimistic constraint on Jekyll version
+* Remove Jekyll cache directory after tests
+* Let "clean" task remove Jekyll cache directory
+* Add Jekyll cache directory to .gitignore
+* Add magic comments for frozen string literals
+
+## 0.4.0
+
+* Support .html extension stripping
+
 ## 0.3.4
 
 * Allow Rack 2

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 Marcus Stollsteimer
+Copyright (c) 2015-2022 Marcus Stollsteimer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -56,7 +56,7 @@ or as Lanyon initialization options in `config.ru`.
 Example:
 
 ``` ruby
-run Lanyon.application(:destination => "mysite")
+run Lanyon.application(destination: "mysite")
 ```
 
 This will set a custom destination path, overriding the default (`_site`)
@@ -70,7 +70,7 @@ Additional Lanyon initialization options:
                     (default: false)
 
 Note that on read-only filesystems a site build will fail,
-so you must set `:skip_build => true` in these cases.
+so you must set `skip_build: true` in these cases.
 
 ### Custum 404 Page
 
@@ -83,6 +83,20 @@ This can also be a file generated by Jekyll from e.g. Markdown sources.
 
 - Gem dependencies (runtime): `jekyll`, `rack`
 
+## How URLs are resolved
+
+Lanyon maps URLs to corresponding files as follows:
+
+ 1. a `path/` with a trailing slash is changed to `path/index.html`,
+ 2. then, Lanyon checks for an exactly corresponding file,
+ 3. when `path` does not exist but `path/index.html` does,
+    the response will be a redirect to `path/`,
+ 4. when neither 2. nor 3. apply, +path.html+ is tried.
+
+To avoid confusion, it's probably a good idea to have only one
+of `resource`, `resource/index.html`, and `resource.html` present
+as file in your site.
+
 ## Reporting Bugs
 
 Report bugs on the Lanyon home page: <https://github.com/stomar/lanyon/>
@@ -93,7 +107,7 @@ Lanyon was inspired by [rack-jekyll][rack-jekyll] and written as a replacement.
 
 ## License
 
-Copyright &copy; 2015-2016 Marcus Stollsteimer
+Copyright &copy; 2015-2022 Marcus Stollsteimer
 
 Lanyon is licensed under the [MIT License][MIT].
 See also the included `LICENSE` file for more information.

data/Rakefile

@@ -7,7 +7,7 @@ def gemspec_file
 end
 
 
-task :default => [:test]
+task default: [:test]
 
 Rake::TestTask.new do |t|
   t.pattern = "test/**/test_*.rb"
@@ -25,6 +25,7 @@ end
 desc "Remove generated files"
 task :clean do
   FileUtils.rm_rf("demo/_site")
+  FileUtils.rm_rf("demo/.jekyll-cache")
   FileUtils.rm(Dir.glob("*.gem"))
 end
 

data/lanyon.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
 
   s.summary = "Lanyon serves your Jekyll site as a Rack application."
   s.description =
-    "Lanyon is a good friend of Jekyll, the static site generator, " +
+    "Lanyon is a good friend of Jekyll, the static site generator, " \
     "and transforms your website into a Rack application."
 
   s.authors = ["Marcus Stollsteimer"]
@@ -21,11 +21,11 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.0.0"
 
-  s.add_dependency "jekyll", ">= 2.0", "< 4.0"
+  s.add_dependency "jekyll", ">= 2.0"
   s.add_dependency "rack", ">= 1.6", "< 3.0"
 
-  s.add_development_dependency "rake", "~> 11.2"
   s.add_development_dependency "minitest", "~> 5.8"
+  s.add_development_dependency "rake", "~> 13.0"
 
   s.require_paths = ["lib"]
 
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
     ] +
     Dir.glob("lib/**/*") +
     Dir.glob("test/**/*") +
-    Dir.glob("demo/**/*").reject {|f| f =~ %r(\Ademo/_site/) }
+    Dir.glob("demo/**/*").reject {|f| f.start_with?("demo/_site/") }
 
   s.extra_rdoc_files = %w[README.md LICENSE History.md]
   s.rdoc_options = ["--charset=UTF-8", "--main=README.md"]

data/lib/lanyon/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rack/mime"
 require "rack/request"
 require "rack/response"
@@ -42,7 +44,7 @@ module Lanyon
 
     def response(filename)  # :nodoc:
       response = Rack::Response.new(File.binread(filename))
-      response["Content-Type"]  = media_type(filename)
+      response["Content-Type"] = media_type(filename)
 
       response.finish
     end
@@ -61,7 +63,7 @@ module Lanyon
     end
 
     def html_wrap(title, content)  # :nodoc:
-      <<-document.gsub(/^ {6}/, "")
+      <<-DOCUMENT.gsub(/^ {6}/, "")
       <!DOCTYPE html>
       <html lang="en">
       <head>
@@ -71,7 +73,7 @@ module Lanyon
         #{content}
       </body>
       </html>
-      document
+      DOCUMENT
     end
 
     def default_404_body  # :nodoc:
@@ -95,7 +97,7 @@ module Lanyon
     end
 
     def redirect_body(to_path)  # :nodoc:
-      message = %Q{<p>Redirecting to <a href="#{to_path}">#{to_path}</a>.</p>}
+      message = %Q(<p>Redirecting to <a href="#{to_path}">#{to_path}</a>.</p>)
 
       html_wrap("Redirection", message)
     end
@@ -108,9 +110,9 @@ module Lanyon
 
       body = redirect_body(location)
       headers = {
-        "Location"      => location,
+        "Location" => location,
         "Cache-Control" => "max-age=#{cache_time}, must-revalidate",
-        "Expires"       => (Time.now + cache_time).httpdate
+        "Expires" => (Time.now + cache_time).httpdate
       }
 
       html_response(body, 301, headers)

data/lib/lanyon/backports.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "uri"
 
 

data/lib/lanyon/router.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rack/utils"
 
 
@@ -16,9 +18,17 @@ module Lanyon
     # Returns the full file system path of the file corresponding to
     # the given URL +path+, or
     #
-    # - +:not_found+ if no corresponding file exists,
-    # - +:must_redirect+ if the request must be redirected to <tt>path/</tt>.
+    # - +:must_redirect+ if the request must be redirected to +path/+,
+    # - +:not_found+ if no corresponding file exists.
+    #
+    # The return value is found as follows:
     #
+    # 1. a +path/+ with a trailing slash is changed to +path/index.html+,
+    # 2. then, the method checks for an exactly corresponding file,
+    # 3. when +path+ does not exist but +path/index.html+ does,
+    #    a redirect will be indicated,
+    # 4. finally, when no exactly corresponding file or redirect
+    #    can be found, +path.html+ is tried.
     def endpoint(path)
       normalized = normalize_path_info(path)
 
@@ -27,6 +37,8 @@ module Lanyon
                    fullpath
                  elsif needs_redirect_to_dir?(fullpath)
                    :must_redirect
+                 elsif FileTest.file?(fullpath_html = "#{fullpath}.html")
+                   fullpath_html
                  else
                    :not_found
                  end

data/lib/lanyon/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Lanyon
-  VERSION  = "0.3.4"
-  DATE     = "2016-08-01"
+  VERSION  = "0.4.3"
+  DATE     = "2022-01-06"
 end

data/lib/lanyon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # = lanyon.rb
 #
 # See Lanyon module for documentation.
@@ -49,6 +51,7 @@ module Lanyon
 
     Rack::Builder.new do
       use Rack::Head
+      use Rack::ContentLength
       use Rack::ConditionalGet
       use Rack::ETag, nil, nil
 
@@ -68,7 +71,7 @@ module Lanyon
 
   # @private
   def self.default_options  # :nodoc:
-    { :skip_build => false }
+    { skip_build: false }
   end
 
   # @private

data/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "minitest/autorun"
 require "fileutils"
 require "stringio"
@@ -6,7 +8,11 @@ require "rack/mock"
 require "lanyon"
 
 
-TEST_DIR = File.expand_path("..", __FILE__)
+TEST_DIR = File.expand_path(__dir__)
+
+SOURCE_DIR = File.join(TEST_DIR, "source")
+CACHE_DIR = File.join(SOURCE_DIR, ".jekyll-cache")
+
 TEMP_DIR = File.join(TEST_DIR, "tmp")
 
 
@@ -24,10 +30,13 @@ def chdir_tempdir
   Dir.chdir(TEMP_DIR)
 end
 
-def sourcedir
-  File.join(TEST_DIR, "source")
+def teardown_cachedir
+  FileUtils.rm_rf(CACHE_DIR)  if File.exist?(CACHE_DIR)
 end
 
+def sourcedir
+  SOURCE_DIR
+end
 
 def silence_output
   original_stderr, original_stdout = $stderr, $stdout
@@ -38,7 +47,6 @@ ensure
   $stderr, $stdout = original_stderr, original_stdout
 end
 
-
 def file_must_exist(filename)
   assert File.exist?(filename),
          "Expected file `#{filename}' to exist."

data/test/test_build.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "helper"
 
 
@@ -9,7 +11,7 @@ describe "when creating a Lanyon application" do
 
     destdir = File.join(tempdir, "_site")
 
-    @dir_options = { :source => sourcedir, :destination => destdir }
+    @dir_options = { source: sourcedir, destination: destdir }
     @page = File.join(destdir, "index.html")
     @no_page = File.join(destdir, "not_a_page.html")
 
@@ -21,6 +23,7 @@ describe "when creating a Lanyon application" do
 
   after do
     teardown_tempdir
+    teardown_cachedir
   end
 
   it "builds the site by default, removing old content" do
@@ -33,7 +36,7 @@ describe "when creating a Lanyon application" do
   end
 
   it "does not build the site when :skip_build option is set" do
-    options = {:skip_build => true}.merge(@dir_options)
+    options = { skip_build: true }.merge(@dir_options)
     silence_output do
       Lanyon.application(options)
     end
@@ -43,7 +46,7 @@ describe "when creating a Lanyon application" do
   end
 
   it "does always build the site with ::build" do
-    options = {:skip_build => true}.merge(@dir_options)
+    options = { skip_build: true }.merge(@dir_options)
     silence_output do
       Lanyon.build(options)
     end

data/test/test_configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "helper"
 
 
@@ -23,7 +25,7 @@ describe "when configuring site" do
 
     it "loads the correct default destination" do
       config = get_jekyll_config
-      config["destination"].must_equal File.join(Dir.pwd, "_site")
+      _(config["destination"]).must_equal File.join(Dir.pwd, "_site")
     end
   end
 
@@ -41,8 +43,8 @@ describe "when configuring site" do
 
     it "loads the configuration from file" do
       config = get_jekyll_config
-      config.must_include "config_file_opt"
-      config["config_file_opt"].must_equal "ok"
+      _(config).must_include "config_file_opt"
+      _(config["config_file_opt"]).must_equal "ok"
     end
   end
 
@@ -59,28 +61,28 @@ describe "when configuring site" do
     end
 
     it "loads the configuration from file" do
-      config = get_jekyll_config(:config => "_my_config.yml")
-      config.must_include "config_file_opt"
-      config["config_file_opt"].must_equal "ok"
+      config = get_jekyll_config(config: "_my_config.yml")
+      _(config).must_include "config_file_opt"
+      _(config["config_file_opt"]).must_equal "ok"
     end
   end
 
   describe "when initialization options are given" do
 
     it "has the initialization options" do
-      config = get_jekyll_config(:init_opt => "ok")
-      config.must_include "init_opt"
-      config["init_opt"].must_equal "ok"
+      config = get_jekyll_config(init_opt: "ok")
+      _(config).must_include "init_opt"
+      _(config["init_opt"]).must_equal "ok"
     end
 
     it "has the correct destination" do
-      config = get_jekyll_config(:destination => "/project/_site")
-      config["destination"].must_equal "/project/_site"
+      config = get_jekyll_config(destination: "/project/_site")
+      _(config["destination"]).must_equal "/project/_site"
     end
 
     it "does not pass :skip_build on to Jekyll" do
-      config = get_jekyll_config(:skip_build => "ok")
-      config.wont_include "skip_build"
+      config = get_jekyll_config(skip_build: "ok")
+      _(config).wont_include "skip_build"
     end
   end
 
@@ -99,17 +101,16 @@ describe "when configuring site" do
     end
 
     it "has all options and initialization options override file options" do
-      config = get_jekyll_config(:init_opt   => "ok",
-                                 :common_opt => "from init")
-      config.must_include "init_opt"
-      config.must_include "config_file_opt"
-      config.must_include "common_opt"
-      config["common_opt"].must_equal "from init"
+      config = get_jekyll_config(init_opt: "ok", common_opt: "from init")
+      _(config).must_include "init_opt"
+      _(config).must_include "config_file_opt"
+      _(config).must_include "common_opt"
+      _(config["common_opt"]).must_equal "from init"
     end
 
     it "has the correct destination" do
-      config = get_jekyll_config(:destination => "/project/_site_from_init")
-      config["destination"].must_equal "/project/_site_from_init"
+      config = get_jekyll_config(destination: "/project/_site_from_init")
+      _(config["destination"]).must_equal "/project/_site_from_init"
     end
   end
 end

data/test/test_integration.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 require_relative "helper"
 
@@ -18,12 +18,13 @@ describe "when handling requests" do
 
     @destdir = File.join(tempdir, "_site")
 
-    app = get_app(:source => sourcedir, :destination => @destdir)
+    app = get_app(source: sourcedir, destination: @destdir)
     @request = Rack::MockRequest.new(app)
   end
 
   after do
     teardown_tempdir
+    teardown_cachedir
   end
 
 
@@ -34,23 +35,23 @@ describe "when handling requests" do
     end
 
     it "returns status 200" do
-      @response.status.must_equal 200
+      _(@response.status).must_equal 200
     end
 
     it "returns correct Content-Length header" do
-      @response.original_headers["Content-Length"].must_equal "17"
+      _(@response.original_headers["Content-Length"]).must_equal "17"
     end
 
     it "returns correct Content-Type header" do
-      @response.headers["Content-Type"].must_equal "text/html"
+      _(@response.headers["Content-Type"]).must_equal "text/html"
     end
 
     it "returns an ETag header" do
-      @response.headers["ETag"].wont_be_nil
+      _(@response.headers["ETag"]).wont_be_nil
     end
 
     it "returns correct body" do
-      @response.body.must_match %r{<p>Home Page</p>}
+      _(@response.body).must_match %r{<p>Home Page</p>}
     end
   end
 
@@ -61,21 +62,21 @@ describe "when handling requests" do
       @response = @request.get("/not/a/page")
     end
 
-    it "returns status 200" do
-      @response.status.must_equal 404
+    it "returns status 404" do
+      _(@response.status).must_equal 404
     end
 
     it "returns correct Content-Length header" do
-      @response.original_headers["Content-Length"].must_equal "142"
+      _(@response.original_headers["Content-Length"]).must_equal "142"
     end
 
     it "returns correct Content-Type header" do
-      @response.headers["Content-Type"].must_equal "text/html"
+      _(@response.headers["Content-Type"]).must_equal "text/html"
     end
 
     it "returns correct body" do
       expected = %r{<!DOCTYPE html>.*<p>404: Not Found</p>}m
-      @response.body.must_match expected
+      _(@response.body).must_match expected
     end
   end
 
@@ -86,7 +87,7 @@ describe "when handling requests" do
       @custom_404 = File.join(sourcedir, "404.html")
       File.open(@custom_404, "w") {|f| f.print "Custom 404" }
 
-      app = get_app(:source => sourcedir, :destination => @destdir)
+      app = get_app(source: sourcedir, destination: @destdir)
       request = Rack::MockRequest.new(app)
       @response = request.get("/not/a/page")
     end
@@ -96,15 +97,15 @@ describe "when handling requests" do
     end
 
     it "returns correct Content-Length header" do
-      @response.original_headers["Content-Length"].must_equal "10"
+      _(@response.original_headers["Content-Length"]).must_equal "10"
     end
 
     it "returns correct Content-Type header" do
-      @response.headers["Content-Type"].must_equal "text/html"
+      _(@response.headers["Content-Type"]).must_equal "text/html"
     end
 
     it "returns correct body" do
-      @response.body.must_equal "Custom 404"
+      _(@response.body).must_equal "Custom 404"
     end
   end
 
@@ -116,19 +117,19 @@ describe "when handling requests" do
     end
 
     it "returns status 200" do
-      @response.status.must_equal 200
+      _(@response.status).must_equal 200
     end
 
     it "returns correct Content-Type header" do
-      @response.headers["Content-Type"].must_equal "text/html"
+      _(@response.headers["Content-Type"]).must_equal "text/html"
     end
 
     it "returns correct Content-Length header" do
-      @response.original_headers["Content-Length"].must_equal "19"
+      _(@response.original_headers["Content-Length"]).must_equal "19"
     end
 
     it "returns correct body" do
-      @response.body.must_match %r{<p>A Blog Post</p>}
+      _(@response.body).must_match %r{<p>A Blog Post</p>}
     end
   end
 
@@ -140,12 +141,12 @@ describe "when handling requests" do
     end
 
     it "returns status 200" do
-      @response.status.must_equal 200
+      _(@response.status).must_equal 200
     end
 
     it "returns Content-Type 'application/octet-stream'" do
       type = @response.headers["Content-Type"]
-      type.must_equal "application/octet-stream"
+      _(type).must_equal "application/octet-stream"
     end
   end
 
@@ -154,12 +155,12 @@ describe "when handling requests" do
 
     it "returns correct Content-Type for *.css" do
       type = @request.get("/css/test.css").headers["Content-Type"]
-      type.must_equal "text/css"
+      _(type).must_equal "text/css"
     end
 
     it "returns correct Content-Type for *.min.js" do
       type = @request.get("/js/test.min.js").headers["Content-Type"]
-      type.must_equal "application/javascript"
+      _(type).must_equal "application/javascript"
     end
   end
 
@@ -167,11 +168,11 @@ describe "when handling requests" do
   describe "when asked for partially matching paths" do
 
     it "returns status 404 for path 1" do
-      @request.get("/2015/10/05/hello").status.must_equal 404
+      _(@request.get("/2015/10/05/hello").status).must_equal 404
     end
 
     it "returns status 404 for path 2" do
-      @request.get("/10/05/hello-world.html").status.must_equal 404
+      _(@request.get("/10/05/hello-world.html").status).must_equal 404
     end
   end
 
@@ -182,8 +183,8 @@ describe "when handling requests" do
       filename = File.join(@destdir, "/../_site/index.html")
       assert File.exist?(filename)
 
-      @response = @request.get("/../_site/index.html")
-      @response.status.must_equal 404
+      response = @request.get("/../_site/index.html")
+      _(response.status).must_equal 404
     end
   end
 
@@ -191,23 +192,24 @@ describe "when handling requests" do
   describe "when a directory is requested" do
 
     it "redirects to 'directory/' for 'directory' with index.html" do
-      @request.get("/dir-with-index").status.must_equal 301
+      _(@request.get("/dir-with-index").status).must_equal 301
     end
 
     it "returns status 200 for 'directory/' with index.html" do
-      @request.get("/dir-with-index/").status.must_equal 200
+      _(@request.get("/dir-with-index/").status).must_equal 200
     end
 
     it "returns correct body for 'directory/' with index.html" do
-      @request.get("/dir-with-index/").body.must_match %r{<p>Index of dir-with-index/</p>}
+      response_body = @request.get("/dir-with-index/").body
+      _(response_body).must_match %r{<p>Index of dir-with-index/</p>}
     end
 
     it "returns status 404 for 'directory' without index.html" do
-      @request.get("/dir-without-index").status.must_equal 404
+      _(@request.get("/dir-without-index").status).must_equal 404
     end
 
     it "returns status 404 for 'directory/' without index.html" do
-      @request.get("/dir-without-index/").status.must_equal 404
+      _(@request.get("/dir-without-index/").status).must_equal 404
     end
   end
 
@@ -219,20 +221,20 @@ describe "when handling requests" do
     end
 
     it "returns status 301" do
-      @response.status.must_equal 301
+      _(@response.status).must_equal 301
     end
 
     it "returns correct Location header" do
-      @response.headers["Location"].must_equal "/dir-with-index/"
+      _(@response.headers["Location"]).must_equal "/dir-with-index/"
     end
 
     it "returns a Cache-Control header" do
-      @response.headers["Cache-Control"].wont_be_nil
+      _(@response.headers["Cache-Control"]).wont_be_nil
     end
 
     it "returns correct body" do
       expected = %r{<!DOCTYPE html>.*<a href="/dir-with-index/">}m
-      @request.get("/dir-with-index").body.must_match expected
+      _(@request.get("/dir-with-index").body).must_match expected
     end
   end
 
@@ -245,11 +247,11 @@ describe "when handling requests" do
 
     it "returns correct body" do
       response_body = @response.body.force_encoding("UTF-8")
-      response_body.must_match %r{<p>¡Buenos días!</p>}
+      _(response_body).must_match %r{<p>¡Buenos días!</p>}
     end
 
     it "returns the bytesize as Content-Length header" do
-      @response.original_headers["Content-Length"].must_equal "23"
+      _(@response.original_headers["Content-Length"]).must_equal "23"
     end
   end
 
@@ -262,11 +264,11 @@ describe "when handling requests" do
 
     it "returns correct body" do
       expected = "File\r\nwith\r\nCRLF\r\nnewlines\r\n"
-      @response.body.must_equal expected
+      _(@response.body).must_equal expected
     end
 
     it "returns the bytesize as Content-Length header" do
-      @response.original_headers["Content-Length"].must_equal "28"
+      _(@response.original_headers["Content-Length"]).must_equal "28"
     end
   end
 
@@ -274,18 +276,18 @@ describe "when handling requests" do
   describe "when URL contains special characters" do
 
     it "returns status 200 for URL with escapes" do
-      @response = @request.get("%2F2015%2F11%2F05%2Fhello-world.html")
-      @response.status.must_equal 200
+      response = @request.get("%2F2015%2F11%2F05%2Fhello-world.html")
+      _(response.status).must_equal 200
     end
 
     it "returns status 200 for resource name with blank" do
-      @response = @request.get("with%20blank.html")
-      @response.status.must_equal 200
+      response = @request.get("with%20blank.html")
+      _(response.status).must_equal 200
     end
 
     it "returns status 200 for resource name with plus" do
-      @response = @request.get("with+plus.html")
-      @response.status.must_equal 200
+      response = @request.get("with+plus.html")
+      _(response.status).must_equal 200
     end
   end
 
@@ -303,20 +305,20 @@ describe "when handling requests" do
     end
 
     it "returns correct status code for unchanged '/'" do
-      @request.get("/", @correct_etag).status.must_equal 304
+      _(@request.get("/", @correct_etag).status).must_equal 304
     end
 
     it "does not return a Content-Length header for unchanged '/'" do
       response = @request.get("/", @correct_etag)
-      response.original_headers["Content-Length"].must_be_nil
+      _(response.original_headers["Content-Length"]).must_be_nil
     end
 
     it "returns correct status code for changed '/'" do
-      @request.get("/", @other_etag).status.must_equal 200
+      _(@request.get("/", @other_etag).status).must_equal 200
     end
 
     it "returns correct status code for 404" do
-      @request.get("/not/a/page", @other_etag).status.must_equal 404
+      _(@request.get("/not/a/page", @other_etag).status).must_equal 404
     end
   end
 
@@ -324,15 +326,15 @@ describe "when handling requests" do
   describe "when handling HEAD requests" do
 
     it "returns status 200 for '/'" do
-      @request.head("/").status.must_equal 200
+      _(@request.head("/").status).must_equal 200
     end
 
     it "returns correct Content-Length header for '/'" do
-      @request.head("/").original_headers["Content-Length"].must_equal "17"
+      _(@request.head("/").original_headers["Content-Length"]).must_equal "17"
     end
 
     it "does not return a body" do
-      @request.head("/").body.must_equal ""
+      _(@request.head("/").body).must_equal ""
     end
   end
 
@@ -340,36 +342,41 @@ describe "when handling requests" do
   describe "when handling OPTIONS requests" do
 
     it "returns status 200" do
-      @request.options("/").status.must_equal 200
+      _(@request.options("/").status).must_equal 200
     end
 
     it "returns correct Allow header" do
-      @request.options("/").original_headers["Allow"].must_equal "GET,HEAD,OPTIONS"
+      response_allow_header = @request.options("/").original_headers["Allow"]
+      _(response_allow_header).must_equal "GET,HEAD,OPTIONS"
     end
 
     it "does not return a body" do
-      @request.options("/").body.must_equal ""
+      _(@request.options("/").body).must_equal ""
     end
 
     it "returns 404 for nonexistent resource" do
-      @request.options("/not/a/page").status.must_equal 404
-      @request.options("/not/a/page").body.must_match %r{<p>404: Not Found</p>}
+      _(@request.options("/not/a/page").status).must_equal 404
+      _(@request.options("/not/a/page").body).must_match %r{<p>404: Not Found</p>}
     end
   end
 
 
-  describe "when handling POST, PUT, DELETE, and other requests" do
+  describe "when handling POST, PUT, DELETE, and other not allowed requests" do
 
     it "returns status 405" do
-      @request.post("/").status.must_equal 405
-      @request.put("/").status.must_equal 405
-      @request.delete("/").status.must_equal 405
-      @request.request("OTHER", "/").status.must_equal 405
+      _(@request.post("/").status).must_equal 405
+      _(@request.put("/").status).must_equal 405
+      _(@request.delete("/").status).must_equal 405
+      _(@request.request("OTHER", "/").status).must_equal 405
     end
 
     it "returns correct body" do
       expected = %r{<!DOCTYPE html>.*<p>405: Method Not Allowed</p>}m
-      @request.post("/").body.must_match expected
+      _(@request.post("/").body).must_match expected
+    end
+
+    it "returns correct Content-Length header" do
+      _(@request.post("/").original_headers["Content-Length"]).must_equal "151"
     end
   end
 end

data/test/test_router.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "helper"
 
 
@@ -17,6 +19,10 @@ describe Lanyon::Router do
       dir-with-index/index.html
       dir-without-index/page.html
       dir1/dir2/dir3/index.html
+      foo
+      foo.html
+      bar.html
+      bar/index.html
     ]
 
     files.each do |path|
@@ -37,44 +43,78 @@ describe Lanyon::Router do
 
     it "returns path for '/'" do
       filename = File.join(@sitedir, "index.html")
-      @router.endpoint("/").must_equal filename
+      _(@router.endpoint("/")).must_equal filename
     end
 
     it "returns existing path" do
       filename = File.join(@sitedir, "page.html")
-      @router.endpoint("/page.html").must_equal filename
+      _(@router.endpoint("/page.html")).must_equal filename
     end
 
     it "returns existing path for resource without extension" do
       filename = File.join(@sitedir, "README")
-      @router.endpoint("/README").must_equal filename
+      _(@router.endpoint("/README")).must_equal filename
     end
 
     it "returns :not_found for non-existent path" do
-      @router.endpoint("/not-a-page.html").must_equal :not_found
+      _(@router.endpoint("/not-a-page.html")).must_equal :not_found
     end
 
     it "returns :not_found for partially matching paths" do
-      @router.endpoint("/dir1/dir2/").must_equal :not_found
-      @router.endpoint("/dir2/dir3").must_equal :not_found
-      @router.endpoint("ir1/di").must_equal :not_found
+      _(@router.endpoint("/dir1/dir2/")).must_equal :not_found
+      _(@router.endpoint("/dir2/dir3")).must_equal :not_found
+      _(@router.endpoint("ir1/di")).must_equal :not_found
     end
 
     it "returns path for '/path/to/dir/' with index" do
       filename = File.join(@sitedir, "dir-with-index/index.html")
-      @router.endpoint("/dir-with-index/").must_equal filename
+      _(@router.endpoint("/dir-with-index/")).must_equal filename
     end
 
     it "returns :must_redirect for '/path/to/dir' with index" do
-      @router.endpoint("/dir-with-index").must_equal :must_redirect
+      _(@router.endpoint("/dir-with-index")).must_equal :must_redirect
     end
 
     it "returns :not_found for '/path/to/dir/' without index" do
-      @router.endpoint("/dir-without-index/").must_equal :not_found
+      _(@router.endpoint("/dir-without-index/")).must_equal :not_found
     end
 
     it "returns :not_found for '/path/to/dir' without index" do
-      @router.endpoint("/dir-without-index").must_equal :not_found
+      _(@router.endpoint("/dir-without-index")).must_equal :not_found
+    end
+  end
+
+
+  describe "when automatically adding .html extension" do
+
+    it "returns existing path" do
+      filename = File.join(@sitedir, "page.html")
+      _(@router.endpoint("/page")).must_equal filename
+    end
+
+    describe "when both `foo' and `foo.html' exist" do
+
+      it "returns `foo' and not `foo.html' when asked for `foo'" do
+        filename = File.join(@sitedir, "foo")
+        _(@router.endpoint("/foo")).must_equal filename
+      end
+
+      it "can also serve `foo.html'" do
+        filename = File.join(@sitedir, "foo.html")
+        _(@router.endpoint("/foo.html")).must_equal filename
+      end
+    end
+
+    describe "when both `bar.html' and `bar/index.html' exist" do
+
+      it "returns :must_redirect and not `bar.html' when asked for `bar'" do
+        _(@router.endpoint("/bar")).must_equal :must_redirect
+      end
+
+      it "can also serve `bar.html'" do
+        filename = File.join(@sitedir, "bar.html")
+        _(@router.endpoint("/bar.html")).must_equal filename
+      end
     end
   end
 
@@ -83,27 +123,27 @@ describe Lanyon::Router do
 
     it "discards leading '..' for existing path" do
       filename = File.join(@sitedir, "page.html")
-      @router.endpoint("/../../page.html").must_equal filename
+      _(@router.endpoint("/../../page.html")).must_equal filename
     end
 
     it "allows safe directory traversal" do
       filename = File.join(@sitedir, "index.html")
-      @router.endpoint("/dir1/../").must_equal filename
+      _(@router.endpoint("/dir1/../")).must_equal filename
     end
 
     it "returns :not_found for unsafe directory traversal 1" do
       filename = File.join(@sitedir, "/../_site/page.html")
       assert File.exist?(filename)
 
-      @router.endpoint("/../_site/page.html").must_equal :not_found
+      _(@router.endpoint("/../_site/page.html")).must_equal :not_found
     end
 
     it "returns :not_found for unsafe directory traversal 2" do
-      @router.endpoint("/%2E%2E/_site/").must_equal :not_found
+      _(@router.endpoint("/%2E%2E/_site/")).must_equal :not_found
     end
 
     it "returns :not_found for unsafe directory traversal 3" do
-      @router.endpoint("/dir1/../dir1/../../_site/").must_equal :not_found
+      _(@router.endpoint("/dir1/../dir1/../../_site/")).must_equal :not_found
     end
   end
 
@@ -113,7 +153,7 @@ describe Lanyon::Router do
     describe "when 404.html does not exist" do
 
       it "returns nil" do
-        @router.custom_404_body.must_be_nil
+        _(@router.custom_404_body).must_be_nil
       end
     end
 
@@ -129,7 +169,7 @@ describe Lanyon::Router do
       end
 
       it "returns correct body" do
-        @router.custom_404_body.must_equal "Custom 404"
+        _(@router.custom_404_body).must_equal "Custom 404"
       end
     end
   end
@@ -139,14 +179,14 @@ describe Lanyon::Router do
 
     it "strips trailing slash from root" do
       router = Lanyon::Router.new(@sitedir + "/")
-      router.root.must_equal @sitedir
+      _(router.root).must_equal @sitedir
     end
 
     it "does not append a trailing slash to root" do
       assert !@sitedir.end_with?("/")
 
       router = Lanyon::Router.new(@sitedir)
-      router.root.must_equal @sitedir
+      _(router.root).must_equal @sitedir
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanyon
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.3
 platform: ruby
 authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -51,33 +45,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '13.0'
 description: Lanyon is a good friend of Jekyll, the static site generator, and transforms
   your website into a Rack application.
 email: sto.mar@web.de
@@ -146,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Lanyon serves your Jekyll site as a Rack application.