mayu-live 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f819e4512b624c496e60ad22b2461db0ed9afbe13b2b5b528358266dd83cbe7
-  data.tar.gz: 4185727d1855c3eb019d27c0f2ab82d17d2941d3b8101043cb55d6fa9d31d350
+  metadata.gz: d60c146397cbe38cfc7e659f0681d90e6bbac5e278ba95a60527ff8f66ba1280
+  data.tar.gz: d4f35ae4cdfa457b9ac1bca877626b8e045a870cfb723699bae500a54293938a
 SHA512:
-  metadata.gz: 314a09735d9870f64c4ce7635ff072281c87e11dc6414786957188158f047e70bef8757b5bb9bc038b0de7a4d298e5f4ea1a0fecd3ffeb485fc01c6b1f4ac54a
-  data.tar.gz: 3ec46f730741fcb7d6918b3a997704a298eef23572e3ffcf57903f97c2809bf82591bec9d70da4f33f0f9ce992bcc802a55df626dcc1ae1f7e83c57cba64466e
+  metadata.gz: dbf52fb2fe61b49ffef476d8ce75edc96904d7f0a9372f3ee2949137068f1932db51b502e254de932cb06dbdd6f2057152057b780d2774a2ce4c53743be5624c
+  data.tar.gz: a33c40fb0f20f7643979e5486ad2c83c1798d2ce042511bb3d143cf127f8a822b3ab7da3f8ac94df968a2c0de559e20cd28680299c9410d3d113d4aea032c179

data/exe/mayu

@@ -23,10 +23,6 @@ else
   puts "\e[2mYJIT is not supported!\e[0m"
 end
 
-if RubyVM::MJIT.enabled?
-  puts "\e[1mMJIT is enabled!\e[0m"
-end
-
 require "mayu/banner"
 require "mayu/commands"
 

data/lib/mayu/commands.rb

@@ -16,6 +16,10 @@ module Mayu
 
       case argv
       in ["dev", *rest]
+        # Initialize RMagick on start to avoid the following error:
+        #   objc[88493]: +[__NSCFConstantString initialize] may have been in progress in another thread when fork() was called.
+        #   We cannot safely call it or ignore it in the fork() child process. Crashing instead.
+        require "rmagick"
         require_relative "server"
         Server.start(load_config(:dev))
       in ["devbundle", *rest]

data/lib/mayu/resources/generators/image.rb

@@ -27,78 +27,18 @@ module Mayu
         def process(target_path)
           return if File.exist?(target_path)
 
+          require "rmagick"
+
           Console.logger.info(
             self,
             "Generating #{target_path} from #{@source_path}"
           )
 
-          case @version.format
-          when :webp
-            convert_webp(
-              source_path: @source_path,
-              quality: 80, # typical quality,
-              width: @version.width,
-              target_path: target_path
-            )
-          else
-            convert_generic(
-              source_path: @source_path,
-              quality: 80, # typical quality,
-              width: @version.width,
-              target_path: target_path
-            )
-          end
-        end
-
-        private
-
-        sig do
-          params(
-            source_path: String,
-            quality: Integer,
-            width: Integer,
-            target_path: String
-          ).void
-        end
-        def convert_webp(source_path:, quality:, width:, target_path:)
-          system(
-            Shellwords.shelljoin(
-              [
-                "cwebp",
-                "-q",
-                "#{quality}",
-                "-resize",
-                "#{width}",
-                "0",
-                source_path,
-                "-o",
-                target_path
-              ]
-            ) + " 2> /dev/null"
-          ) or raise "Could not generate #{target_path} from #{source_path}"
-        end
-
-        sig do
-          params(
-            source_path: String,
-            quality: Integer,
-            width: Integer,
-            target_path: String
-          ).void
-        end
-        def convert_generic(source_path:, quality:, width:, target_path:)
-          system(
-            Shellwords.shelljoin(
-              [
-                "convert",
-                source_path,
-                "-adaptive-resize",
-                "#{width}",
-                "-strip",
-                target_path
-              ]
-            ) + " 2> /dev/null"
-          ) or raise "Could not generate #{target_path} from #{source_path}"
+          Magick::Image
+            .read(@source_path)
+            .first
+            .resize_to_fit(@version.width)
+            .write(target_path) { |options| options.quality = 80 }
         end
       end
     end

data/lib/mayu/resources/transformers/__test__/haml/css.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 Self =
   setup_component(
-    assets: ["rKxGn-R511h2m1nlvs18PwsPwrzW-iGCNVojf-x0LRg=.css"],
+    assets: ["Cd9Qx4lhkbeZyruovAokW1FL3tHSmMOxOc-2y1h7Zvc=.css"],
     styles: {
       button: "app/components/MyComponent.button?dhhHwAZl"
     }

data/lib/mayu/resources/transformers/css.rb

@@ -41,10 +41,11 @@ module Mayu
           params(
             source: String,
             source_path: String,
-            source_line: Integer
+            source_line: Integer,
+            minify: T::Boolean
           ).returns(TransformResult)
         end
-        def self.transform(source:, source_path:, source_line: 1)
+        def self.transform(source:, source_path:, source_line: 1, minify: true)
           # Required here because it's not necessary in production..
           # kinda messy. need to rewrite the entire "resources" thing...
           require "mayu/css"
@@ -55,7 +56,8 @@ module Mayu
               File.basename(source_path, ".*")
             ).delete_prefix("./")
 
-          result = Mayu::CSS.transform(source_path_without_extension, source)
+          result =
+            Mayu::CSS.transform(source_path_without_extension, source, minify:)
 
           output = result.code.encode("utf-8")
 
@@ -94,9 +96,9 @@ module Mayu
 
         sig do
           params(
-            classes: T::Hash[String, String],
-            elements: T::Hash[String, String],
-            exports: T::Hash[Symbol, T.untyped]
+            classes: T::Hash[Symbol, String],
+            elements: T::Hash[Symbol, String],
+            exports: T::Hash[String, T.untyped]
           ).returns(T::Hash[Symbol, String])
         end
         def self.join_classes(classes, elements, exports)
@@ -113,19 +115,18 @@ module Mayu
         sig do
           params(
             klass: String,
-            exports: T::Hash[Symbol, T.untyped],
-            classes: T::Hash[String, String]
+            exports: T::Hash[String, T.untyped],
+            classes: T::Hash[Symbol, String]
           ).returns(String)
         end
         def self.join_class(klass, exports, classes)
-          case exports[klass.to_sym]
-          in composes:
+          if composes = exports[klass]&.composes
             [
               klass,
-              *composes.map do
-                case _1
-                in { type: "local", name: }
-                  classes[name]
+              *composes.map do |compose|
+                case compose
+                in Mayu::CSS::ComposeLocal
+                  classes[compose.name.to_sym]
                 end
               end
             ].join(" ")

data/lib/mayu/resources/transformers/haml.rb

@@ -3,6 +3,7 @@
 
 require "ripper"
 require "syntax_suggest"
+require "syntax_suggest/api"
 require "syntax_suggest/code_line"
 require "syntax_suggest/explain_syntax"
 require "syntax_suggest/lex_all"

data/lib/mayu/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Mayu
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/mayu-live.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.homepage = "https://mayu.live/"
   spec.license = "AGPL-3.0"
-  spec.required_ruby_version = ">= 3.2.0"
+  spec.required_ruby_version = ">= 3.3.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/mayu-live/framework"
@@ -43,15 +43,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Core dependencies
-  spec.add_dependency "async", "~> 2.3.0"
+  spec.add_dependency "async", "~> 2.8.0"
   spec.add_dependency "async-container", "~> 0.16.12"
-  spec.add_dependency "async-http", "~> 0.59.4"
+  spec.add_dependency "async-http", "~> 0.61.0"
   spec.add_dependency "brotli", "~> 0.4.0"
   spec.add_dependency "mime-types", "~> 3.4.1"
   spec.add_dependency "msgpack", "~> 1.6.0"
   spec.add_dependency "nanoid", "~> 2.0.0"
   spec.add_dependency "prometheus-client", "~> 4.0.0"
-  spec.add_dependency "protocol-http", "~> 0.23.12"
+  spec.add_dependency "protocol-http", "~> 0.25.0"
   spec.add_dependency "pry", "~> 0.14.2"
   spec.add_dependency "rack", ">= 3.0.4.1", "< 3.0.9.0"
   spec.add_dependency "rake", "~> 13.0.6"
@@ -68,9 +68,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "image_size", "~> 3.2.0"
   spec.add_dependency "kramdown", "~> 2.4.0"
   spec.add_dependency "rouge", "~> 4.0.0"
-  spec.add_dependency "mayu-css", "~> 0.0.3"
+  spec.add_dependency "mayu-css", "~> 0.1.2"
+  spec.add_dependency "rmagick", "~> 5.3.0"
   spec.add_dependency "source_map", "~> 3.0.1"
   spec.add_dependency "syntax_tree", "~> 5.3.0"
   spec.add_dependency "syntax_tree-haml", "~> 3.0.0"
   spec.add_dependency "syntax_tree-xml", "~> 0.1.0"
+  spec.add_dependency "base64", "~> 0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mayu-live
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Andreas Alin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-10 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.4
+        version: 0.61.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.4
+        version: 0.61.0
 - !ruby/object:Gem::Dependency
   name: brotli
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.12
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.12
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -316,14 +316,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: source_map
   requirement: !ruby/object:Gem::Requirement
@@ -380,6 +394,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: |
   Mayu Live is a live updating server side VirtualDOM framework for Ruby,
   inspired by modern frontend tools that exist in the JavaScript ecosystem.
@@ -597,14 +625,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Server side VDOM framework