statique 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd7fb4476908430cae60c027294cfa598de01c78d0d9ca6b858051cd5e7b66c8
-  data.tar.gz: 919b4478902cc46c88a1e7ea9854ca6f7ec12c2ce3cfbdcd05f08e1147788aa6
+  metadata.gz: ca6623c907a23398e840f6d3dc056f1dbe966f747a443e7e6cced71fe462cbbb
+  data.tar.gz: 511a4f47f18fc755ad1f74295637047d9715ec6de95454f4b1e85022c9128da9
 SHA512:
-  metadata.gz: ea8e8cac8cf7a453bbe5a2ddf99b147a2d185e105a80447d79d963be99577f89d1975facfae921bc1582e2140e2c21abc72260bd68415d8dcfbbf9dc8aec25e5
-  data.tar.gz: 76836fa5e763d1184ddab6133501d123e389767a97410952d88206d6f5578efb955004d3ab4989d0b978fb8eb9453e274c32c7a968953bf45096dc97bee5c4ad
+  metadata.gz: 0ac4f9d6a45018021322e0cb685bde01ca682be029dc884b915237728de5a088e3232cdc6fb7a2e378fbb753e857e0bc77a99008d693a145191734c828308a4a
+  data.tar.gz: a1b4e20006069b4a23655b161074e087cd88d7fb22efb8d76cf8db009b16144362bfdf63c948b30f635d385767f693b60d392853b3a5ba3d963c9ac541ec2b6a

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [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)
 
 

data/lib/statique/app.rb

@@ -8,50 +8,54 @@ class Statique
   class App < Roda
     extend Forwardable
 
-    def_delegators :Statique, :url, :root_url
+    @statique = Statique.instance
 
-    opts[:root] = Statique.configuration.paths.pwd
+    def_delegators :@statique, :url, :root_url, :statique
+
+    opts[:root] = @statique.configuration.paths.pwd
 
     plugin :environments
     plugin :static_routing
-    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
+    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.configuration.paths.public.exist?
-      plugin :public, root: Statique.configuration.paths.public.basename
+    if @statique.mode.server? && @statique.configuration.paths.public.exist?
+      plugin :public, root: @statique.configuration.paths.public.basename
     end
 
-    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
+    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
 
     route do |r|
-      if Statique.mode.server?
-        r.public if Statique.configuration.paths.public.exist?
-        r.assets if Statique.configuration.paths.assets.exist?
+      @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["REQUEST_PATH"].split("/page/")
+      path, page = r.env["PATH_INFO"].split("/page/")
 
-      document = Statique.discover.documents.find { _1.path == path }
+      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
-          paginator = Paginator.new(Statique.discover.collections[document.meta.paginates].to_a, document.path, page)
+          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

data/lib/statique/cli/build.rb

@@ -9,26 +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.configuration.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)
@@ -42,12 +43,12 @@ class Statique
               path = @queue.pop
               response = mock_request.get(path)
               if response.successful?
-                destination = Statique.configuration.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
@@ -61,9 +62,9 @@ class Statique
       end
 
       def copy_public_assets
-        assets = Statique.configuration.paths.public.glob("**/*.*")
-        Statique.ui.info "Copying public assets", assets:
-          FileUtils.cp_r(assets, Statique.configuration.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,13 +24,14 @@ class Statique
         end
       end
 
-      def initialize(port: 3000)
+      def initialize(statique, port: 3000)
         @port = port
+        @statique = statique
       end
 
       def run
         require "statique/app"
-        Statique.ui.info "Starting server", port: @port
+        @statique.ui.info "Starting server", port: @port
 
         logger = LoggerWrapper.new
 
@@ -42,7 +43,7 @@ class Statique
       end
 
       def stop
-        Statique.ui.info "Stopping server"
+        @statique.ui.info "Stopping server"
         Rack::Handler::WEBrick.shutdown
       end
 
@@ -52,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/discover.rb

@@ -14,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
@@ -36,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!
@@ -46,7 +47,7 @@ class Statique
     end
 
     def process(file)
-      document = Document.new(file)
+      document = Document.new(file, @statique)
 
       documents << document
 
@@ -58,20 +59,20 @@ class Statique
     def watch_for_changes
       require "filewatcher"
 
-      @filewatcher = Filewatcher.new([Statique.configuration.paths.content, Statique.configuration.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.configuration.paths.content.to_s)}"
+        "/#{meta.permalink || basename.delete_suffix(extname).delete_prefix(@statique.configuration.paths.content.to_s)}"
       end.freeze
     end
 
@@ -41,8 +41,8 @@ class Statique
     end
 
     def pagination_pages
-      return unless Statique.discover.collections.key?(meta.paginates)
-      collection = Statique.discover.collections[meta.paginates]
+      return unless @statique.discover.collections.key?(meta.paginates)
+      collection = @statique.discover.collections[meta.paginates]
       (collection.size.to_f / Paginator.per_page).ceil
     end
 

data/lib/statique/paginator.rb

@@ -8,9 +8,11 @@ class Statique
       @per_page ||= 10
     end
 
-    def initialize(documents, path, page)
+    def initialize(documents, path, page, statique = Statique.instance)
       @path, @page = path, [page.to_i, 1].max
 
+      @statique = statique
+
       @total_documents = documents.size
       @offset = (self.class.per_page * (@page - 1))
       @total_pages = (@total_documents.to_f / self.class.per_page).ceil
@@ -53,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.3"
+  VERSION = "0.1.4"
 end

data/lib/statique.rb

@@ -3,61 +3,58 @@
 require "front_matter_parser"
 require "hashie"
 require "pathname"
-require "rack"
+require "singleton"
 require "tty-logger"
 
 ::FrontMatterParser::SyntaxParser::Builder = FrontMatterParser::SyntaxParser::MultiLineComment["=begin", "=end"]
 
 $LOAD_PATH.unshift(File.expand_path("..", __FILE__))
 
-require "statique/version"
 require "statique/cli"
-require "statique/mode"
-require "statique/discover"
-require "statique/document"
-require "statique/configuration"
-require "statique/paginator"
 
 class Statique
-  class Error < StandardError; end
+  include Singleton
+  extend Forwardable
 
-  class << self
-    extend Forwardable
+  class Error < StandardError; end
 
-    def_delegators :configuration, :root_url
+  autoload :Configuration, "statique/configuration"
+  autoload :Discover, "statique/discover"
+  autoload :Document, "statique/document"
+  autoload :Mode, "statique/mode"
+  autoload :Paginator, "statique/paginator"
+  autoload :VERSION, "statique/version"
 
-    def configuration
-      @configuration ||= Configuration.new
-    end
+  def_delegators :configuration, :root_url
 
-    def discover
-      @discover ||= Discover.new(configuration.paths.content)
-    end
+  attr_reader :configuration, :discover, :mode, :pwd, :build_queue
 
-    def mode
-      @mode ||= Mode.new
-    end
+  def initialize
+    @mode = Mode.new
+    @configuration = Configuration.new
+    @discover = Discover.new(configuration.paths.content, self)
+    @pwd = Pathname.pwd.freeze
+  end
 
-    def pwd
-      @pwd ||= Pathname.pwd.freeze
-    end
+  def statique
+    self.class.instance
+  end
 
-    def version
-      VERSION
-    end
+  def version
+    VERSION
+  end
 
-    def ui
-      @ui ||= TTY::Logger.new(output: $stdout) do |config|
-        config.level = :debug if ENV["DEBUG"] == "true"
-      end
-    end
+  def ui
+    self.class.ui
+  end
 
-    def url(document_or_path)
-      File.join(configuration.root_url, document_or_path.is_a?(Document) ? document_or_path.path : document_or_path)
+  def self.ui
+    @ui ||= TTY::Logger.new(output: $stdout) do |config|
+      config.level = :debug if ENV["DEBUG"] == "true"
     end
+  end
 
-    def build_queue
-      @build_queue ||= Queue.new
-    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.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Piotr Usewicz
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -100,14 +100,14 @@ dependencies:
     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'
+        version: '3.53'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -136,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
@@ -219,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.3/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
@@ -242,8 +227,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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,48 +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 = ">= 3.1.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 "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 "roda", "~> 3.52"
-  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"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end