lanyon 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f2ed82be1b1a0e4a4ca74b9ef4bf855fd321fbfdab480711e19b506c29e79e
-  data.tar.gz: e8713bd319fb150aa8763f9b977a6d3407cef1f2fe1edef01e712a8d0c5f09e4
+  metadata.gz: a67a8b03e023abd95e3914606603414b556fd998a5f31c68c9419eabe0ed59b5
+  data.tar.gz: 212051d57e0db7c251f65270fafa1a54ba35b5d2e680835f1dbbc86497e83c12
 SHA512:
-  metadata.gz: b4acef77523d343f1dcf1b2c13037cf2ca3aafd9c34613daf52aaae6697811a2b571278e52c2b75db653881fe467ddcb54abdbc991aca7ab8fed87a7cbebf946
-  data.tar.gz: 02b0eb0279f08fde9307f01c5190efc3d2197d5b7f6205aea87383811091582a9d85fd11cddd656f33a7ef5de850dd671e9770cb92a062c4af7530116321c7f4
+  metadata.gz: ab0ca32972eb02b8b01af596855325899f3e8a1b0c17ac4cd860a8640969e3f472316c18ee3d3b48c12e007a23ccc29d4e4b28225b66419793df9e2dfd285494
+  data.tar.gz: 35630bef910397e987d989c73113553e0b80d1d716121c447a72776881b41d0ea6bf8a53dab992a7fbd3ca347c34dc0ccb44510fb8fe15078bf5c6e34f5b4f20

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,14 @@
 Release History
 ===============
 
+## 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/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,26 @@ 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
+    ~~~
+
+    Note that for Ruby 3.0 or newer, you _must_ explicitly add a
+    web server gem.
+    In older Ruby versions, WEBrick is already included and used as fallback.
+    For possible other choices see [Rack's README][rack].
+
+ 2. Add a `config.ru` file in your project's root directory,
     with the following content:
 
     ``` ruby
@@ -23,10 +44,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 +56,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
@@ -115,6 +128,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
@@ -24,12 +26,10 @@ Gem::Specification.new do |s|
   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/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.4.4"
+  DATE     = "2022-05-28"
 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.4.4
 platform: ruby
 authors:
 - Marcus Stollsteimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-05-28 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
@@ -140,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Lanyon serves your Jekyll site as a Rack application.