staticz 1.0.7 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18903b9d06f2c505eae4c6e385461a6c82562a0c527d2cfb4474dd58759b1413
-  data.tar.gz: d14b7be4560eeaadab43aa4749cf63c50fb60f1f27cef7e0d96d3fd052e837e5
+  metadata.gz: a80ecb49f81917fbaaf10fabec468748de38f060525fe63826c9b24f6f40fe7e
+  data.tar.gz: d0d42fa919ad0e332a6b310a855ec72af64786401e32825f52ace50303ba08f7
 SHA512:
-  metadata.gz: 32741ea3f2b95ada6ef444fa4db52ee92323bb5bfe82c2bf8ea510c678f77dae199920487eda5770947510f672e739d523e165e25857a71433a48db7c01ca79d
-  data.tar.gz: d110fd34a052eb8b551caeb080840909a32eaa9a8baf218ad37204b705a4dcb8501e840300ac7657d575a7026a629b371a289a180cf45a531cda8b5bba3c732a
+  metadata.gz: 6b9956372490bdd8bb44ff5533c05e107f9d5997ccf8b42186037dc4dc4e475b55972712c613cc88de3e208999d5ee985f152d215f774d3b43d907c4e43b6738
+  data.tar.gz: 104e0a387444c5e8e962936fce024bf416389bc8b4e1a118473827bc6765f1d164511cd9d5ebe313405ac7150e8c09a8e420776e7f2b47162c7d5647a86c9f25

data/lib/manifest/compilable/cs.rb

@@ -8,11 +8,7 @@ module Staticz
 
       attr_reader :name
 
-      def source_file_ending = "coffee"
-
-      def build_file_ending = "js"
-
-      def tile_type_name = "Coff"
+      compile "coffee", "js", "Coff"
 
       def initialize(name)
         @name = name
@@ -20,11 +16,13 @@ module Staticz
 
       def build
         if exists?
-          js = CoffeeScript.compile File.read(source_path)
-
-          File.write build_path, js
+          File.write build_path, render
         end
       end
+
+      def render
+        CoffeeScript.compile File.read(source_path)
+      end
     end
   end
 end

data/lib/manifest/compilable/haml.rb

@@ -8,11 +8,7 @@ module Staticz
 
       attr_reader :name
 
-      def source_file_ending = "haml"
-
-      def build_file_ending = "html"
-
-      def tile_type_name = "Haml"
+      compile "haml", "html", "Haml"
 
       def initialize(name)
         @name = name

data/lib/manifest/compilable/js.rb

@@ -7,11 +7,7 @@ module Staticz
 
       attr_reader :name
 
-      def source_file_ending = "js"
-
-      def build_file_ending = "js"
-
-      def tile_type_name = "Js"
+      compile "js", "js", "Js"
 
       def initialize(name)
         @name = name
@@ -19,9 +15,13 @@ module Staticz
 
       def build
         if exists?
-          File.write build_path, File.read(source_path)
+          File.write build_path, render
         end
       end
+
+      def render
+        File.read(source_path)
+      end
     end
   end
 end

data/lib/manifest/compilable/react.rb

@@ -8,11 +8,7 @@ module Staticz
 
       attr_reader :name
 
-      def source_file_ending = "js"
-
-      def build_file_ending = "js"
-
-      def tile_type_name = "React"
+      compile "js", "js", "React"
 
       def initialize(name)
         @name = name
@@ -20,11 +16,13 @@ module Staticz
 
       def build
         if exists?
-          engine = Babel::Transpiler.transform File.read(source_path)
-
-          File.write build_path, engine["code"]
+          File.write build_path, render
         end
       end
+
+      def render
+        Babel::Transpiler.transform(File.read(source_path))["code"]
+      end
     end
   end
 end

data/lib/manifest/compilable/sass.rb

@@ -8,11 +8,7 @@ module Staticz
 
       attr_reader :name
 
-      def source_file_ending = "sass"
-
-      def build_file_ending = "css"
-
-      def tile_type_name = "Sass"
+      compile "sass", "css", "Sass"
 
       def initialize(name)
         @name = name
@@ -20,12 +16,14 @@ module Staticz
 
       def build
         if valid?
-          engine = ::SassC::Engine.new(File.read(source_path), syntax: :sass, style: :compressed)
-
-          File.write build_path, engine.render
+          File.write build_path, render
         end
       end
 
+      def render
+        ::SassC::Engine.new(File.read(source_path), syntax: :sass, style: :compressed).render
+      end
+
       def errors
         errors = super
 

data/lib/manifest/compilable/scss.rb

@@ -8,11 +8,7 @@ module Staticz
 
       attr_reader :name
 
-      def source_file_ending = "scss"
-
-      def build_file_ending = "css"
-
-      def tile_type_name = "Scss"
+      compile "scss", "css", "Scss"
 
       def initialize(name)
         @name = name
@@ -20,12 +16,14 @@ module Staticz
 
       def build
         if valid?
-          engine = ::SassC::Engine.new(File.read(source_path), syntax: :scss, style: :compressed)
-
-          File.write build_path, engine.render
+          File.write build_path, render
         end
       end
 
+      def render
+        ::SassC::Engine.new(File.read(source_path), syntax: :scss, style: :compressed).render
+      end
+
       def errors
         errors = super
 

data/lib/manifest/compilable/simple_file.rb

@@ -5,6 +5,8 @@ module Staticz
     class SimpleFile
       include Compilable
 
+      compile "", "", "File"
+
       attr_reader :name
 
       def source_path
@@ -16,14 +18,10 @@ module Staticz
       end
 
       def create_link_function
+        link_path = "/#{name}"
+        Object.send(:define_method, path_method_name) { link_path }
       end
 
-      def path_method_name
-        "no path created"
-      end
-
-      def tile_type_name = "File"
-
       def initialize(name)
         @name = name
       end

data/lib/manifest/compilable.rb

@@ -2,6 +2,25 @@ require "io/console"
 
 module Staticz
   module Compilable
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+    module ClassMethods
+      def compile(source_file_ending, build_file_ending, file_type_name)
+        define_method :source_file_ending do
+          source_file_ending
+        end
+
+        define_method :build_file_ending do
+          build_file_ending
+        end
+
+        define_method :file_type_name do
+          file_type_name
+        end
+      end
+    end
+
     def path
       name.to_s
     end
@@ -19,7 +38,7 @@ module Staticz
     end
 
     def path_method_name
-      "#{path.gsub(/[\/-]/, "_")}_path"
+      "#{path.gsub(/[.\/-]/, "_")}_path"
     end
 
     def valid?
@@ -35,18 +54,28 @@ module Staticz
     end
 
     def create_link_function
-      link_path = "#{name}.#{build_file_ending}"
-      Object.send(:define_method, path_method_name) { link_path }
+      link_path = "/#{name}.#{build_file_ending}"
+      shortened_link_path = "/#{name}"
+      Object.send(:define_method, path_method_name) do |shorten: false|
+        if shorten
+          shortened_link_path
+        else
+          link_path
+        end
+      end
     end
 
-    def print(indentation)
+    def print(indentation, *args)
       valid_symbol = if valid?
         Colors.in_green("✔")
       else
         Colors.in_red("✘")
       end
 
-      puts "#{" " * (indentation * 3)}└─ #{tile_type_name}: #{path} #{valid_symbol} -> #{path_method_name}"
+      compilable_string = "#{" " * (indentation * 3)}└─ #{file_type_name}: #{path} #{valid_symbol}"
+      compilable_string << " -> #{path_method_name}" if !args.include? :no_path
+
+      puts compilable_string
 
       _height, width = IO.console.winsize
 

data/lib/manifest/css_bundle.rb

@@ -0,0 +1,81 @@
+require_relative "sub"
+
+module Staticz
+  class CSSBundle
+    attr_reader :name, :location, :elements
+
+    def initialize(name, location)
+      @name = name
+      @location = location
+      @elements = []
+    end
+
+    def sub(name, &block)
+      s = Staticz::Sub.new(generate_location_path(name))
+      elements.push(s)
+      s.instance_eval(&block)
+    end
+
+    def sass(name, &block)
+      elements.push(Staticz::Compilable::Sass.new(generate_location_path(name)))
+    end
+
+    def scss(name, &block)
+      elements.push(Staticz::Compilable::Scss.new(generate_location_path(name)))
+    end
+
+    def generate_location_path(name)
+      if location.empty?
+        name
+      else
+        "#{location}/#{name}"
+      end
+    end
+
+    def build
+      File.write "build/#{name}_bundle.css", render
+    end
+
+    def render
+      render_elements elements
+    end
+
+    def render_elements(elements)
+      elements
+        .map do |element|
+          if element.is_a? Staticz::Sub
+            render_elements element.elements
+          else
+            [
+              "/* #{element.name} */",
+              element.render
+            ].join("\n\n")
+          end
+        end
+        .join("\n\n")
+    end
+
+    def path_method_name
+      "#{name.to_s.gsub(/[.\/-]/, "_")}_css_bundle_path"
+    end
+
+    def create_link_function
+      link_path = "/#{name}_bundle.css"
+
+      Object.send(:define_method, path_method_name) do
+        link_path
+      end
+    end
+
+    def print(indentation)
+      puts "#{" " * (indentation * 3)}└─ CSSBundle: #{name} -> #{path_method_name}"
+      elements.each do |e|
+        e.print(indentation + 1, :no_path)
+      end
+    end
+
+    def path
+      "src/#{name}"
+    end
+  end
+end

data/lib/manifest/js_bundle.rb

@@ -0,0 +1,85 @@
+require_relative "sub"
+
+module Staticz
+  class JSBundle
+    attr_reader :name, :location, :elements
+
+    def initialize(name, location)
+      @name = name
+      @location = location
+      @elements = []
+    end
+
+    def sub(name, &block)
+      s = Staticz::Sub.new(generate_location_path(name))
+      elements.push(s)
+      s.instance_eval(&block)
+    end
+
+    def js(name, &block)
+      elements.push(Staticz::Compilable::Js.new(generate_location_path(name)))
+    end
+
+    def coffee(name, &block)
+      elements.push(Staticz::Compilable::Cs.new(generate_location_path(name)))
+    end
+
+    def react(name, &block)
+      elements.push(Staticz::Compilable::React.new(generate_location_path(name)))
+    end
+
+    def generate_location_path(name)
+      if location.empty?
+        name
+      else
+        "#{location}/#{name}"
+      end
+    end
+
+    def build
+      File.write "build/#{name}_bundle.js", render
+    end
+
+    def render
+      render_elements elements
+    end
+
+    def render_elements(elements)
+      elements
+        .map do |element|
+          if element.is_a? Staticz::Sub
+            render_elements element.elements
+          else
+            [
+              "// #{element.name}",
+              element.render
+            ].join("\n\n")
+          end
+        end
+        .join("\n\n")
+    end
+
+    def path_method_name
+      "#{name.to_s.gsub(/[.\/-]/, "_")}_js_bundle_path"
+    end
+
+    def create_link_function
+      link_path = "/#{name}_bundle.js"
+
+      Object.send(:define_method, path_method_name) do
+        link_path
+      end
+    end
+
+    def print(indentation)
+      puts "#{" " * (indentation * 3)}└─ JSBundle: #{name} -> #{path_method_name}"
+      elements.each do |e|
+        e.print(indentation + 1, :no_path)
+      end
+    end
+
+    def path
+      "src/#{name}"
+    end
+  end
+end

data/lib/manifest/manifest.rb

@@ -7,6 +7,8 @@ require_relative "compilable/react"
 require_relative "compilable/sass"
 require_relative "compilable/scss"
 require_relative "compilable/simple_file"
+require_relative "js_bundle"
+require_relative "css_bundle"
 
 module Staticz
   class Manifest
@@ -53,15 +55,33 @@ module Staticz
       elements.push(Staticz::Compilable::SimpleFile.new(name))
     end
 
+    def js_bundle(name, &block)
+      s = Staticz::JSBundle.new(name, "")
+      elements.push(s)
+
+      s.instance_eval(&block)
+    end
+
+    def css_bundle(name, &block)
+      s = Staticz::CSSBundle.new(name, "")
+      elements.push(s)
+
+      s.instance_eval(&block)
+    end
+
     def build
       load "#{Dir.pwd}/manifest.rb"
 
+      create_link_functions
+
       elements.each do |e|
-        e.create_link_function
+        e.build
       end
+    end
 
+    def create_link_functions
       elements.each do |e|
-        e.build
+        e.create_link_function
       end
     end
 

data/lib/manifest/sub.rb

@@ -41,6 +41,20 @@ module Staticz
       elements.push(Staticz::Compilable::SimpleFile.new("#{@name}/#{name}"))
     end
 
+    def js_bundle(name, &block)
+      s = Staticz::JSBundle.new("#{@name}/#{name}", @name)
+      elements.push(s)
+
+      s.instance_eval(&block)
+    end
+
+    def css_bundle(name, &block)
+      s = Staticz::CSSBundle.new("#{@name}/#{name}", @name)
+      elements.push(s)
+
+      s.instance_eval(&block)
+    end
+
     def build
       Dir.mkdir("build/#{name}") if !Dir.exist?("build/#{name}")
 
@@ -55,10 +69,10 @@ module Staticz
       end
     end
 
-    def print(indentation)
+    def print(indentation, *args)
       puts "#{" " * (indentation * 3)}└─ Sub: #{name}"
       elements.each do |e|
-        e.print(indentation + 1)
+        e.print(indentation + 1, *args)
       end
     end
 

data/lib/server.rb

@@ -46,6 +46,7 @@ module Staticz
       build_manifest
 
       Thread.new { listen_to_file_changes }
+      Thread.new { listen_to_manifest_changes }
       thin_server.start
     end
 
@@ -68,25 +69,36 @@ module Staticz
       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}/", ""
-          end
-          .join(", ")
+        trigger_rebuild(modified, added, removed)
+      end
+      listener.start
+    end
 
-        $stdout.clear_screen
-        puts "#{file_names} changed, rebuilding..."
-        build_manifest
-        puts "Rebuilding successful"
+    def listen_to_manifest_changes
+      listener = Listen.to("./", only: /^manifest.rb$/) do |modified, added, removed|
+        trigger_rebuild(modified, added, removed)
       end
       listener.start
     end
 
-    def build_manifest
-      Staticz::Modules::Reload.generate_hash
+    def trigger_rebuild(modified, added, removed)
+      file_names = (modified + added + removed)
+        .map do |file|
+          file.gsub "#{Dir.pwd}/", ""
+        end
+        .join(", ")
 
+      $stdout.clear_screen
+      puts "#{file_names} changed, rebuilding..."
+      build_manifest
+      puts "Rebuilding successful"
+    end
+
+    def build_manifest
       Staticz::Builder.new
       Staticz::Manifest.instance.print
+
+      Staticz::Modules::Reload.generate_hash
     end
   end
 end

data/lib/staticz.rb

@@ -27,7 +27,12 @@ module Staticz
       Staticz::Settings.development!
       Staticz::Server.new
     when 'manifest'
+      Staticz::Settings.development!
+
       load "#{Dir.pwd}/manifest.rb"
+      Staticz::Modules::LibLoader.load_files
+      Staticz::Manifest.instance.create_link_functions
+
       Staticz::Manifest.instance.print
     when 'build'
       Staticz::Settings.production!

data/lib/utils/helpers.rb

@@ -4,7 +4,7 @@ def render(component, locals: {}, &block)
   if block
     engine.render(Object.new, locals, &block)
   else
-    engine.render
+    engine.render(Object.new, locals)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staticz
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.11
 platform: ruby
 authors:
 - Philipp Schlesinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -127,6 +127,8 @@ files:
 - lib/manifest/compilable/sass.rb
 - lib/manifest/compilable/scss.rb
 - lib/manifest/compilable/simple_file.rb
+- lib/manifest/css_bundle.rb
+- lib/manifest/js_bundle.rb
 - lib/manifest/manifest.rb
 - lib/manifest/sub.rb
 - lib/modules/lib_loader.rb
@@ -165,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Static website compiler