statique 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e1c14852ebd55c1267a51282c1f23580e1c8c8f552f2c638e2f1c65a5d8f74e
-  data.tar.gz: bcaefb7df206a34eb67016fd04dc578c240c7d1248f039103b2d2b2e869bef02
+  metadata.gz: ca6623c907a23398e840f6d3dc056f1dbe966f747a443e7e6cced71fe462cbbb
+  data.tar.gz: 511a4f47f18fc755ad1f74295637047d9715ec6de95454f4b1e85022c9128da9
 SHA512:
-  metadata.gz: 73422048fefa55c776f713279de7a8563520460d481ae7350ab7cc1af7ea9cc30c8797b0ec1f873a49ce4f3c89a584c04e3c521f086cd3907e7aefcfd9208807
-  data.tar.gz: f4b462f3585107cdcb1ca29787b24fd438ddf71ecd63a4262e7e71de00a65b546dbf94f50a2774efb77db21a5ba61b43291946788303e3860ee440c4510e4324
+  metadata.gz: 0ac4f9d6a45018021322e0cb685bde01ca682be029dc884b915237728de5a088e3232cdc6fb7a2e378fbb753e857e0bc77a99008d693a145191734c828308a4a
+  data.tar.gz: a1b4e20006069b4a23655b161074e087cd88d7fb22efb8d76cf8db009b16144362bfdf63c948b30f635d385767f693b60d392853b3a5ba3d963c9ac541ec2b6a

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+### [0.1.4](https://github.com/pusewicz/statique/compare/v0.1.3...v0.1.4) (2022-02-17)
+
+
+### Bug Fixes
+
+* Drop tilt direct dependency ([d893a2e](https://github.com/pusewicz/statique/commit/d893a2e847e6317e6e7b80d1179ecd966e1bfc3a))
+
+### [0.1.3](https://github.com/pusewicz/statique/compare/v0.1.1...v0.1.3) (2022-02-16)
+
+
+### Bug Fixes
+
+* Do not rewrite paths to keep relative paths ([285eaf3](https://github.com/pusewicz/statique/commit/285eaf3446d7de2dba4fc3b55e7dd87b16092a04))
+* Initial values of the paginator ([3cbb0e0](https://github.com/pusewicz/statique/commit/3cbb0e0d680cae38e8cc65cde1299d0fca18a601))
+* Update delegated root_url ([ca5ea27](https://github.com/pusewicz/statique/commit/ca5ea273d9e636ed0481fa36fc298769a8697e95))
+
 ## [0.1.0] - 2022-01-12
 
 - Initial release

data/Dockerfile

@@ -7,7 +7,7 @@ ARG STATIQUE_VERSION
 # RUN gem install statique --version $STATIQUE_VERSION
 WORKDIR /pkg
 COPY pkg/statique-$STATIQUE_VERSION.gem .
-RUN apk add --no-cache --update --virtual .build-deps build-base libffi-dev && \
+RUN apk add --no-cache --update --virtual .build-deps build-base && \
     gem install /pkg/statique-$STATIQUE_VERSION.gem && rm -rf /root/.local/share/gem && rm -rf /usr/local/bundle/cache/*.gem && \
     apk del .build-deps
 

data/Gemfile

@@ -7,15 +7,17 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in statique.gemspec
 gemspec
 
-gem "benchmark-ips"
-gem "bundle-audit", "~> 0.1.0"
-gem "minitest", "~> 5.0"
-gem "minitest-around", "~> 0.5.0"
-gem "overcommit"
-gem "rake", "~> 13.0"
-gem "rbs"
-gem "rubocop-minitest", "~> 0.17.0"
-gem "rubocop-rake", "~> 0.6.0"
-gem "solargraph"
-gem "standard", "~> 1.3"
-gem "typeprof"
+group :development do
+  gem "benchmark-ips"
+  gem "bundle-audit", "~> 0.1.0"
+  gem "minitest", "~> 5.0"
+  gem "minitest-around", "~> 0.5.0"
+  gem "overcommit"
+  gem "rake", "~> 13.0"
+  gem "rbs"
+  gem "rubocop-minitest", "~> 0.17.0"
+  gem "rubocop-rake", "~> 0.6.0"
+  gem "solargraph"
+  gem "standard", "~> 1.3"
+  gem "typeprof"
+end

data/README.md

@@ -10,15 +10,16 @@
 # Statique
 
 ![Ruby](https://github.com/pusewicz/statique/actions/workflows/main.yml/badge.svg)
+[![Gem Version](https://badge.fury.io/rb/statique.svg)](https://badge.fury.io/rb/statique)
 
-Statique is a static site generator written in [Ruby](https://www.ruby-lang.org/) and utilising [Roda](https://roda.jeremyevans.net/) for the Rack middleware. By default, it comes with support for [Slim](http://slim-lang.com/), [Sass](https://sass-lang.com/) and [Markdown](https://daringfireball.net/projects/markdown/).
+Statique is a static site generator written in [Ruby](https://www.ruby-lang.org/) and utilising [Roda](https://roda.jeremyevans.net/) for the Rack middleware. By default, it comes with support for [Slim](http://slim-lang.com/) and [Markdown](https://daringfireball.net/projects/markdown/).
 
 ## Installation
 
 Install it as a [Whalebrew](https://github.com/whalebrew/whalebrew) package (recommended):
 
     $ whalebrew install pusewicz/statique
-    
+
 Install it as a Docker image:
 
     $ docker pull pusewicz/statique
@@ -34,25 +35,25 @@ Install it as a Ruby gem:
 #### Whalebrew package, Ruby gem
 
     $ statique init my-website
-    
+
 #### Docker
 
     $ docker run -it --rm -v "$PWD":/workdir -w /workdir pusewicz/statique init my-website
-    
+
 ### Start the Statique server
 
 First, change into your new Statique website directory:
 
     $ cd my-website
-    
+
 #### Whalebrew package, Ruby gem
 
     $ statique server
-    
+
 #### Docker
 
     $ docker run -it --rm -p 3000:3000 -v "$PWD":/workdir -w /workdir pusewicz/statique server
-    
+
 ### Build your Statique website
 
 The final step before deploying your website to your preferred host is to build it. By default, the built website will be available in the `dist/` subdirectory.
@@ -60,11 +61,11 @@ The final step before deploying your website to your preferred host is to build
 First, change into your new Statique website directory:
 
     $ cd my-website
-    
+
 #### Whalebrew package, Ruby gem
 
     $ statique build
-    
+
 #### Docker
 
     $ docker run -it --rm -v "$PWD":/workdir -w /workdir pusewicz/statique build

data/docs/assets/css/app.css

@@ -0,0 +1 @@
+@import url("https://cdn.jsdelivr.net/npm/water.css@2/out/water.css");

data/docs/content/index.md

@@ -0,0 +1,57 @@
+Statique is a static site generator written in [Ruby](https://www.ruby-lang.org/) and uses [Roda](https://roda.jeremyevans.net/) for the Rack middleware. By default, it comes with support for [Slim](http://slim-lang.com/) and [Markdown](https://daringfireball.net/projects/markdown/).
+
+## Installation
+
+Install it as a [Whalebrew](https://github.com/whalebrew/whalebrew) package (recommended):
+
+    $ whalebrew install pusewicz/statique
+
+Install it as a Docker image:
+
+    $ docker pull pusewicz/statique
+
+Install it as a Ruby gem:
+
+    $ gem install statique
+
+## Usage
+
+### Generate your new Statique website
+
+#### Whalebrew package, Ruby gem
+
+    $ statique init my-website
+
+#### Docker
+
+    $ docker run -it --rm -v "$PWD":/workdir -w /workdir pusewicz/statique init my-website
+
+### Start the Statique server
+
+First, change into your new Statique website directory:
+
+    $ cd my-website
+
+#### Whalebrew package, Ruby gem
+
+    $ statique server
+
+#### Docker
+
+    $ docker run -it --rm -p 3000:3000 -v "$PWD":/workdir -w /workdir pusewicz/statique server
+
+### Build your Statique website
+
+The final step before deploying your website to your preferred host is to build it. By default, the built website will be available in the `dist/` subdirectory.
+
+First, change into your new Statique website directory:
+
+    $ cd my-website
+
+#### Whalebrew package, Ruby gem
+
+    $ statique build
+
+#### Docker
+
+    $ docker run -it --rm -v "$PWD":/workdir -w /workdir pusewicz/statique build

data/docs/layouts/layout.slim

@@ -0,0 +1,12 @@
+doctype html
+html
+  head
+    meta charset="UTF-8"
+    meta name="generator" content="Statique #{Statique.version}"
+    title Statique
+    == assets(:css)
+  body
+    header
+      h1 Statique–Static Site Generator
+    main== yield
+    footer Made with Statique v#{Statique.version}

data/lib/statique/app.rb

@@ -3,69 +3,70 @@
 require "roda"
 require "slim"
 require "digest/sha1"
-require "rack/rewrite"
-require "pagy"
-require "pagy/extras/array"
 
 class Statique
   class App < Roda
     extend Forwardable
-    include Pagy::Backend
 
-    PAGE_REGEX = /(.*)\/page\/(\d+)/
-    use Rack::Rewrite do
-      rewrite PAGE_REGEX, "$1?page=$2"
-    end
+    @statique = Statique.instance
 
-    def_delegators :Statique, :url, :root_url
+    def_delegators :@statique, :url, :root_url, :statique
 
-    opts[:root] = Statique.paths.pwd
+    opts[:root] = @statique.configuration.paths.pwd
 
     plugin :environments
     plugin :static_routing
-    plugin :render, views: Statique.paths.content.basename, engine: "slim", allowed_paths: [Statique.paths.content.basename, Statique.paths.layouts.basename]
-    plugin :partials, views: Statique.paths.layouts.basename
+    plugin :render, views: @statique.configuration.paths.content.basename, engine: "slim", allowed_paths: [@statique.configuration.paths.content.basename, @statique.configuration.paths.layouts.basename]
+    plugin :partials, views: @statique.configuration.paths.layouts.basename
 
-    if Statique.mode.server? && Statique.paths.public.exist?
-      plugin :public, root: Statique.paths.public.basename
+    if @statique.mode.server? && @statique.configuration.paths.public.exist?
+      plugin :public, root: @statique.configuration.paths.public.basename
     end
 
-    if Statique.paths.assets.exist?
-      css_files = Statique.paths.assets.join("css").glob("*.{css,scss}")
-      js_files = Statique.paths.assets.join("js").glob("*.js")
-      plugin :assets, css: css_files.map { _1.basename.to_s }, js: js_files.map { _1.basename.to_s }, public: Statique.paths.destination, precompiled: Statique.paths.destination.join("assets/manifest.json")
+    if @statique.configuration.paths.assets.exist?
+      css_files = @statique.configuration.paths.assets.join("css").glob("*.{css,scss}")
+      js_files = @statique.configuration.paths.assets.join("js").glob("*.js")
+      plugin :assets, css: css_files.map { _1.basename.to_s }, js: js_files.map { _1.basename.to_s }, public: @statique.configuration.paths.destination, precompiled: @statique.configuration.paths.destination.join("assets/manifest.json"), relative_paths: true
       plugin :assets_preloading
 
-      Statique.mode.build do
+      @statique.mode.build do
         compiled = compile_assets
-        Statique.ui.info "Compiling assets", css: compiled["css"], js: compiled["js"]
+        @statique.ui.info "Compiling assets", css: compiled["css"], js: compiled["js"]
       end
     end
 
-    Statique.discover.documents.each do |document|
-      Statique.ui.debug "Defining route", {path: document.path, file: document.file}
-      static_get document.path do |r|
-        @document = Statique.discover.documents.find { _1.file == document.file }
+    route do |r|
+      @statique = Statique.instance
+      if @statique.mode.server?
+        r.public if @statique.configuration.paths.public.exist?
+        r.assets if @statique.configuration.paths.assets.exist?
+      end
+
+      path, page = r.env["PATH_INFO"].split("/page/")
+
+      document = @statique.discover.documents.find { _1.path == path }
 
+      r.on(proc { document }) do
         locals = {
-          documents: Statique.discover.documents,
-          collections: Statique.discover.collections,
-          document: @document
+          collections: @statique.discover.collections,
+          document: document,
+          documents: @statique.discover.documents,
+          statique: @statique
         }
 
-        if @document.meta.paginates
-          @pagy, items = pagy_array(Statique.discover.collections[@document.meta.paginates].to_a, {page: r.params.fetch("page", 1)})
-          locals[@document.meta.paginates.to_sym] = items
-          locals[:paginator] = Paginator.new(@pagy, items, document.path)
+        if document.meta.paginates
+          paginator = Paginator.new(@statique.discover.collections[document.meta.paginates].to_a, document.path, page, @statique)
+          locals[document.meta.paginates.to_sym] = paginator.documents
+          locals[:paginator] = paginator
         end
 
         options = {
-          engine: @document.engine_name,
-          inline: @document.content,
+          engine: document.engine_name,
+          inline: document.content,
           locals:,
           layout_opts: {locals:},
-          cache_key: Digest::SHA1.hexdigest(@document.file.to_s + @document.content),
-          layout: "../layouts/#{@document.layout_name}"
+          cache_key: Digest::SHA1.hexdigest(document.file.to_s + document.content),
+          layout: "../layouts/#{document.layout_name}"
         }
 
         if document.layout_name
@@ -75,12 +76,5 @@ class Statique
         end
       end
     end
-
-    if Statique.mode.server?
-      route do |r|
-        r.public if Statique.paths.public.exist?
-        r.assets if Statique.paths.assets.exist?
-      end
-    end
   end
 end

data/lib/statique/cli/build.rb

@@ -9,25 +9,27 @@ class Statique
     class Build
       prepend MemoWise
 
-      def initialize(options)
+      def initialize(options, statique)
         Thread.abort_on_exception = true
-        @queue = Statique.build_queue
+        @statique = statique
+        @queue = Queue.new
       end
 
       def run
+        require "statique/app"
         time = Benchmark.realtime do
-          create_directory(Statique.paths.destination)
+          create_directory(@statique.configuration.paths.destination)
           copy_public_assets
           build_pages
         end
 
-        Statique.ui.success "Done!", time: time
+        @statique.ui.success "Done!", time: time
       end
 
       private
 
       def build_pages
-        Statique.discover.documents.each do |document|
+        @statique.discover.documents.each do |document|
           @queue << document.path
 
           if (pages = document.pagination_pages)
@@ -41,12 +43,12 @@ class Statique
               path = @queue.pop
               response = mock_request.get(path)
               if response.successful?
-                destination = Statique.paths.destination.join(File.extname(path).empty? ? "./#{path}/index.html" : "./#{path}")
-                Statique.ui.info "Building page", path: path
+                destination = @statique.configuration.paths.destination.join(File.extname(path).empty? ? "./#{path}/index.html" : "./#{path}")
+                @statique.ui.info "Building page", path: path
                 create_directory(destination.dirname)
                 File.write(destination, response.body)
               else
-                Statique.ui.error "Error building page", path: document.path, status: response.status
+                @statique.ui.error "Error building page", path: path, status: response.status
               end
             end
           end
@@ -60,9 +62,9 @@ class Statique
       end
 
       def copy_public_assets
-        assets = Statique.paths.public.glob("**/*.*")
-        Statique.ui.info "Copying public assets", assets:
-          FileUtils.cp_r(assets, Statique.paths.destination)
+        assets = @statique.configuration.paths.public.glob("**/*.*")
+        @statique.ui.info "Copying public assets", assets:
+          FileUtils.cp_r(assets, @statique.configuration.paths.destination)
       end
 
       private

data/lib/statique/cli/init.rb

@@ -13,7 +13,7 @@ class Statique
         create_directory(@dest_dir)
 
         write_file(@dest_dir.join("public/robots.txt"), "User-agent: *\nAllow: /")
-        write_file(@dest_dir.join("assets/css/app.scss"), %(@import url("https://cdn.jsdelivr.net/npm/water.css@2/out/water.css");))
+        write_file(@dest_dir.join("assets/css/app.css"), %(@import url("https://cdn.jsdelivr.net/npm/water.css@2/out/water.css");))
         write_file(@dest_dir.join("assets/js/app.js"), %(console.log("Hello from Statique!")))
 
         copy_template("index.md", @dest_dir.join("content"))

data/lib/statique/cli/server.rb

@@ -24,12 +24,14 @@ class Statique
         end
       end
 
-      def initialize(port: 3000)
+      def initialize(statique, port: 3000)
         @port = port
+        @statique = statique
       end
 
       def run
-        Statique.ui.info "Starting server", port: @port
+        require "statique/app"
+        @statique.ui.info "Starting server", port: @port
 
         logger = LoggerWrapper.new
 
@@ -41,7 +43,7 @@ class Statique
       end
 
       def stop
-        Statique.ui.info "Stopping server"
+        @statique.ui.info "Stopping server"
         Rack::Handler::WEBrick.shutdown
       end
 
@@ -51,7 +53,7 @@ class Statique
         end
 
         def puts(message)
-          Statique.ui.public_send(@type, message)
+          @statique.ui.public_send(@type, message)
         end
 
         def write(message)

data/lib/statique/cli.rb

@@ -34,14 +34,14 @@ class Statique
 
     desc "server", "Start Statique server"
     def server
-      Statique.mode.server!
-      Server.new.run
+      statique.mode.server!
+      Server.new(statique).run
     end
 
     desc "build", "Build Statique site"
     def build
-      Statique.mode.build!
-      Build.new(options.dup).run
+      statique.mode.build!
+      Build.new(options.dup, statique).run
     end
 
     desc "version", "Prints the statique's version information"
@@ -50,5 +50,11 @@ class Statique
     end
 
     map aliases_for("version")
+
+    private
+
+    def statique
+      Statique.instance
+    end
   end
 end

data/lib/statique/configuration.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class Statique
+  class Configuration
+    attr_accessor :root_url
+    attr_accessor :paths
+
+    def initialize
+      @root_url = "/"
+      @paths = OpenStruct.new(
+        pwd: Pathname.pwd,
+        public: Pathname.pwd.join("public"),
+        content: Pathname.pwd.join("content"),
+        layouts: Pathname.pwd.join("layouts"),
+        assets: Pathname.pwd.join("assets"),
+        destination: Pathname.pwd.join("dist")
+      )
+    end
+  end
+end

data/lib/statique/discover.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "set"
+
 class Statique
   class Discover
     attr_reader :documents, :collections, :files
@@ -12,21 +14,22 @@ class Statique
 
     GLOB = "**/*.{#{SUPPORTED_EXTENSIONS.join(",")}}"
 
-    def initialize(root)
+    def initialize(root, statique)
       @root = root
       @documents = []
       @collections = Hashie::Mash.new { |hash, key| hash[key] = Set.new }
+      @statique = statique
 
       discover_files!
       discover!
 
-      Statique.mode.build do
+      @statique.mode.build do
         @files.freeze
         @documents.freeze
         @collections.freeze
       end
 
-      watch_for_changes if Statique.mode.server?
+      watch_for_changes if @statique.mode.server?
     end
 
     private
@@ -34,7 +37,7 @@ class Statique
     def discover_files!
       @files = @root.glob(GLOB)
     ensure
-      Statique.ui.debug "Discovered files", count: @files.size
+      @statique.ui.debug "Discovered files", count: @files.size
     end
 
     def discover!
@@ -44,7 +47,7 @@ class Statique
     end
 
     def process(file)
-      document = Document.new(file)
+      document = Document.new(file, @statique)
 
       documents << document
 
@@ -56,20 +59,20 @@ class Statique
     def watch_for_changes
       require "filewatcher"
 
-      @filewatcher = Filewatcher.new([Statique.paths.content, Statique.paths.layouts])
+      @filewatcher = Filewatcher.new([@statique.configuration.paths.content, @statique.configuration.paths.layouts])
       @filewatcher_thread = Thread.new(@filewatcher) do |watcher|
         watcher.watch do |file, event|
-          Statique.ui.debug "File change event", file: file, event: event
+          @statique.ui.debug "File change event", file: file, event: event
           discover_files!
           path = Pathname.new(file)
           remove_file!(path)
           process(path) unless event == :deleted
         end
       end
-      Statique.ui.debug "Started file watcher", filewatcher: @filewatcher, thread: @filewatcher_thread
+      @statique.ui.debug "Started file watcher", filewatcher: @filewatcher, thread: @filewatcher_thread
 
       at_exit do
-        Statique.ui.debug "Closing file watcher", thread: @filewatcher_thread
+        @statique.ui.debug "Closing file watcher", thread: @filewatcher_thread
         @filewatcher.stop
         @filewatcher.finalize
         @filewatcher_thread.join

data/lib/statique/document.rb

@@ -6,9 +6,9 @@ class Statique
   class Document
     attr_reader :file, :meta, :content
 
-    def initialize(file)
+    def initialize(file, statique)
       parsed = FrontMatterParser::Parser.parse_file(file)
-      @file, @meta, @content = file.freeze, Hashie::Mash.new(parsed.front_matter).freeze, parsed.content.freeze
+      @file, @meta, @content, @statique = file.freeze, Hashie::Mash.new(parsed.front_matter).freeze, parsed.content.freeze, statique
     end
 
     def path
@@ -16,7 +16,7 @@ class Statique
       when "index.slim" then "/"
       when "index.md" then "/"
       else
-        "/#{meta.permalink || basename.delete_suffix(extname).delete_prefix(Statique.paths.content.to_s)}"
+        "/#{meta.permalink || basename.delete_suffix(extname).delete_prefix(@statique.configuration.paths.content.to_s)}"
       end.freeze
     end
 
@@ -41,9 +41,9 @@ class Statique
     end
 
     def pagination_pages
-      return unless Statique.discover.collections.key?(meta.paginates)
-      collection = Statique.discover.collections[meta.paginates]
-      (collection.size.to_f / Pagy::DEFAULT[:items]).ceil
+      return unless @statique.discover.collections.key?(meta.paginates)
+      collection = @statique.discover.collections[meta.paginates]
+      (collection.size.to_f / Paginator.per_page).ceil
     end
 
     def published_at

data/lib/statique/paginator.rb

@@ -2,42 +2,51 @@
 
 class Statique
   class Paginator
-    attr_reader :documents
+    attr_reader :page, :documents, :total_pages, :total_documents
 
-    def initialize(pagy, documents, path)
-      @pagy, @documents, @path = pagy, documents, path
+    def self.per_page
+      @per_page ||= 10
     end
 
-    def page
-      @pagy.page
-    end
+    def initialize(documents, path, page, statique = Statique.instance)
+      @path, @page = path, [page.to_i, 1].max
+
+      @statique = statique
 
-    def total_pages
-      @pagy.pages
+      @total_documents = documents.size
+      @offset = (self.class.per_page * (@page - 1))
+      @total_pages = (@total_documents.to_f / self.class.per_page).ceil
+      @documents = documents[@offset, self.class.per_page]
     end
 
-    def total_documents
-      @pagy.count
+    def per_page
+      self.class.per_page
     end
 
     def previous_page
-      @pagy.prev
+      page = [1, @page - 1].max
+      if page == @page
+        nil
+      else
+        page
+      end
     end
 
     def previous_page_path
-      page_path(@pagy.prev)
+      page_path(previous_page)
     end
 
     def next_page
-      @pagy.next
+      page = [@total_pages, @page + 1].min
+      if page == @page
+        nil
+      else
+        page
+      end
     end
 
     def next_page_path
-      page_path(@pagy.next)
-    end
-
-    def per_page
-      @pagy.items
+      page_path(next_page)
     end
 
     private
@@ -46,9 +55,9 @@ class Statique
       return unless page
 
       if page == 1
-        Statique.url(File.join(@path))
+        @statique.url(File.join(@path))
       else
-        Statique.url(File.join(@path, "page", page.to_s))
+        @statique.url(File.join(@path, "page", page.to_s))
       end
     end
   end

data/lib/statique/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Statique
-  VERSION = "0.1.0"
+  VERSION = "0.1.4"
 end

data/lib/statique.rb

@@ -3,66 +3,58 @@
 require "front_matter_parser"
 require "hashie"
 require "pathname"
-require "pagy"
-require "rack"
+require "singleton"
 require "tty-logger"
-require "dry-configurable"
 
 ::FrontMatterParser::SyntaxParser::Builder = FrontMatterParser::SyntaxParser::MultiLineComment["=begin", "=end"]
 
 $LOAD_PATH.unshift(File.expand_path("..", __FILE__))
-require "zeitwerk"
 
-loader = Zeitwerk::Loader.for_gem
-loader.inflector.inflect(
-  "cli" => "CLI"
-)
-loader.setup
+require "statique/cli"
 
 class Statique
-  extend Dry::Configurable
+  include Singleton
+  extend Forwardable
 
   class Error < StandardError; end
 
-  setting :paths, reader: true do
-    setting :pwd, default: Pathname.pwd, constructor: -> { Pathname(_1) }
-    setting :public, default: Pathname.pwd.join("public"), constructor: -> { Statique.pwd.join(_1) }
-    setting :content, default: Pathname.pwd.join("content"), constructor: -> { Statique.pwd.join(_1) }
-    setting :layouts, default: Pathname.pwd.join("layouts"), constructor: -> { Statique.pwd.join(_1) }
-    setting :assets, default: Pathname.pwd.join("assets"), constructor: -> { Statique.pwd.join(_1) }
-    setting :destination, default: Pathname.pwd.join("dist"), constructor: -> { Statique.pwd.join(_1) }
-  end
-  setting :root_url, default: "/", reader: true
+  autoload :Configuration, "statique/configuration"
+  autoload :Discover, "statique/discover"
+  autoload :Document, "statique/document"
+  autoload :Mode, "statique/mode"
+  autoload :Paginator, "statique/paginator"
+  autoload :VERSION, "statique/version"
 
-  class << self
-    def discover
-      @discover ||= Discover.new(paths.content)
-    end
+  def_delegators :configuration, :root_url
 
-    def mode
-      @mode ||= Mode.new
-    end
+  attr_reader :configuration, :discover, :mode, :pwd, :build_queue
 
-    def pwd
-      @pwd ||= Pathname.pwd.freeze
-    end
+  def initialize
+    @mode = Mode.new
+    @configuration = Configuration.new
+    @discover = Discover.new(configuration.paths.content, self)
+    @pwd = Pathname.pwd.freeze
+  end
 
-    def version
-      VERSION
-    end
+  def statique
+    self.class.instance
+  end
 
-    def ui
-      @ui ||= TTY::Logger.new(output: $stdout) do |config|
-        config.level = :debug if ENV["DEBUG"] == "true"
-      end
-    end
+  def version
+    VERSION
+  end
 
-    def url(document_or_path)
-      File.join(root_url, document_or_path.is_a?(Document) ? document_or_path.path : document_or_path)
-    end
+  def ui
+    self.class.ui
+  end
 
-    def build_queue
-      @build_queue ||= Queue.new
+  def self.ui
+    @ui ||= TTY::Logger.new(output: $stdout) do |config|
+      config.level = :debug if ENV["DEBUG"] == "true"
     end
   end
+
+  def url(document_or_path)
+    File.join(configuration.root_url, document_or_path.is_a?(Document) ? document_or_path.path : document_or_path)
+  end
 end

data/lib/templates/layout.slim

@@ -2,7 +2,7 @@ doctype html
 html
   head
     meta charset="UTF-8"
-    meta name="generator" content="Statique #{Statique.version}"
+    meta name="generator" content="Statique #{statique.version}"
     title Statique Website
     == assets(:css)
     == assets(:js)
@@ -10,4 +10,4 @@ html
     header
       h1 Statique Website
     main== yield
-    footer Made with Statique v#{Statique.version}
+    footer Made with Statique v#{statique.version}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statique
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Piotr Usewicz
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.23.2
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: filewatcher
   requirement: !ruby/object:Gem::Requirement
@@ -108,62 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: pagy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.9.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.9.3
-- !ruby/object:Gem::Dependency
-  name: rack-rewrite
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.52'
+        version: '3.53'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.52'
-- !ruby/object:Gem::Dependency
-  name: sassc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3.53'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: tty-logger
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: zeitwerk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.4
 description: Statique is a static website generator written in Ruby using Roda
 email:
 - piotr@layer22.com
@@ -268,6 +184,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docs/assets/css/app.css
+- docs/content/index.md
+- docs/layouts/layout.slim
 - exe/statique
 - lib/statique.rb
 - lib/statique/app.rb
@@ -275,6 +194,7 @@ files:
 - lib/statique/cli/build.rb
 - lib/statique/cli/init.rb
 - lib/statique/cli/server.rb
+- lib/statique/configuration.rb
 - lib/statique/discover.rb
 - lib/statique/document.rb
 - lib/statique/mode.rb
@@ -285,15 +205,14 @@ files:
 - sig/statique.rbs
 - sig/statique/mode.rbs
 - sig/statique/version.rbs
-- statique.gemspec
 homepage: https://github.com/pusewicz/statique
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/pusewicz/statique
   source_code_uri: https://github.com/pusewicz/statique
-  changelog_uri: https://raw.githubusercontent.com/pusewicz/statique/v0.1.0/CHANGELOG.md
-post_install_message:
+  changelog_uri: https://raw.githubusercontent.com/pusewicz/statique/v0.1.4/CHANGELOG.md
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -301,15 +220,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
-signing_key:
+rubygems_version: 3.3.3
+signing_key: 
 specification_version: 4
 summary: Static website generator
 test_files: []

data/statique.gemspec

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/statique/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "statique"
-  spec.version = Statique::VERSION
-  spec.authors = ["Piotr Usewicz"]
-  spec.email = ["piotr@layer22.com"]
-
-  spec.summary = "Static website generator"
-  spec.description = "Statique is a static website generator written in Ruby using Roda"
-  spec.homepage = "https://github.com/pusewicz/statique"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/pusewicz/statique"
-  spec.metadata["changelog_uri"] = "https://raw.githubusercontent.com/pusewicz/statique/v#{spec.version}/CHANGELOG.md"
-
-  # 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(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  spec.add_dependency "builder", "~> 3.2.4"
-  spec.add_dependency "commonmarker", "~> 0.23.2"
-  spec.add_dependency "dry-configurable", "~> 0.14.0"
-  spec.add_dependency "filewatcher", "~> 1.1.1"
-  spec.add_dependency "front_matter_parser", "~> 1.0.1"
-  spec.add_dependency "hashie", "~> 5.0.0"
-  spec.add_dependency "memo_wise", "~> 1.6.0"
-  spec.add_dependency "pagy", "~> 5.9.3"
-  spec.add_dependency "rack-rewrite", "~> 1.5.1"
-  spec.add_dependency "roda", "~> 3.52"
-  spec.add_dependency "sassc", "~> 2.4.0"
-  spec.add_dependency "slim", "~> 4.1.0"
-  spec.add_dependency "thor", "~> 1.2.1"
-  spec.add_dependency "tilt", "~> 2.0.10"
-  spec.add_dependency "tty-logger", "~> 0.6.0"
-  spec.add_dependency "webrick", "~> 1.7.0"
-  spec.add_dependency "zeitwerk", "~> 2.5.4"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end