staticz 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51553de1d014c695974c26a1fb9cd7650172cee243b894e23cf326537ee46ad3
-  data.tar.gz: 98ab884e175ecc7732d330a7a3a10569f7522769d49f046bd3272599123fe772
+  metadata.gz: 5d778ec6e3bd50f39361d84393c7de56ae57888e5bc59d22a6237af9f81c9ba4
+  data.tar.gz: 655bf3dff47d221a2b8baa1e84917d9dd958c641b278ecd1e4cb3bf1ea2e8a72
 SHA512:
-  metadata.gz: c0ad038f66d42971d1019a9e6fa7927d13eb684b9cb29f5258977d56975517a47a776b8f3ff0b1c5628ac1738fb39dd095b8e250b18559c9d768957e3a6a31d6
-  data.tar.gz: 000fb933e0b1e91a32cb84606f59481a085843c13772d20e0792f9418da4a5e5af912147b18afabd72146e3a41a7ef2761c9ee2ea9edc8829499300a38dad039
+  metadata.gz: 505c8756fdb68da5e127cb84f0df493615f5390f5abeed9b1a739b77fa42c2f76582ce1ac1979eb58589f2cdbd90f144d52e225710f42f8816481993e34a4914
+  data.tar.gz: f8936d899637624582117c0178c90c0494f7696d78874d99e02a056a96f4775117de5d521fbaf301f083035690c6e72557f9662eaf16dc179c4e826516c71318

data/lib/builder.rb

@@ -1,4 +1,4 @@
-require "haml"
+require_relative "modules/lib_loader"
 
 module Staticz
   class Builder
@@ -9,6 +9,8 @@ module Staticz
     private
 
     def build
+      Staticz::Modules::LibLoader.load_files
+
       Dir.mkdir('build') unless File.exist?('build')
 
       Staticz::Manifest.instance.build

data/lib/manifest/compilable/cs.rb

@@ -0,0 +1,30 @@
+require "coffee-script"
+require_relative "../compilable"
+
+module Staticz
+  module Compilable
+    class Cs
+      include Compilable
+
+      attr_reader :name
+
+      def source_file_ending = "coffee"
+
+      def build_file_ending = "js"
+
+      def tile_type_name = "Coff"
+
+      def initialize(name)
+        @name = name
+      end
+
+      def build
+        if exists?
+          js = CoffeeScript.compile File.read(source_path)
+
+          File.write build_path, js
+        end
+      end
+    end
+  end
+end

data/lib/manifest/compilable/haml.rb

@@ -0,0 +1,45 @@
+require "haml"
+require_relative "../compilable"
+
+module Staticz
+  module Compilable
+    class Haml
+      include Compilable
+
+      attr_reader :name
+
+      def source_file_ending = "haml"
+
+      def build_file_ending = "html"
+
+      def tile_type_name = "Haml"
+
+      def initialize(name)
+        @name = name
+      end
+
+      def errors
+        errors = super
+
+        if exists?
+          begin
+            engine = ::Haml::Engine.new(File.read(source_path))
+            engine.render
+          rescue => e
+            errors << e.message
+          end
+        end
+
+        errors
+      end
+
+      def build
+        if valid?
+          engine = ::Haml::Engine.new(File.read(source_path))
+
+          File.write build_path, engine.render
+        end
+      end
+    end
+  end
+end

data/lib/manifest/compilable/js.rb

@@ -0,0 +1,27 @@
+require_relative "../compilable"
+
+module Staticz
+  module Compilable
+    class Js
+      include Compilable
+
+      attr_reader :name
+
+      def source_file_ending = "js"
+
+      def build_file_ending = "js"
+
+      def tile_type_name = "Js"
+
+      def initialize(name)
+        @name = name
+      end
+
+      def build
+        if exists?
+          File.write build_path, File.read(source_path)
+        end
+      end
+    end
+  end
+end

data/lib/manifest/compilable/react.rb

@@ -0,0 +1,30 @@
+require "babel/transpiler"
+require_relative "../compilable"
+
+module Staticz
+  module Compilable
+    class React
+      include Compilable
+
+      attr_reader :name
+
+      def source_file_ending = "js"
+
+      def build_file_ending = "js"
+
+      def tile_type_name = "React"
+
+      def initialize(name)
+        @name = name
+      end
+
+      def build
+        if exists?
+          engine = Babel::Transpiler.transform File.read(source_path)
+
+          File.write build_path, engine["code"]
+        end
+      end
+    end
+  end
+end

data/lib/manifest/compilable/sass.rb

@@ -0,0 +1,45 @@
+require "sassc"
+require_relative "../compilable"
+
+module Staticz
+  module Compilable
+    class Sass
+      include Compilable
+
+      attr_reader :name
+
+      def source_file_ending = "sass"
+
+      def build_file_ending = "css"
+
+      def tile_type_name = "Sass"
+
+      def initialize(name)
+        @name = name
+      end
+
+      def build
+        if valid?
+          engine = ::SassC::Engine.new(File.read(source_path), syntax: :sass, style: :compressed)
+
+          File.write build_path, engine.render
+        end
+      end
+
+      def errors
+        errors = super
+
+        if exists?
+          begin
+            engine = ::SassC::Engine.new(File.read(source_path), syntax: :sass)
+            engine.render
+          rescue => e
+            errors << e.message
+          end
+        end
+
+        errors
+      end
+    end
+  end
+end

data/lib/manifest/compilable/scss.rb

@@ -0,0 +1,45 @@
+require "sassc"
+require_relative "../compilable"
+
+module Staticz
+  module Compilable
+    class Scss
+      include Compilable
+
+      attr_reader :name
+
+      def source_file_ending = "scss"
+
+      def build_file_ending = "css"
+
+      def tile_type_name = "Scss"
+
+      def initialize(name)
+        @name = name
+      end
+
+      def build
+        if valid?
+          engine = ::SassC::Engine.new(File.read(source_path), syntax: :scss, style: :compressed)
+
+          File.write build_path, engine.render
+        end
+      end
+
+      def errors
+        errors = super
+
+        if exists?
+          begin
+            engine = ::SassC::Engine.new(File.read(source_path), syntax: :scss)
+            engine.render
+          rescue => e
+            errors << e.message
+          end
+        end
+
+        errors
+      end
+    end
+  end
+end

data/lib/manifest/compilable/simple_file.rb

@@ -0,0 +1,38 @@
+require_relative "../compilable"
+
+module Staticz
+  module Compilable
+    class SimpleFile
+      include Compilable
+
+      attr_reader :name
+
+      def source_path
+        "src/#{name}"
+      end
+
+      def build_path
+        "build/#{name}"
+      end
+
+      def create_link_function
+      end
+
+      def path_method_name
+        "no path created"
+      end
+
+      def tile_type_name = "File"
+
+      def initialize(name)
+        @name = name
+      end
+
+      def build
+        if exists?
+          File.write build_path, File.read(source_path)
+        end
+      end
+    end
+  end
+end

data/lib/manifest/compilable.rb

@@ -1,3 +1,5 @@
+require "io/console"
+
 module Staticz
   module Compilable
     def path
@@ -20,12 +22,16 @@ module Staticz
       "#{path.gsub(/[\/-]/, "_")}_path"
     end
 
-    def valid
-      if exists?
-        Colors.in_green("✔")
-      else
-        Colors.in_red("✘ (file does not exist)")
-      end
+    def valid?
+      errors.empty?
+    end
+
+    def errors
+      errors = []
+
+      errors << "File does not exist" if !exists?
+
+      errors
     end
 
     def create_link_function
@@ -34,7 +40,23 @@ module Staticz
     end
 
     def print(indentation)
-      puts "#{" " * (indentation * 3)}└─ #{tile_type_name}: #{path} #{valid} -> #{path_method_name}"
+      valid_symbol = if valid?
+        Colors.in_green("✔")
+      else
+        Colors.in_red("✘")
+      end
+
+      puts "#{" " * (indentation * 3)}└─ #{tile_type_name}: #{path} #{valid_symbol} -> #{path_method_name}"
+
+      _height, width = IO.console.winsize
+
+      errors.each do |full_error|
+        line_width = width - (indentation * 3) - 3
+        multiline_errors = full_error.scan(/.{1,#{line_width}}/)
+        multiline_errors.each do |error|
+          puts "#{" " * (indentation * 3)}   #{Colors.in_red(error)}"
+        end
+      end
     end
   end
 end

data/lib/manifest/manifest.rb

@@ -1,12 +1,12 @@
-require 'singleton'
-require_relative 'compilable'
-require_relative 'sub'
-require_relative 'haml'
-require_relative 'sass'
-require_relative 'scss'
-require_relative 'js'
-require_relative 'cs'
-require_relative 'react'
+require "singleton"
+require_relative "sub"
+require_relative "compilable/haml"
+require_relative "compilable/cs"
+require_relative "compilable/js"
+require_relative "compilable/react"
+require_relative "compilable/sass"
+require_relative "compilable/scss"
+require_relative "compilable/simple_file"
 
 module Staticz
   class Manifest
@@ -26,27 +26,31 @@ module Staticz
     end
 
     def haml(name)
-      elements.push(Staticz::Haml.new(name))
+      elements.push(Staticz::Compilable::Haml.new(name))
     end
 
     def sass(name)
-      elements.push(Staticz::Sass.new(name))
+      elements.push(Staticz::Compilable::Sass.new(name))
     end
 
     def scss(name)
-      elements.push(Staticz::Scss.new(name))
+      elements.push(Staticz::Compilable::Scss.new(name))
     end
 
     def js(name)
-      elements.push(Staticz::Js.new(name))
+      elements.push(Staticz::Compilable::Js.new(name))
     end
 
     def coffee(name)
-      elements.push(Staticz::Cs.new(name))
+      elements.push(Staticz::Compilable::Cs.new(name))
     end
 
     def react(name)
-      elements.push(Staticz::React.new(name))
+      elements.push(Staticz::Compilable::React.new(name))
+    end
+
+    def file(name)
+      elements.push(Staticz::Compilable::SimpleFile.new(name))
     end
 
     def build
@@ -59,8 +63,6 @@ module Staticz
       elements.each do |e|
         e.build
       end
-
-      print
     end
 
     def self.define(&block)

data/lib/manifest/sub.rb

@@ -14,27 +14,31 @@ module Staticz
     end
 
     def haml(name, &block)
-      elements.push(Staticz::Haml.new("#{@name}/#{name}"))
+      elements.push(Staticz::Compilable::Haml.new("#{@name}/#{name}"))
     end
 
     def sass(name, &block)
-      elements.push(Staticz::Sass.new("#{@name}/#{name}"))
+      elements.push(Staticz::Compilable::Sass.new("#{@name}/#{name}"))
     end
 
     def scss(name, &block)
-      elements.push(Staticz::Scss.new("#{@name}/#{name}"))
+      elements.push(Staticz::Compilable::Scss.new("#{@name}/#{name}"))
     end
 
     def js(name, &block)
-      elements.push(Staticz::Js.new("#{@name}/#{name}"))
+      elements.push(Staticz::Compilable::Js.new("#{@name}/#{name}"))
     end
 
     def coffee(name, &block)
-      elements.push(Staticz::Cs.new("#{@name}/#{name}"))
+      elements.push(Staticz::Compilable::Cs.new("#{@name}/#{name}"))
     end
 
     def react(name, &block)
-      elements.push(Staticz::React.new("#{@name}/#{name}"))
+      elements.push(Staticz::Compilable::React.new("#{@name}/#{name}"))
+    end
+
+    def file(name, &block)
+      elements.push(Staticz::Compilable::SimpleFile.new("#{@name}/#{name}"))
     end
 
     def build

data/lib/modules/lib_loader.rb

@@ -0,0 +1,18 @@
+module Staticz
+  module Modules
+    class LibLoader
+      def self.load_files
+        return if !Dir.exist? "lib"
+
+        Dir["lib/**/*.rb"].each do |rb_file|
+          begin
+            load rb_file
+          rescue SyntaxError => e
+            puts Colors.in_red("Could not load #{rb_file}:")
+            puts Colors.in_red(e.message)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/modules/reload.rb

@@ -0,0 +1,41 @@
+require "securerandom"
+
+module Staticz
+  module Modules
+    class Reload
+      def self.hash
+        @@hash
+      end
+
+      def self.build_reload_js
+        <<~JS
+          var hash = null;
+  
+          function checkForChanges() {
+            console.log("Check for file changes");
+            var response = new XMLHttpRequest();
+            response.open("GET", "api/hash", true);
+            response.onload = function() {
+              if (response.status === 200) {
+                if (!hash) {
+                  console.log("Set initial hash")
+                  hash = response.responseText
+                }
+                if (response.responseText !== hash) {
+                  location.reload();
+                }
+              }
+            }
+            response.send(null);
+          }
+          checkForChanges()
+          setInterval(checkForChanges, 1000);
+        JS
+      end
+
+      def self.generate_hash
+        @@hash = SecureRandom.uuid[0..6]
+      end
+    end
+  end
+end

data/lib/server.rb

@@ -1,14 +1,41 @@
-require 'thin'
-require 'listen'
+require "thin"
+require "listen"
+require "io/console"
+
+require_relative "manifest/manifest"
+require_relative "modules/reload"
 
 module Staticz
   class Server
     def initialize
-      puts "Starting server..."
+      Thin::Logging.silent = true
 
       app = Rack::Builder.new do
+        map "/reload.js" do
+          run lambda { |env|
+            [
+              200,
+              {"Content-Type" => "text/plain"},
+              Staticz::Modules::Reload.build_reload_js
+            ]
+          }
+        end
+        map "/api/hash" do
+          run lambda { |env|
+            [
+              200,
+              {"Content-Type" => "text/plain"},
+              Staticz::Modules::Reload.hash
+            ]
+          }
+        end
         map "/" do
           use Rack::Static, urls: {"/" => "build/index.html"}
+
+          Staticz::Server.all_haml(Staticz::Manifest.instance.elements).each do |e|
+            use Rack::Static, urls: {"/#{e.name}" => e.build_path}
+          end
+
           run Rack::Directory.new("build")
         end
       end
@@ -16,28 +43,50 @@ module Staticz
       thin_server = Thin::Server.new '127.0.0.1', 3000
       thin_server.app = app
 
-      puts "Building..."
-      Staticz::Builder.new
+      build_manifest
 
       Thread.new { listen_to_file_changes }
       thin_server.start
     end
 
+    def self.all_haml(elements)
+      elements.map do |e|
+        if e.is_a? Staticz::Compilable::Haml
+          e
+        elsif e.is_a? Staticz::Sub
+          all_haml(e.elements)
+        end
+      end.flatten.select do |e|
+        e
+      end
+    end
+
     private
 
     def listen_to_file_changes
-      listener = Listen.to('src') do |modified, added, removed|
+      folders = ["src"]
+      folders << "lib" if Dir.exist? "lib"
+
+      listener = Listen.to(*folders) do |modified, added, removed|
         file_names = (modified + added + removed)
           .map do |file|
-            file.gsub "#{Dir.pwd}/src/", ""
+            file.gsub "#{Dir.pwd}/", ""
           end
           .join(", ")
 
+        $stdout.clear_screen
         puts "#{file_names} changed, rebuilding..."
-        Builder.new
+        build_manifest
         puts "Rebuilding successful"
       end
       listener.start
     end
+
+    def build_manifest
+      Staticz::Modules::Reload.generate_hash
+
+      Staticz::Builder.new
+      Staticz::Manifest.instance.print
+    end
   end
 end

data/lib/settings.rb

@@ -0,0 +1,19 @@
+module Staticz
+  class Settings
+    def self.development!
+      @@env = :development
+    end
+
+    def self.development?
+      @@env == :development
+    end
+
+    def self.production!
+      @@env = :production
+    end
+
+    def self.production?
+      @@env == :production
+    end
+  end
+end

data/lib/staticz.rb

@@ -1,9 +1,9 @@
-require_relative 'manifest/manifest'
-require_relative 'template'
-require_relative 'server'
-require_relative 'builder'
-require_relative 'helpers'
-require_relative 'colors'
+require_relative "template"
+require_relative "server"
+require_relative "builder"
+require_relative "settings"
+require_relative "utils/colors"
+require_relative "utils/helpers"
 
 module Staticz
   def self.init
@@ -24,11 +24,13 @@ module Staticz
         puts usage
       end
     when 'server'
+      Staticz::Settings.development!
       Staticz::Server.new
     when 'manifest'
       load "#{Dir.pwd}/manifest.rb"
       Staticz::Manifest.instance.print
     when 'build'
+      Staticz::Settings.production!
       Staticz::Builder.new
     else
       puts usage

data/lib/template/src/template.haml

@@ -15,6 +15,8 @@
     %meta{property: "og:title", content: "App created with staticz"}
 
     = stylesheet css_main_path
+
+    = reload_js
   %body
     = render :nav
     = capture_haml(&block)

data/lib/{helpers.rb → utils/helpers.rb}

@@ -25,6 +25,10 @@ def javascript(path)
   "<script src=\"#{path}\"></script>"
 end
 
+def inline_svg(source_path)
+  File.read("src/#{source_path}")
+end
+
 def react(*component_file_paths)
   lines = [
     "<script crossorigin src=\"https://unpkg.com/react@18/umd/react.development.js\"></script>",
@@ -53,3 +57,7 @@ end
 def react_component(name, css_class = nil)
   "<div data-component=\"#{name}\" class=\"#{css_class}\"></div>"
 end
+
+def reload_js
+  "<script src=\"reload.js\" defer></script>" if Staticz::Settings.development?
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staticz
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - Philipp Schlesinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-17 00:00:00.000000000 Z
+date: 2022-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -119,18 +119,20 @@ extra_rdoc_files: []
 files:
 - bin/staticz
 - lib/builder.rb
-- lib/colors.rb
-- lib/helpers.rb
 - lib/manifest/compilable.rb
-- lib/manifest/cs.rb
-- lib/manifest/haml.rb
-- lib/manifest/js.rb
+- lib/manifest/compilable/cs.rb
+- lib/manifest/compilable/haml.rb
+- lib/manifest/compilable/js.rb
+- lib/manifest/compilable/react.rb
+- lib/manifest/compilable/sass.rb
+- lib/manifest/compilable/scss.rb
+- lib/manifest/compilable/simple_file.rb
 - lib/manifest/manifest.rb
-- lib/manifest/react.rb
-- lib/manifest/sass.rb
-- lib/manifest/scss.rb
 - lib/manifest/sub.rb
+- lib/modules/lib_loader.rb
+- lib/modules/reload.rb
 - lib/server.rb
+- lib/settings.rb
 - lib/staticz.rb
 - lib/template.rb
 - lib/template/manifest.rb
@@ -139,6 +141,8 @@ files:
 - lib/template/src/index.haml
 - lib/template/src/nav.haml
 - lib/template/src/template.haml
+- lib/utils/colors.rb
+- lib/utils/helpers.rb
 homepage: http://rubygems.org/gems/staticz
 licenses:
 - MIT

data/lib/manifest/cs.rb

@@ -1,27 +0,0 @@
-require 'coffee-script'
-
-module Staticz
-  class Cs
-    include Compilable
-
-    attr_reader :name
-
-    def source_file_ending = "coffee"
-
-    def build_file_ending = "js"
-
-    def tile_type_name = "Coff"
-
-    def initialize(name)
-      @name = name
-    end
-
-    def build
-      if exists?
-        js = CoffeeScript.compile File.read(source_path)
-
-        File.write build_path, js
-      end
-    end
-  end
-end

data/lib/manifest/haml.rb

@@ -1,25 +0,0 @@
-module Staticz
-  class Haml
-    include Compilable
-
-    attr_reader :name
-
-    def source_file_ending = "haml"
-
-    def build_file_ending = "html"
-
-    def tile_type_name = "Haml"
-
-    def initialize(name)
-      @name = name
-    end
-
-    def build
-      if exists?
-        engine = ::Haml::Engine.new(File.read(source_path))
-
-        File.write build_path, engine.render
-      end
-    end
-  end
-end

data/lib/manifest/js.rb

@@ -1,23 +0,0 @@
-module Staticz
-  class Js
-    include Compilable
-
-    attr_reader :name
-
-    def source_file_ending = "js"
-
-    def build_file_ending = "js"
-
-    def tile_type_name = "Js"
-
-    def initialize(name)
-      @name = name
-    end
-
-    def build
-      if exists?
-        File.write build_path, File.read(source_path)
-      end
-    end
-  end
-end

data/lib/manifest/react.rb

@@ -1,27 +0,0 @@
-require 'babel/transpiler'
-
-module Staticz
-  class React
-    include Compilable
-
-    attr_reader :name
-
-    def source_file_ending = "js"
-
-    def build_file_ending = "js"
-
-    def tile_type_name = "React"
-
-    def initialize(name)
-      @name = name
-    end
-
-    def build
-      if exists?
-        engine = Babel::Transpiler.transform File.read(source_path)
-
-        File.write build_path, engine["code"]
-      end
-    end
-  end
-end

data/lib/manifest/sass.rb

@@ -1,27 +0,0 @@
-require 'sassc'
-
-module Staticz
-  class Sass
-    include Compilable
-
-    attr_reader :name
-
-    def source_file_ending = "sass"
-
-    def build_file_ending = "css"
-
-    def tile_type_name = "Sass"
-
-    def initialize(name)
-      @name = name
-    end
-
-    def build
-      if exists?
-        engine = ::SassC::Engine.new(File.read(source_path), syntax: :sass, style: :compressed)
-
-        File.write build_path, engine.render
-      end
-    end
-  end
-end

data/lib/manifest/scss.rb

@@ -1,27 +0,0 @@
-require 'sassc'
-
-module Staticz
-  class Scss
-    include Compilable
-
-    attr_reader :name
-
-    def source_file_ending = "scss"
-
-    def build_file_ending = "css"
-
-    def tile_type_name = "Scss"
-
-    def initialize(name)
-      @name = name
-    end
-
-    def build
-      if exists?
-        engine = ::SassC::Engine.new(File.read(source_path), syntax: :scss, style: :compressed)
-
-        File.write build_path, engine.render
-      end
-    end
-  end
-end