staticky 0.1.0 → 0.2.0

data/site_template/app/views/layouts/site.rb

@@ -5,7 +5,8 @@ module Layouts
     include Phlex::DeferredRender
 
     def view_template
-      html lang: "en_US", data: { theme: "onedark" } do
+      doctype
+      html lang: "en", data: { theme: "onedark" } do
         render Layouts::Head.new(&head)
 
         body do
@@ -27,11 +28,11 @@ module Layouts
     private
 
     def content
-      @content || proc {}
+      @content || proc { }
     end
 
     def head
-      @head || proc {}
+      @head || proc { }
     end
   end
 end

data/site_template/app/views/ui/navbar.rb

@@ -4,7 +4,7 @@ module UI
   class Navbar < Component
     def view_template
       header(**attrs) do
-        a(href: "/", class: "btn btn-ghost") { "MyApp" }
+        a(href: "/", class: "btn btn-ghost") { Site.title }
       end
     end
 

data/site_template/bin/{lint → setup}

@@ -13,6 +13,12 @@ FileUtils.chdir APP_ROOT do
   # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts "== Running rubocop =="
-  system! "bundle exec rubocop --autocorrect-all --fail-level error"
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
+
+  system! "bundle binstubs --force bundler rubocop rspec-core vite_ruby rake"
+
+  puts "\n== Installing javascript dependencies =="
+  system! "yarn install"
 end

data/site_template/config/boot.rb

@@ -5,6 +5,8 @@ ENV["RACK_ENV"] ||= "development"
 require "bundler"
 Bundler.require(:default, ENV.fetch("RACK_ENV", nil))
 
+require_relative "staticky"
+
 loader = Zeitwerk::Loader.new
 loader.inflector.inflect("ui" => "UI")
 loader.push_dir("lib")

data/site_template/config/puma.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# Run in single threaded mode
+threads 0, 1
+
+# Specifies the `port` that Puma will listen on to receive requests; default is
+# 3000.
+port 3000
+
+# Only use a pidfile when requested
+pidfile ENV["PIDFILE"] if ENV["PIDFILE"]

data/site_template/config/staticky.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Staticky.configure do |config|
+  config.build_path = Pathname.new("build")
+  config.root_path = Pathname(__dir__).join("..")
+end

data/site_template/lib/icon.rb

@@ -2,7 +2,7 @@
 
 class Icon < Component
   param :name, reader: false
-  option :variant, reader: false, default: -> {}
+  option :variant, reader: false, default: -> { }
   option :size, default: -> { :md }, reader: false
 
   def template

data/site_template/nginx.conf

@@ -1,6 +1,7 @@
 worker_processes 1;
 error_log stderr;
 pid nginx.pid;
+daemon off;
 
 events {
   worker_connections 768;
@@ -17,17 +18,18 @@ http {
   gzip_proxied any;
   gzip_vary on;
 
+  error_page 404 /404.html;
+
   server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
+    listen 5000;
     server_name  _;
     root /usr/share/nginx/html;
-    index index.html index.htm;
+    index index.html;
     port_in_redirect off;
     add_header X-Content-Type-Options "nosniff";
 
     location / {
-      try_files $uri $uri.html =404;
+      try_files $uri $uri/ =404;
       expires 1h;
     }
 

data/site_template/package.json

@@ -27,5 +27,5 @@
   "optionalDependencies": {
     "@rollup/rollup-linux-arm64-musl": "4.20.0"
   },
-  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
+  "packageManager": "yarn@4.5.0"
 }

data/site_template/public/site.webmanifest.erb

@@ -1,6 +1,6 @@
 {
-  "name": <%= title %>,
-  "short_name": <%= title %>,
+  "name": "<%= title %>",
+  "short_name": "<%= title %>",
   "icons": [
     {
       "src":"/android-chrome-192x192.png",

data/site_template/vite.config.ts

@@ -8,7 +8,7 @@ export default defineConfig({
     RubyPlugin(),
     FullReload(
       "build/index.html",
-      { delay: 0 }
+      { delay: 500 }
     ),
   ],
 })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staticky
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nolan J Tait
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2024-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: dry-events
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dry-inflector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: dry-logger
   requirement: !ruby/object:Gem::Requirement
@@ -166,21 +194,29 @@ files:
 - Rakefile
 - bin/staticky
 - lib/staticky.rb
+- lib/staticky/application.rb
 - lib/staticky/builder.rb
 - lib/staticky/cli.rb
-- lib/staticky/container.rb
+- lib/staticky/cli/commands.rb
+- lib/staticky/cli/commands/build.rb
+- lib/staticky/cli/commands/generate.rb
+- lib/staticky/cli/commands/version.rb
 - lib/staticky/deps.rb
 - lib/staticky/environment.rb
 - lib/staticky/error.rb
 - lib/staticky/filesystem.rb
 - lib/staticky/generator.rb
 - lib/staticky/phlex/view_helpers.rb
+- lib/staticky/pluggable.rb
 - lib/staticky/resource.rb
+- lib/staticky/resources/plugins.rb
+- lib/staticky/resources/plugins/phlex.rb
+- lib/staticky/resources/plugins/prelude.rb
 - lib/staticky/router.rb
-- lib/staticky/router/definition.rb
+- lib/staticky/routing/plugins.rb
+- lib/staticky/routing/plugins/prelude.rb
 - lib/staticky/server.rb
 - lib/staticky/version.rb
-- lib/staticky/view_context.rb
 - site_template/.dockerignore
 - site_template/.gitignore
 - site_template/.prettierrc
@@ -203,12 +239,14 @@ files:
 - site_template/app/views/ui/navbar.rb
 - site_template/bin/console
 - site_template/bin/dev
-- site_template/bin/lint
+- site_template/bin/setup
 - site_template/bin/staticky
 - site_template/config.ru
 - site_template/config/boot.rb
+- site_template/config/puma.rb
 - site_template/config/routes.rb
 - site_template/config/site.erb
+- site_template/config/staticky.rb
 - site_template/config/vite.json
 - site_template/content/.keep
 - site_template/content/demo.md
@@ -266,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Static site

data/lib/staticky/container.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Staticky
-  class Container < Dry::System::Container
-    use :env
-    use :zeitwerk
-    use :monitoring
-
-    configure do |config|
-      config.root = Pathname(__dir__).join("..").join("..")
-      config.inflector = Dry::Inflector.new do |inflections|
-        inflections.acronym("CLI")
-      end
-      config.component_dirs.add "lib" do |dir|
-        dir.add_to_load_path = false
-        dir.auto_register = false
-        dir.namespaces.add "staticky", key: nil
-      end
-    end
-
-    register(:files, Staticky::Filesystem.real)
-    register(:router, Staticky::Router.new)
-    register(:builder, Staticky::Builder.new)
-    register(:generator, Staticky::Generator.new)
-  end
-end

data/lib/staticky/router/definition.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Staticky
-  class Router
-    class Definition
-      attr_reader :resources
-
-      def initialize
-        @routes_by_path = {}
-        @routes_by_component = {}
-        @resources = []
-      end
-
-      def match(path, to:)
-        component = to.then do |object|
-          object.is_a?(Class) ? object.new : object
-        end
-
-        @resources << resource = Resource.new(url: path, component:)
-        @routes_by_path[path] = resource
-        @routes_by_component[component.class] = resource
-      end
-
-      def root(to:)
-        match("/", to:)
-      end
-
-      def resolve(path)
-        @routes_by_path.fetch(path) { @routes_by_component.fetch(path) }
-      end
-
-      def delete(path)
-        @routes.delete(path)
-      end
-
-      def filepaths
-        @resources.map { |resource| rename_key(resource.url) }
-      end
-
-      private
-
-      def rename_key(key)
-        return "index.html" if key == "/"
-
-        "#{key}.html"
-      end
-    end
-  end
-end

data/lib/staticky/view_context.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Staticky
-  class ViewContext
-    def initialize(resource)
-      @resource = resource
-    end
-
-    def root?
-      @resource.root?
-    end
-
-    def current_path
-      @resource.url
-    end
-  end
-end