parklife 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c94649aadc5cc8fe79a9215950b461adfdf658ec56c396c42d3e69e9e6082d3
-  data.tar.gz: 54c2b0b8c4f8a8a5149d10b5f649d0009e9c9f32201d85acc8960bb595ea1e9c
+  metadata.gz: 716fff5f3d7ad38f43c2fd071de3a69dc58363b05fb7fd3d997311855a207f04
+  data.tar.gz: b153dc13fb74648185401f3a512c34eee2f0ad62659723937c0354d9c7547ecd
 SHA512:
-  metadata.gz: 3e77cf82affdd32b75f747c2a9a4bc7aaf8df14d0b847470b241b1fb34e3f98b8aea13fdb55430caff5a420e28a5ba0dc6e80d32505e315428317fb42a5fd9d6
-  data.tar.gz: d80856454fb213de0ef217f18518d42bed3f0a4e57b870f22d2e8eaa72b1cec45123e0c84b38f875b6cd85a62f543381437c8e8200cff87a31f3b2683671f94e
+  metadata.gz: 7a1a022c68a6a7c77277440c926cd430ebf857a7757f42eab76b8233af84bdc4dd9407952a9465720a6a74e43d7706b8acb41a25705ebb3d0e34c9a75a11b441
+  data.tar.gz: 80af344c3209f6a57f147714c789d6c3d21a42cd3131186e9dbebb0e267d19258cdb297f13f273baefdb4bbd4bcba955c2c1e726ee9e218d8febaf50ec4c26c8

data/.github/workflows/examples.yml

@@ -56,9 +56,9 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
-        ruby-version: '2.7'
+        ruby-version: '3.4'
         working-directory: examples/sinatra
-    - run: bundle exec parklife build
+    - run: bin/static-build
       working-directory: examples/sinatra
     - run: test -f build/index.html
       working-directory: examples/sinatra

data/.github/workflows/tests.yml

@@ -3,9 +3,56 @@ name: Tests
 on: push
 
 jobs:
+  rails:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rails:
+          - '7.0'
+          - '7.1'
+          - '7.2'
+          - '8.0'
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - '3.4'
+        exclude:
+          # Rails 8.0 requires Ruby 3.2.
+          - rails: '8.0'
+            ruby: '3.1'
+          - rails: '8.0'
+            ruby: '3.0'
+          - rails: '8.0'
+            ruby: '2.7'
+
+          # Rails 7.2 requires Ruby 3.1.
+          - rails: '7.2'
+            ruby: '3.0'
+          - rails: '7.2'
+            ruby: '2.7'
+
+          # Rails 7.0 doesn't work out of the box with Ruby 3.4.
+          - rails: '7.0'
+            ruby: '3.4'
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
+    name: Rails (Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }})
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
+    - run: bundle exec rspec --pattern "spec/**/*rails*"
+
   rspec:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby:
           - '2.7'
@@ -13,22 +60,50 @@ jobs:
           - '3.1'
           - '3.2'
           - '3.3'
-    name: Ruby ${{ matrix.ruby }} RSpec
+          - '3.4'
+    name: RSpec (Ruby ${{ matrix.ruby }})
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
-    - run: bundle exec rspec
+    - run: bundle exec rspec --exclude-pattern "spec/**/*rails*,spec/**/*sinatra*"
 
   rubocop:
     runs-on: ubuntu-latest
     name: RuboCop
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
         ruby-version: '3.2'
     - run: bundle exec rubocop
+
+  sinatra:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - '3.4'
+        sinatra:
+          - '3.x'
+          - '4.0'
+          - '4.1'
+    env:
+      BUNDLE_GEMFILE: gemfiles/sinatra_${{ matrix.sinatra }}.gemfile
+    name: Rails (Ruby ${{ matrix.ruby }} / Sinatra ${{ matrix.sinatra }})
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
+    - run: bundle exec rspec --pattern "spec/**/*sinatra*"

data/.gitignore

@@ -4,6 +4,7 @@
 /_yardoc/
 /coverage/
 /doc/
+/gemfiles/*.gemfile.lock
 /pkg/
 /spec/examples.txt
 /spec/reports/

data/.rubocop.yml

@@ -2,6 +2,7 @@ AllCops:
   NewCops: enable
   Exclude:
     - examples/**/*
+    - gemfiles/*
     - vendor/**/*
   SuggestExtensions: false
   TargetRubyVersion: 2.5

data/Appraisals

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+appraise 'rails_7.0' do
+  gem 'concurrent-ruby', '< 1.3.5'
+  gem 'rails', '~> 7.0.0'
+end
+
+appraise 'rails_7.1' do
+  gem 'rails', '~> 7.1.0'
+end
+
+appraise 'rails_7.2' do
+  gem 'rails', '~> 7.2.0'
+end
+
+appraise 'rails_8.0' do
+  gem 'rails', '~> 8.0.0'
+end
+
+appraise 'sinatra_3.x' do
+  gem 'sinatra', '~> 3.0'
+end
+
+appraise 'sinatra_4.0' do
+  gem 'sinatra', '~> 4.0.0'
+end
+
+appraise 'sinatra_4.1' do
+  gem 'sinatra', '~> 4.1.0'
+end

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Version 0.7.0 - 2025-02-03
+
+- Add support for Rails 8 and add test infrastructure to ensure future compatibility with Rails 7.0, 7.1, and 8.0. <https://github.com/benpickles/parklife/pull/115>, <https://github.com/benpickles/parklife/pull/117>, <https://github.com/benpickles/parklife/pull/121>
+- Improve out-of-the-box compatibility with Rails by reading `default_url_options`, `relative_url_root`, and `force_ssl` settings on boot and applying them to Parklife's `config.base` (`force_ssl` has been set to `true` in `production.rb` since Rails 7.1). <https://github.com/benpickles/parklife/pull/118>
+- Improve out-of-the-box compatibility with Sinatra 4.1 which has host authorisation middleware enabled by default in development mode and would otherwise respond to Parklife requests with a 403 status. Additionally the generated Sinatra production build script now sets the environment variable `APP_ENV=production` to enable production mode. <https://github.com/benpickles/parklife/pull/123>, <https://github.com/benpickles/parklife/pull/122>
+- When discovering HTML links ignore `<a>` elements without an `href`. <https://github.com/benpickles/parklife/pull/107>
+
 ## Version 0.6.1 - 2024-08-23
 
 - Don't error when the public directory doesn't exist <https://github.com/benpickles/parklife/pull/105>

data/Gemfile

@@ -7,8 +7,8 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in parklife.gemspec
 gemspec
 
+gem 'appraisal'
 gem 'bundler'
-gem 'rails'
 gem 'rake'
 gem 'rspec'
 gem 'rubocop'

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "bundler"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "concurrent-ruby", "< 1.3.5"
+gem "rails", "~> 7.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "bundler"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "rails", "~> 7.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "bundler"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "rails", "~> 7.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_8.0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "bundler"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "rails", "~> 8.0.0"
+
+gemspec path: "../"

data/gemfiles/sinatra_3.x.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "bundler"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "sinatra", "~> 3.0"
+
+gemspec path: "../"

data/gemfiles/sinatra_4.0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "bundler"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "sinatra", "~> 4.0.0"
+
+gemspec path: "../"

data/gemfiles/sinatra_4.1.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "bundler"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "sinatra", "~> 4.1.0"
+
+gemspec path: "../"

data/lib/parklife/cli.rb

@@ -26,6 +26,7 @@ module Parklife
         ['nested_index', application.config.nested_index],
         ['on_404', application.config.on_404.inspect],
         ['parklife/rails', defined?(::Parklife::Railtie) ? 'enabled' : '-'],
+        ['parklife/sinatra', defined?(::Parklife::Sinatra) ? 'enabled' : '-'],
         ['reporter', reporter == $stdout ? '$stdout' : reporter],
       ])
     end

data/lib/parklife/rails.rb

@@ -8,7 +8,7 @@ module Parklife
     # default_url_options and relative_url_root to match.
     def base=(value)
       super.tap { |uri|
-        Rails.application.default_url_options = {
+        app.default_url_options = {
           host: Utils.host_with_port(uri),
           protocol: uri.scheme,
         }
@@ -19,6 +19,12 @@ module Parklife
     end
   end
 
+  module RailsRouteSetRefinements
+    def default_url_options
+      Rails.application.default_url_options
+    end
+  end
+
   class Railtie < Rails::Railtie
     initializer 'parklife.disable_host_authorization' do |app|
       # The offending middleware is included in Rails (6+) development mode and
@@ -37,16 +43,27 @@ module Parklife
       if defined?(ActionDispatch::HostAuthorization)
         app.middleware.delete(ActionDispatch::HostAuthorization)
       end
-    end
 
-    config.after_initialize do
-      Parklife.application.config.app = Rails.application
+      Parklife.application.config.app = app
 
       # Allow use of the Rails application's route helpers when defining
       # Parklife routes in the block form.
-      Parklife.application.routes.singleton_class.include(Rails.application.routes.url_helpers)
+      Parklife.application.routes.singleton_class.include(RailsRouteSetRefinements)
+      Parklife.application.routes.singleton_class.include(app.routes.url_helpers)
 
       Parklife.application.config.extend(RailsConfigRefinements)
     end
+
+    config.after_initialize do |app|
+      # Read the Rails app's URL config and apply it to Parklife's so that the
+      # Rails config can be used as the single source of truth.
+      host, protocol = app.default_url_options.values_at(:host, :protocol)
+      protocol = 'https' if app.config.force_ssl
+      path = ActionController::Base.relative_url_root
+
+      Parklife.application.config.base.scheme = protocol if protocol
+      Parklife.application.config.base.host = host if host
+      Parklife.application.config.base.path = path if path
+    end
   end
 end

data/lib/parklife/sinatra.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'sinatra/base'
+
+module Parklife
+  module Sinatra
+    def self.registered(app)
+      # Disable Rack::Protection::HostAuthorization middleware so that fetching
+      # a page with Parklife works in development. It's safe to do here because
+      # it will only be executed when this file is explicitly required in a
+      # Parkfile and not in general when the app is running in a web server.
+      if app.settings.respond_to?(:host_authorization)
+        app.set(:host_authorization, permitted_hosts: [])
+      end
+    end
+  end
+end
+
+Sinatra.register Parklife::Sinatra

data/lib/parklife/templates/Parkfile.erb

@@ -2,7 +2,11 @@
 require 'parklife/rails'
 require_relative 'config/environment'
 <% else -%>
-# Assuming your Rack app lives in ./app.rb:
+<% if options[:sinatra] -%>
+require 'parklife/sinatra'
+
+<% end -%>
+# Assuming your <%= options[:sinatra] ? 'Sinatra' : 'Rack' %> app lives in ./app.rb:
 require_relative 'app'
 <% end -%>
 
@@ -11,8 +15,9 @@ Parklife.application.configure do |config|
   # For a Sinatra "classic" app:
   config.app = Sinatra::Application
   #
-  # Or for Sinatra modular style:
+  # For a modular-style Sinatra app the Parklife extension must be explicitly registered:
   # config.app = App
+  # App.register Parklife::Sinatra
 
 <% elsif !options[:rails] -%>
   config.app = App

data/lib/parklife/templates/github_pages.yml

@@ -15,11 +15,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
-    - uses: actions/configure-pages@v3
+    - uses: actions/configure-pages@v5
       id: pages
 
       # Build with Parklife and use its GitHub Pages URL (either its custom
@@ -27,7 +27,7 @@ jobs:
     - run: bin/static-build --base "${{ steps.pages.outputs.base_url }}"
 
     - name: Upload artifact
-      uses: actions/upload-pages-artifact@v1
+      uses: actions/upload-pages-artifact@v3
       if: github.ref == 'refs/heads/main' # Only upload on main branch.
       with:
         path: build/
@@ -45,4 +45,4 @@ jobs:
     steps:
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@v1
+      uses: actions/deploy-pages@v4

data/lib/parklife/templates/static_build.erb

@@ -3,8 +3,7 @@
 set -eu
 
 <% if options[:rails] -%>
-# You probably need to run the app in production mode to ensure the correct
-# asset URLs are referenced.
+# Run the app in production mode to ensure correct asset URLs are generated etc.
 export RAILS_ENV=production
 export SECRET_KEY_BASE=dummy
 
@@ -17,6 +16,10 @@ export SECRET_KEY_BASE=dummy
 # missing assets in production.
 bundle exec rails assets:precompile
 
+<% elsif options[:sinatra] -%>
+# Run the app in production mode.
+export APP_ENV=production
+
 <% end -%>
 # Build with Parklife - and forward arguments sent to this script.
 bundle exec parklife build "$@"

data/lib/parklife/utils.rb

@@ -39,7 +39,7 @@ module Parklife
 
     def scan_for_links(html)
       doc = Nokogiri::HTML.parse(html)
-      doc.css('a').each do |a|
+      doc.css('a[href]').each do |a|
         uri = URI.parse(a[:href])
 
         # Don't visit a URL that belongs to a different domain - for now this is

data/lib/parklife/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parklife
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: parklife
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Ben Pickles
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2025-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -52,7 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - spideryoung@gmail.com
 executables:
@@ -65,6 +63,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -74,6 +73,13 @@ files:
 - bin/console
 - bin/setup
 - exe/parklife
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
+- gemfiles/rails_8.0.gemfile
+- gemfiles/sinatra_3.x.gemfile
+- gemfiles/sinatra_4.0.gemfile
+- gemfiles/sinatra_4.1.gemfile
 - lib/parklife.rb
 - lib/parklife/application.rb
 - lib/parklife/browser.rb
@@ -84,6 +90,7 @@ files:
 - lib/parklife/rails.rb
 - lib/parklife/route.rb
 - lib/parklife/route_set.rb
+- lib/parklife/sinatra.rb
 - lib/parklife/templates/Parkfile.erb
 - lib/parklife/templates/github_pages.yml
 - lib/parklife/templates/static_build.erb
@@ -98,7 +105,6 @@ metadata:
   homepage_uri: https://parklife.dev
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/benpickles/parklife
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,8 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Convert a Rack app into a static HTML site.
 test_files: []