lanyon 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f2ed82be1b1a0e4a4ca74b9ef4bf855fd321fbfdab480711e19b506c29e79e
-  data.tar.gz: e8713bd319fb150aa8763f9b977a6d3407cef1f2fe1edef01e712a8d0c5f09e4
+  metadata.gz: e0b1429cc8982232e238fdd2331a1884e68e4009e89991eb78a156cca4e28918
+  data.tar.gz: 0556faa2fe29209605bcba01f7e56da0a35baf531c3fbee26bfb63e90417d25a
 SHA512:
-  metadata.gz: b4acef77523d343f1dcf1b2c13037cf2ca3aafd9c34613daf52aaae6697811a2b571278e52c2b75db653881fe467ddcb54abdbc991aca7ab8fed87a7cbebf946
-  data.tar.gz: 02b0eb0279f08fde9307f01c5190efc3d2197d5b7f6205aea87383811091582a9d85fd11cddd656f33a7ef5de850dd671e9770cb92a062c4af7530116321c7f4
+  metadata.gz: 18d45c5d01d49187f0d5b1ba1a47baa8da3ab8dba9fafc349a10c8acfc08f6e603e6cc1332ef0012e1e3b513c1ba065ca562f71fe06f1834bce866ec26eb12ed
+  data.tar.gz: afbcc69d870a1a32d7fa9e8bc7071caa739924051844bbce681cbe948ade437b2b15c1ad1c6900c12f08294ddba8f3849d2bb7801e12cc00966aa6d09bdc1377

data/Gemfile

@@ -1,2 +1,12 @@
 source "https://rubygems.org"
+
 gemspec
+
+gem "minitest", ">= 5.8"
+gem "rake", ">= 13.0"
+
+gem "webrick"
+
+group :linter do
+  gem "rubocop"
+end

data/History.md

@@ -1,6 +1,20 @@
 Release History
 ===============
 
+## 0.5.0
+
+* Require Ruby 3.1 or newer
+* Improve code style
+* Update README
+
+## 0.4.4
+
+* Improve code style
+* Update README
+* Add CI workflow
+* Move development dependencies from gemspec to Gemfile
+* Add WEBrick as development dependency (for Ruby 3.0)
+
 ## 0.4.3
 
 * Use Rack::ContentLength middleware to fix missing

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2022 Marcus Stollsteimer
+Copyright (c) 2015-2024 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

@@ -1,6 +1,8 @@
 Lanyon
 ======
 
+![CI](https://github.com/stomar/lanyon/actions/workflows/ci.yml/badge.svg)
+
 Lanyon serves your Jekyll site as a Rack application.
 
 Lanyon is a good friend of [Jekyll][jekyll], the static site generator,
@@ -12,7 +14,23 @@ Assuming you already have a Jekyll project that can be built and
 served using the `jekyll` command line tool, then converting it
 to a Rack application is very simple.
 
- 1. Add a `config.ru` file in your project's root directory,
+ 1. Add the Lanyon gem and one of the web servers supported by Rack
+    (e.g. Puma) to your project's `Gemfile`:
+
+    ~~~ ruby
+    gem "lanyon"
+    gem "puma"
+    ~~~
+
+    Then install the gems by running the following in the terminal:
+
+    ~~~ sh
+    bundle install
+    ~~~
+
+    For possible other choices for web servers see [Rack's README][rack].
+
+ 2. Add a `config.ru` file in your project's root directory,
     with the following content:
 
     ``` ruby
@@ -23,10 +41,10 @@ to a Rack application is very simple.
 
     You can specify additional Rack middleware in this file.
 
- 2. At the command prompt, build the site and start the web server with
+ 3. Build the site and start the web server with the following command:
 
     ``` sh
-    rackup config.ru
+    bundle exec rackup config.ru
     ```
 
 You can find an example site in the `demo` directory.
@@ -35,17 +53,9 @@ Note that Lanyon does not watch for site changes.
 Auto-regeneration similar to Jekyll's `serve` command is
 not supported, and there are no plans to add this feature.
 
-Lanyon applications can be served with WEBrick, Thin, Unicorn and many
+Lanyon applications can be served with WEBrick, Puma, Thin, and many
 other web servers, and they can be deployed to services like e.g. Heroku.
 
-## Installation
-
-You can install the Lanyon gem from RubyGems.org with
-
-``` sh
-gem install lanyon
-```
-
 ## Configuration
 
 ### Options
@@ -79,7 +89,7 @@ This can also be a file generated by Jekyll from e.g. Markdown sources.
 
 ## Requirements
 
-- [Ruby][ruby] 2.0.0 or higher
+- [Ruby][ruby] 3.1 or higher
 
 - Gem dependencies (runtime): `jekyll`, `rack`
 
@@ -107,7 +117,7 @@ Lanyon was inspired by [rack-jekyll][rack-jekyll] and written as a replacement.
 
 ## License
 
-Copyright © 2015-2022 Marcus Stollsteimer
+Copyright © 2015-2024 Marcus Stollsteimer
 
 Lanyon is licensed under the [MIT License][MIT].
 See also the included `LICENSE` file for more information.
@@ -115,6 +125,6 @@ See also the included `LICENSE` file for more information.
 
 [ruby]: http://www.ruby-lang.org/
 [jekyll]: http://jekyllrb.com/
-[rack]: http://rack.github.io/
+[rack]: https://github.com/rack/rack
 [rack-jekyll]: https://github.com/adaoraul/rack-jekyll
 [MIT]: http://www.opensource.org/licenses/MIT

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rake/testtask"
 require "fileutils"
 

data/lanyon.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "lib/lanyon/version"
 
 version  = Lanyon::VERSION
@@ -19,17 +21,15 @@ Gem::Specification.new do |s|
 
   s.license = "MIT"
 
-  s.required_ruby_version = ">= 2.0.0"
+  s.required_ruby_version = ">= 3.1.0"
 
   s.add_dependency "jekyll", ">= 2.0"
   s.add_dependency "rack", ">= 1.6", "< 3.0"
 
-  s.add_development_dependency "minitest", "~> 5.8"
-  s.add_development_dependency "rake", "~> 13.0"
-
   s.require_paths = ["lib"]
 
-  s.files = %w[
+  s.files =
+    %w[
       README.md
       LICENSE
       History.md

data/lib/lanyon/application.rb

@@ -63,16 +63,16 @@ module Lanyon
     end
 
     def html_wrap(title, content)  # :nodoc:
-      <<-DOCUMENT.gsub(/^ {6}/, "")
-      <!DOCTYPE html>
-      <html lang="en">
-      <head>
-        <meta charset="utf-8">
-        <title>#{title}</title></head>
-      <body>
-        #{content}
-      </body>
-      </html>
+      <<~DOCUMENT
+        <!DOCTYPE html>
+        <html lang="en">
+        <head>
+          <meta charset="utf-8">
+          <title>#{title}</title></head>
+        <body>
+          #{content}
+        </body>
+        </html>
       DOCUMENT
     end
 

data/lib/lanyon/router.rb

@@ -31,19 +31,17 @@ module Lanyon
     #    can be found, +path.html+ is tried.
     def endpoint(path)
       normalized = normalize_path_info(path)
-
       fullpath = File.join(@root, normalized)
-      endpoint = if FileTest.file?(fullpath)
-                   fullpath
-                 elsif needs_redirect_to_dir?(fullpath)
-                   :must_redirect
-                 elsif FileTest.file?(fullpath_html = "#{fullpath}.html")
-                   fullpath_html
-                 else
-                   :not_found
-                 end
-
-      endpoint
+
+      if FileTest.file?(fullpath)
+        fullpath
+      elsif needs_redirect_to_dir?(fullpath)
+        :must_redirect
+      elsif FileTest.file?(fullpath_html = "#{fullpath}.html")
+        fullpath_html
+      else
+        :not_found
+      end
     end
 
     # Returns the body of the custom 404 page or +nil+ if none exists.
@@ -56,7 +54,7 @@ module Lanyon
     private
 
     def needs_redirect_to_dir?(fullpath)  # :nodoc:
-      !fullpath.end_with?("/") && FileTest.file?(fullpath + "/index.html")
+      !fullpath.end_with?("/") && FileTest.file?("#{fullpath}/index.html")
     end
 
     def unescape_path(path)  # :nodoc:

data/lib/lanyon/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Lanyon
-  VERSION  = "0.4.3"
-  DATE     = "2022-01-06"
+  VERSION  = "0.5.0"
+  DATE     = "2024-01-05"
 end

data/test/helper.rb

@@ -23,7 +23,7 @@ def setup_tempdir
 end
 
 def teardown_tempdir
-  FileUtils.rm_rf(TEMP_DIR)  if File.exist?(TEMP_DIR)
+  FileUtils.rm_rf(TEMP_DIR)
 end
 
 def chdir_tempdir
@@ -31,7 +31,7 @@ def chdir_tempdir
 end
 
 def teardown_cachedir
-  FileUtils.rm_rf(CACHE_DIR)  if File.exist?(CACHE_DIR)
+  FileUtils.rm_rf(CACHE_DIR)
 end
 
 def sourcedir

data/test/test_build.rb

@@ -17,7 +17,7 @@ describe "when creating a Lanyon application" do
 
     FileUtils.mkdir_p(destdir)
     FileUtils.touch(@no_page)
-    assert  File.exist?(@no_page)
+    assert File.exist?(@no_page)
     assert !File.exist?(@page)
   end
 

data/test/test_integration.rb

@@ -84,8 +84,8 @@ describe "when handling requests" do
   describe "when asked for a nonexistent path and a custom 404 exists" do
 
     before do
-      @custom_404 = File.join(sourcedir, "404.html")
-      File.open(@custom_404, "w") {|f| f.print "Custom 404" }
+      @custom_404_file = File.join(sourcedir, "404.html")
+      File.open(@custom_404_file, "w") {|f| f.print "Custom 404" }
 
       app = get_app(source: sourcedir, destination: @destdir)
       request = Rack::MockRequest.new(app)
@@ -93,7 +93,7 @@ describe "when handling requests" do
     end
 
     after do
-      FileUtils.rm(@custom_404)
+      FileUtils.rm(@custom_404_file)
     end
 
     it "returns correct Content-Length header" do

data/test/test_router.rb

@@ -160,12 +160,12 @@ describe Lanyon::Router do
     describe "when 404.html does exist" do
 
       before do
-        @custom_404 = File.join(@sitedir, "404.html")
-        File.open(@custom_404, "w") {|f| f.print "Custom 404" }
+        @custom_404_file = File.join(@sitedir, "404.html")
+        File.open(@custom_404_file, "w") {|f| f.print "Custom 404" }
       end
 
       after do
-        FileUtils.rm(@custom_404)
+        FileUtils.rm(@custom_404_file)
       end
 
       it "returns correct body" do
@@ -178,7 +178,7 @@ describe Lanyon::Router do
   describe "when initialized" do
 
     it "strips trailing slash from root" do
-      router = Lanyon::Router.new(@sitedir + "/")
+      router = Lanyon::Router.new("#{@sitedir}/")
       _(router.root).must_equal @sitedir
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanyon
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -44,34 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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
@@ -133,14 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Lanyon serves your Jekyll site as a Rack application.