parklife 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32db274b9f5ec6ce7c56203a391c30c2d541bb8f319bc1b4130b22a2ed85bcf3
-  data.tar.gz: dce6ff9a4911863acb4fdb19c134f822d729a4ced0df62799fc69853154e412f
+  metadata.gz: 0a0e894c4cba14f5f3d7dc614df86e5430dded896ddf5466048bd2b7eb224791
+  data.tar.gz: 684afeeb534d59bb1139e5df34c3a5ff93a4c9e2c491b69b2a2a66feeba54c3c
 SHA512:
-  metadata.gz: 434a2acf5bd27046330a6f4c954dcf7908e3672db1e9ce08e985b833f299273306b4535115093f8f18517210605da098e347bcd03a3481106e3c35958da5df5a
-  data.tar.gz: 43249f1f24c7f932da0fd3d949b9d2590274ae7360d86a4f70f268c2a566dde1cf946aa6ba665a89c9bd5bbb5d5b6ee3ef714edbb7f4acbd34000045ac72dff5
+  metadata.gz: 8e0edd657e0b2d82e17b2eb143748cd22612b72b99851ef1ad331f9641f310e09859f537dc95798e255a5868cabed63599089fe19003991d8cce86c36dba8978
+  data.tar.gz: d82d26729d3206e07ed39b84215d9243c789066f3be32a64a9173356d70a8e588ffc60672832bb77038821249621dd2de7745cf6448f118916fbbffe3d6ee64e

data/.github/workflows/tests.yml

@@ -26,9 +26,9 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
-        ruby-version: '2.7'
+        ruby-version: '3.2'
         working-directory: examples/rails
-    - run: ./parklife-build
+    - run: bin/static-build
       working-directory: examples/rails
     - run: test -f build/index.html
       working-directory: examples/rails
@@ -65,3 +65,14 @@ jobs:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
     - run: bundle exec rspec
+
+  rubocop:
+    runs-on: ubuntu-latest
+    name: RuboCop
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: '3.2'
+    - run: bundle exec rubocop

data/.rubocop.yml

@@ -0,0 +1,30 @@
+AllCops:
+  NewCops: enable
+  Exclude:
+    - examples/**/*
+    - vendor/**/*
+  SuggestExtensions: false
+  TargetRubyVersion: 2.5
+
+Layout:
+  Enabled: false
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: true
+
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+
+Naming:
+  Enabled: false
+
+Style:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  Exclude:
+    - spec/**/*

data/CHANGELOG.md

@@ -1,25 +1,38 @@
+## Version 0.5.1 - 2023-03-22
+
+- Ensure the generated static-build script is executable. <https://github.com/benpickles/parklife/pull/89>
+
+## Version 0.5.0 - 2023-03-12
+
+- RuboCop. <https://github.com/benpickles/parklife/pull/87>
+- Allow passing `--base` to all `parklife` commands. <https://github.com/benpickles/parklife/pull/85>
+- Configure Rails `default_url_options` and `relative_url_root` when setting Parklife base. <https://github.com/benpickles/parklife/pull/85>
+- Add `parklife get PATH` command to fetch and output a path. <https://github.com/benpickles/parklife/pull/83>
+- Add a `parklife init` command to create a starter Parkfile and friends. <https://github.com/benpickles/parklife/pull/82>
+- Fix the HOST header for a non-standard port. <https://github.com/benpickles/parklife/pull/81>
+
 ## Version 0.4.0 - 2023-03-01
 
-- Add a `parklife --version` command.
-- No need to `require parklife` from the Parkfile.
+- Add a `parklife --version` command. <https://github.com/benpickles/parklife/pull/80>
+- No need to `require parklife` from the Parkfile. <https://github.com/benpickles/parklife/pull/79>
 
 ## Version 0.3.0 - 2023-02-26
 
-- Allow overriding `config.base` from the CLI build command with the `--base` option.
-- Support mounting the app at a path.
-- Remove Capybara and use Rack::Test directly.
-- Rename `config.rack_app` to `config.app`.
-- Don't save the response when `on_404=:skip`.
-- More accurate progress dots.
-- Default `build_dir` to `build`.
-- Fix build paths when `build_dir` isn't a full path.
-- Ignore pathless links - for instance #fragments and mailto.
+- Allow overriding `config.base` from the CLI build command with the `--base` option. <https://github.com/benpickles/parklife/pull/78>
+- Support mounting the app at a path. <https://github.com/benpickles/parklife/pull/78>
+- Remove Capybara and use Rack::Test directly. <https://github.com/benpickles/parklife/pull/78>
+- Rename `config.rack_app` to `config.app`. <https://github.com/benpickles/parklife/pull/78>
+- Don't save the response when `on_404=:skip`. <https://github.com/benpickles/parklife/pull/77>
+- More accurate progress dots. <https://github.com/benpickles/parklife/pull/75>
+- Default `build_dir` to `build`. <https://github.com/benpickles/parklife/pull/73>
+- Fix build paths when `build_dir` isn't a full path. <https://github.com/benpickles/parklife/pull/73>
+- Ignore pathless links - for instance #fragments and mailto. <https://github.com/benpickles/parklife/pull/72>
 
 ## Version 0.2.0 - 2023-02-21
 
 - First official version hosted on [RubyGems.org](https://rubygems.org/gems/parklife).
-- Provide alternatives to blowing up if a 404 is encountered.
-- Add the ability to crawl a route by adding `crawl: true` to it.
+- Provide alternatives to blowing up if a 404 is encountered. <https://github.com/benpickles/parklife/pull/70>
+- Add the ability to crawl a route by adding `crawl: true` to it. <https://github.com/benpickles/parklife/pull/65>
 
 ## Version 0.1.0 - 2019-04-26
 

data/Gemfile

@@ -1,6 +1,13 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in parklife.gemspec
 gemspec
+
+gem 'bundler'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'

data/README.md

@@ -4,7 +4,7 @@
 
 [Parklife](https://github.com/benpickles/parklife) is a Ruby library to render a Rack app (Rails/Sinatra/etc) to a static site so it can be served by [Netlify](https://www.netlify.com), [Now](https://zeit.co/now), [GitHub Pages](https://pages.github.com), S3, or another static server.
 
-## Installation
+## Getting started
 
 Add Parklife to your application's Gemfile and run bundle install.
 
@@ -12,6 +12,12 @@ Add Parklife to your application's Gemfile and run bundle install.
 gem 'parklife'
 ```
 
+Now generate a Parkfile configuration file and build script. Include some Rails- or Sinatra-specific settings by passing `--rails` or `--sinatra`, create a GitHub Actions workflow to generate your Parklife build and push it to GitHub Pages by passing `--github-pages`.
+
+```
+$ bundle exec parklife init
+```
+
 ## How to use Parklife with Rails
 
 Parklife is configured with a file called `Parkfile` in the root of your project, here's an example `Parkfile` for an imaginary Rails app:
@@ -45,10 +51,10 @@ Listing the routes included in the above Parklife application with `parklife rou
 
 ```
 $ bundle exec parklife routes
-/	crawl=true
+/             crawl=true
 /feed.atom
 /sitemap.xml
-/easter_egg	crawl=true
+/easter_egg   crawl=true
 /404.html
 ```
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'parklife'

data/exe/parklife

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'parklife/cli'
 Parklife::CLI.start(ARGV)

data/lib/parklife/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'parklife/config'
 require 'parklife/crawler'

data/lib/parklife/browser.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'parklife/utils'
 require 'rack/test'
 
 module Parklife
@@ -7,16 +10,21 @@ module Parklife
     def initialize(app, base)
       @app = app
       @base = base
-      @env = {
-        'HTTP_HOST' => base.host,
-        'HTTPS' => base.scheme == 'https' ? 'on' : 'off',
-        script_name: base.path.chomp('/'),
-      }
       @session = Rack::Test::Session.new(app)
+      set_env
     end
 
     def get(path)
       session.get(path, nil, env)
     end
+
+    private
+      def set_env
+        @env = {
+          'HTTP_HOST' => Utils.host_with_port(base),
+          'HTTPS' => base.scheme == 'https' ? 'on' : 'off',
+          script_name: base.path.chomp('/'),
+        }
+      end
   end
 end

data/lib/parklife/cli.rb

@@ -1,28 +1,47 @@
+# frozen_string_literal: true
+
 require 'parklife'
 require 'thor'
 
 module Parklife
   class CLI < Thor
-    desc 'build', 'create a production build'
-    option :base, desc: 'set config.base at build-time - overrides the Parkfile setting'
-    def build
-      # Parkfile config overrides.
-      application.config.base = options[:base] if options[:base]
+    include Thor::Actions
+    source_root File.expand_path('templates', __dir__)
+
+    class_option :base, desc: 'Override config.base configured in the Parkfile'
 
+    desc 'build', 'Create a production build'
+    def build
       application.build
     end
 
-    desc 'routes', 'list all defined routes'
+    desc 'get PATH', 'Fetch PATH from the app and output its contents'
+    def get(path)
+      puts application.crawler.get(path).body
+    end
+
+    desc 'init', 'Generate a starter Parkfile and friends'
+    option :github_pages, desc: 'Generate a GitHub Actions workflow to deploy to GitHub Pages', type: :boolean
+    option :rails, desc: 'Include some Rails-specific settings', type: :boolean
+    option :sinatra, desc: 'Include some Sinatra-specific settings', type: :boolean
+    def init
+      template('Parkfile.erb', 'Parkfile')
+      template('static_build.erb', 'bin/static-build')
+      chmod('bin/static-build', 0755)
+      copy_file('github_pages.yml', '.github/workflows/parklife.yml') if options[:github_pages]
+    end
+
+    desc 'routes', 'List all defined routes'
     def routes
-      application.routes.each do |route|
-        print route.path
-        print "\tcrawl=true" if route.crawl
-        puts
-      end
+      shell.print_table(
+        application.routes.map { |route|
+          [route.path, route.crawl ? "crawl=true" : nil]
+        }
+      )
     end
 
     map '--version' => :version
-    desc 'version', 'output the current version of Parklife'
+    desc 'version', 'Output the current version of Parklife'
     def version
       puts Parklife::VERSION
     end
@@ -36,6 +55,9 @@ module Parklife
           # Reach inside the consuming app's directory to apply its Parklife
           # config.
           app.load_Parkfile(File.join(Dir.pwd, 'Parkfile'))
+
+          # Runtime overrides.
+          app.config.base = options[:base] if options[:base]
         }
       end
   end

data/lib/parklife/config.rb

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

data/lib/parklife/crawler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'parklife/browser'
 require 'parklife/route'
 require 'parklife/utils'
@@ -13,11 +15,15 @@ module Parklife
       @browser = Browser.new(config.app, config.base)
     end
 
+    def get(path)
+      browser.get(path)
+    end
+
     def start
       @routes = route_set.to_a
       @visited = Set.new
 
-      while route = @routes.shift
+      while (route = @routes.shift)
         processed = process_route(route)
         config.reporter.print('.') if processed
       end
@@ -40,7 +46,7 @@ module Parklife
 
         return false if already_processed
 
-        response = browser.get(route.path)
+        response = get(route.path)
 
         case response.status
         when 200

data/lib/parklife/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Parklife
   Error = Class.new(StandardError)
   BuildDirNotDefinedError = Class.new(Error)
@@ -5,28 +7,19 @@ module Parklife
 
   class HTTPError < Error
     def initialize(status, path)
-      @status = status
-      @path = path
-    end
-
-    def message
-      %Q(#{@status} response from path "#{@path}")
+      super %Q(#{status} response from path "#{path}")
     end
   end
 
   class ParkfileLoadError < Error
     def initialize(path)
-      @path = path
-    end
-
-    def message
-      %Q(Cannot load Parkfile "#{@path}")
+      super %Q(Cannot load Parkfile "#{path}")
     end
   end
 
   class RailsNotDefinedError < Error
-    def message
-      'Expected Rails to be defined, require config/environment before parklife.'
+    def initialize(msg = 'Expected Rails to be defined, require config/environment before parklife')
+      super
     end
   end
 end

data/lib/parklife/rails.rb

@@ -1,7 +1,29 @@
+# frozen_string_literal: true
+
 raise Parklife::RailsNotDefinedError unless defined?(Rails)
 
-# Allow use of the consuming Rails application's route helpers from within the
-# block when defining Parklife routes.
-Parklife::RouteSet.include(Rails.application.routes.url_helpers)
+module Parklife
+  module RailsConfigRefinements
+    # When setting Parklife's base also configure the Rails app's
+    # default_url_options and relative_url_root to match.
+    def base=(value)
+      super.tap { |uri|
+        Rails.application.default_url_options = {
+          host: Utils.host_with_port(uri),
+          protocol: uri.scheme,
+        }
+
+        base_path = !uri.path.empty? && uri.path != '/' ? uri.path : nil
+        ActionController::Base.relative_url_root = base_path
+      }
+    end
+  end
+end
 
 Parklife.application.config.app = Rails.application
+
+# 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.config.extend(Parklife::RailsConfigRefinements)

data/lib/parklife/route.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Parklife
   class Route
     attr_reader :crawl, :path

data/lib/parklife/route_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require_relative 'route'
 

data/lib/parklife/templates/Parkfile.erb

@@ -0,0 +1,48 @@
+<% if options[:rails] -%>
+require_relative 'config/environment'
+require 'parklife/rails'
+<% else -%>
+# Assuming your Rack app lives in ./app.rb:
+require_relative 'app'
+<% end -%>
+
+Parklife.application.configure do |config|
+<% if options[:sinatra] -%>
+  # For a Sinatra "classic" app:
+  config.app = Sinatra::Application
+  #
+  # Or for Sinatra modular style:
+  # config.app = App
+
+<% elsif !options[:rails] -%>
+  config.app = App
+
+<% end -%>
+<% if options[:github_pages] -%>
+  # Serve trailing slash-less URLs from GitHub Pages.
+  config.nested_index = false
+
+<% end -%>
+  # See configuration options here:
+  # https://github.com/benpickles/parklife#configuration
+end
+
+Parklife.application.routes do
+  root crawl: true
+
+<% if options[:rails] -%>
+  # Add further paths not discovered by crawling from the root - Parklife's
+  # Rails integration lets you use the app's route helpers:
+  #
+  # get hidden_pages_path, crawl: true
+  # get feed_path(format: :atom)
+<% else -%>
+  # Add further paths not discovered by crawling from the root:
+  #
+  # get '/hidden/pages', crawl: true
+  # get '/feed.atom'
+<% end -%>
+
+  # Services typically allow a custom 404 page.
+  # get '/404.html'
+end

data/lib/parklife/templates/github_pages.yml

@@ -0,0 +1,48 @@
+name: Parklife
+
+on:
+  # Run on every push.
+  push:
+  # Allow manually triggering a build.
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+    - uses: actions/configure-pages@v3
+      id: pages
+
+      # Build with Parklife and use its GitHub Pages URL (either its custom
+      # domain or username.github.io/repository).
+    - run: bin/static-build --base "${{ steps.pages.outputs.base_url }}"
+
+    - name: Upload artifact
+      uses: actions/upload-pages-artifact@v1
+      if: github.ref == 'refs/heads/main' # Only upload on main branch.
+      with:
+        path: build/
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    if: github.ref == 'refs/heads/main' # Only deploy on main branch.
+    concurrency:
+      group: deploy
+      cancel-in-progress: true
+    steps:
+    - name: Deploy to GitHub Pages
+      id: deployment
+      uses: actions/deploy-pages@v1

data/lib/parklife/templates/static_build.erb

@@ -0,0 +1,28 @@
+#!/usr/bin/env sh
+
+set -eu
+
+<% if options[:rails] -%>
+# You probably need to run the app in production mode to ensure the correct
+# asset URLs are referenced.
+export RAILS_ENV=production
+export SECRET_KEY_BASE=dummy
+
+# If your Rails app uses ActiveRecord then this is a good point to create and
+# seed the database from db/seeds.rb.
+# bundle exec rails db:setup
+
+# Generate production-optimised assets with Sprockets and friends. This must be
+# done before generating the Parklife build as Rails will blow up if it detects
+# missing assets in production.
+bundle exec rails assets:precompile
+
+<% end -%>
+# Build with Parklife - and forward arguments sent to this script.
+bundle exec parklife build "$@"
+
+# Copy all public resources to ./build.
+cp -R public/* build
+
+# List all files in the build (useful for debugging).
+find build -type f | sort

data/lib/parklife/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'nokogiri'
 
@@ -21,6 +23,11 @@ module Parklife
       end
     end
 
+    def host_with_port(uri)
+      default_port = uri.scheme == 'https' ? 443 : 80
+      uri.port == default_port ? uri.host : "#{uri.host}:#{uri.port}"
+    end
+
     def save_page(path, content, config)
       build_path = File.join(
         config.build_dir,

data/lib/parklife/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Parklife
-  VERSION = '0.4.0'
+  VERSION = '0.5.1'
 end

data/lib/parklife.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'parklife/application'
 require 'parklife/version'
 

data/parklife.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'parklife/version'
@@ -16,13 +18,16 @@ Gem::Specification.new do |spec|
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   spec.metadata = {
     'changelog_uri' => 'https://github.com/benpickles/parklife/blob/main/CHANGELOG.md',
+    'rubygems_mfa_required' => 'true',
     'source_code_uri' => 'https://github.com/benpickles/parklife',
   }
 
+  spec.required_ruby_version = '>= 2.5.0'
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(examples|spec)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -31,8 +36,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'rack-test'
   spec.add_dependency 'thor'
-
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
 end