statique 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50d52d44d67fdcebdfaf1408ad1f3734b2764883cce75d8f10c44d9c7caad3c0
-  data.tar.gz: 60a65af96f09f7ee6ee098cc9ffaed7b9a5e00cf0ce9efbf59952a2f3ea2b5c4
+  metadata.gz: d2054cde4943aaa109efca61aaf7324a13c7b79f6799799c989a0a1741c3ca8f
+  data.tar.gz: 72d87387e9f0efd5221f243a5ff20e005d472117d251385c91b3e2b1c48875ab
 SHA512:
-  metadata.gz: 6c4eb0792b466e0fdbd2816ca0edd5034fb2d259ebac099ddc8cec11f3aa357be011fdc39a8143eafe8f517f249fbcef99642c7eb59f199b25b544837dd2f881
-  data.tar.gz: 8e7fb2885dcd118ffac0a86ae502060ae1bef7a889adda8b08af5814c86e35c0a54520f979545d25a48df7b4a1b289db4f763b9605b2c018920a0b88c84db070
+  metadata.gz: cbbd3939295f1d514c2d88d359d4378b40c035c9f1dba4277520595988a156bdd03d38699d34030850eb99051beae0f3f03740479f0db2a5be284083d056a843
+  data.tar.gz: 299de1732a45c052a472ad81584329aae57b429d5c6eade81af2934c10171f8a6347f696b9cb392e818f4b38d1e77380c8995111a6e03ac6c4edf43528ede304

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/content/index.md

@@ -1,4 +1,4 @@
-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/), [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 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
 

data/lib/statique/app.rb

@@ -19,21 +19,21 @@ class Statique
 
     def_delegators :Statique, :url, :root_url
 
-    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"), 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
@@ -78,8 +78,8 @@ class Statique
 
     if Statique.mode.server?
       route do |r|
-        r.public if Statique.paths.public.exist?
-        r.assets if Statique.paths.assets.exist?
+        r.public if Statique.configuration.paths.public.exist?
+        r.assets if Statique.configuration.paths.assets.exist?
       end
     end
   end

data/lib/statique/cli/build.rb

@@ -15,8 +15,9 @@ class Statique
       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
@@ -41,7 +42,7 @@ 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}")
+                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)
@@ -60,9 +61,9 @@ class Statique
       end
 
       def copy_public_assets
-        assets = Statique.paths.public.glob("**/*.*")
+        assets = Statique.configuration.paths.public.glob("**/*.*")
         Statique.ui.info "Copying public assets", assets:
-          FileUtils.cp_r(assets, Statique.paths.destination)
+          FileUtils.cp_r(assets, Statique.configuration.paths.destination)
       end
 
       private

data/lib/statique/cli/server.rb

@@ -29,6 +29,7 @@ class Statique
       end
 
       def run
+        require "statique/app"
         Statique.ui.info "Starting server", port: @port
 
         logger = LoggerWrapper.new

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

@@ -56,7 +56,7 @@ 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

data/lib/statique/version.rb

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

data/lib/statique.rb

@@ -6,37 +6,27 @@ require "pathname"
 require "pagy"
 require "rack"
 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/version"
+require "statique/cli"
+require "statique/mode"
+require "statique/discover"
+require "statique/document"
 
 class Statique
-  extend Dry::Configurable
-
   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
-
   class << self
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
     def discover
-      @discover ||= Discover.new(paths.content)
+      @discover ||= Discover.new(configuration.paths.content)
     end
 
     def mode

data/statique.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   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.required_ruby_version = ">= 3.1.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/pusewicz/statique"
@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   # 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"
@@ -40,13 +39,11 @@ Gem::Specification.new do |spec|
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statique
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Piotr Usewicz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-15 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
@@ -150,20 +136,6 @@ dependencies:
     - - "~>"
       - !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
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +206,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,7 +226,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- docs/assets/css/app.scss
+- docs/assets/css/app.css
 - docs/content/index.md
 - docs/layouts/layout.slim
 - exe/statique
@@ -278,6 +236,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
@@ -295,7 +254,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.1/CHANGELOG.md
+  changelog_uri: https://raw.githubusercontent.com/pusewicz/statique/v0.1.2/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -304,7 +263,7 @@ 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:
   - - ">="