statique 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2054cde4943aaa109efca61aaf7324a13c7b79f6799799c989a0a1741c3ca8f
-  data.tar.gz: 72d87387e9f0efd5221f243a5ff20e005d472117d251385c91b3e2b1c48875ab
+  metadata.gz: dd7fb4476908430cae60c027294cfa598de01c78d0d9ca6b858051cd5e7b66c8
+  data.tar.gz: 919b4478902cc46c88a1e7ea9854ca6f7ec12c2ce3cfbdcd05f08e1147788aa6
 SHA512:
-  metadata.gz: cbbd3939295f1d514c2d88d359d4378b40c035c9f1dba4277520595988a156bdd03d38699d34030850eb99051beae0f3f03740479f0db2a5be284083d056a843
-  data.tar.gz: 299de1732a45c052a472ad81584329aae57b429d5c6eade81af2934c10171f8a6347f696b9cb392e818f4b38d1e77380c8995111a6e03ac6c4edf43528ede304
+  metadata.gz: ea8e8cac8cf7a453bbe5a2ddf99b147a2d185e105a80447d79d963be99577f89d1975facfae921bc1582e2140e2c21abc72260bd68415d8dcfbbf9dc8aec25e5
+  data.tar.gz: 76836fa5e763d1184ddab6133501d123e389767a97410952d88206d6f5578efb955004d3ab4989d0b978fb8eb9453e274c32c7a968953bf45096dc97bee5c4ad

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+### [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/lib/statique/app.rb

@@ -3,19 +3,10 @@
 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
 
     def_delegators :Statique, :url, :root_url
 
@@ -42,30 +33,36 @@ class Statique
       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|
+      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["REQUEST_PATH"].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
+          document: document
         }
 
-        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)
+          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 +72,5 @@ class Statique
         end
       end
     end
-
-    if Statique.mode.server?
-      route do |r|
-        r.public if Statique.configuration.paths.public.exist?
-        r.assets if Statique.configuration.paths.assets.exist?
-      end
-    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

data/lib/statique/document.rb

@@ -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
 
@@ -43,7 +43,7 @@ class Statique
     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
+      (collection.size.to_f / Paginator.per_page).ceil
     end
 
     def published_at

data/lib/statique/paginator.rb

@@ -2,42 +2,49 @@
 
 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)
+      @path, @page = path, [page.to_i, 1].max
 
-    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

data/lib/statique/version.rb

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

data/lib/statique.rb

@@ -3,7 +3,6 @@
 require "front_matter_parser"
 require "hashie"
 require "pathname"
-require "pagy"
 require "rack"
 require "tty-logger"
 
@@ -16,11 +15,17 @@ require "statique/cli"
 require "statique/mode"
 require "statique/discover"
 require "statique/document"
+require "statique/configuration"
+require "statique/paginator"
 
 class Statique
   class Error < StandardError; end
 
   class << self
+    extend Forwardable
+
+    def_delegators :configuration, :root_url
+
     def configuration
       @configuration ||= Configuration.new
     end
@@ -48,7 +53,7 @@ class Statique
     end
 
     def url(document_or_path)
-      File.join(root_url, document_or_path.is_a?(Document) ? document_or_path.path : document_or_path)
+      File.join(configuration.root_url, document_or_path.is_a?(Document) ? document_or_path.path : document_or_path)
     end
 
     def build_queue

data/statique.gemspec

@@ -36,8 +36,6 @@ Gem::Specification.new do |spec|
   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 "slim", "~> 4.1.0"
   spec.add_dependency "thor", "~> 1.2.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statique
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Piotr Usewicz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -94,34 +94,6 @@ 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
@@ -254,7 +226,7 @@ licenses:
 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.2/CHANGELOG.md
+  changelog_uri: https://raw.githubusercontent.com/pusewicz/statique/v0.1.3/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: