heartml 1.0.0.beta5 → 1.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 053e789d42574715a2f4269205a6dfe549a3d4af6970a6f6446b51735a9be340
-  data.tar.gz: cfe795359ca2e951218853f336057d4751bac7e04564bc857808573c3f2e045a
+  metadata.gz: c09bc70bc5761750cc99010a62b106ff435e0f0ee9f72a259d62631c8913785c
+  data.tar.gz: 44bb47fca2eb847d2e6636ae99eb8446d32b488702a6c8e5dc57d39d571bf076
 SHA512:
-  metadata.gz: 36c6248a2b135f2d11b20b054d2a6bf8334460d56fe184a6c4d646e92561c2210e1e3a707975930613ed86091812708888b14d1fbd46f5efefe3befe3aeb3558
-  data.tar.gz: a4241d8e092361148f6ce228c0023007c7e97e650ab4c4336ea12b1f61287f1c1b034eff06f97f6718ae1c400fb82f252197de9205bdd7057058ad382cb56ce6
+  metadata.gz: 3590d652c24107deb627e3f9aa0114411c3077118b38ad54fdf986019ad5b7a4262682ff407b575796085f4a54c2331a7c82a6a95b6941484242ddc838aa17f8
+  data.tar.gz: 4b302508a049f09c1009d126a41f73220e63a3ffe9647f9acb689de3df5e3df0977a05fce48b62683c0e139dcc0ef2136d27ecafe3ca77bcc4cf87a3565b1c2f

data/.rubocop.yml

@@ -18,6 +18,9 @@ Style/Documentation:
 Style/LambdaCall:
   Enabled: false
 
+Style/Lambda:
+  Enabled: false
+
 Style/ParallelAssignment:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [1.0.0.beta6] - 2023-09-06
+
+- Improvements to directives syntax (use lambda argument instead of block)
+
 ## [1.0.0.beta5] - 2023-09-04
 
 - Fix issue with ViewComponent in Rails apps

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heartml (1.0.0.beta5)
+    heartml (1.0.0.beta6)
       concurrent-ruby (~> 1.2)
       nokolexbor (>= 0.4.2)
 

data/lib/heartml/server_effects.rb

@@ -28,9 +28,9 @@ module Heartml
     Nokolexbor::Element.include JSPropertyAliases unless Nokolexbor::Element.instance_methods.include?(:textContent=)
 
     module ClassMethods
-      def directive(name, &block)
+      def directive(name, function)
         @directives ||= {}
-        @directives[name.to_s] = block
+        @directives[name.to_s] = function
       end
     end
 
@@ -45,19 +45,15 @@ module Heartml
       klass.extend ClassMethods
 
       klass.class_eval do
-        directive :show do |_, element, value|
-          element["hidden"] = "" unless value
-        end
+        directive :show, ->(_, node, value) { node["hidden"] = "" unless value }
 
-        directive :hide do |_, element, value|
-          element["hidden"] = "" if value
-        end
+        directive :hide, ->(_, node, value) { node["hidden"] = "" if value }
 
-        directive :classMap do |_, element, obj|
+        directive :classMap, ->(_, node, obj) {
           obj.each do |k, v|
-            element.add_class k.to_s if v
+            node.add_class k.to_s if v
           end
-        end
+        }
       end
     end
 
@@ -70,7 +66,7 @@ module Heartml
       syntax = attribute.value
       statements = syntax.split(";").map(&:strip)
 
-      statements.each do |statement| # rubocop:disable Metrics
+      statements.each do |statement|
         if statement.start_with?("@")
           # property assignment
           expression = statement.split("=").map(&:strip)
@@ -86,13 +82,7 @@ module Heartml
           arg_strs.unshift("@")
 
           if self.class.directives[directive_name.strip[1..]]
-            args = arg_strs.map do |arg_str|
-              next node if arg_str == "@"
-
-              next arg_str[1...-1] if arg_str.start_with?("'") # string literal
-
-              send(arg_str[1..])
-            end
+            args = arg_strs.map { _convert_effect_arg_to_value _1, node }
 
             self.class.directives[directive_name.strip[1..]]&.(self, *args)
           end
@@ -102,13 +92,7 @@ module Heartml
           arg_strs = args_str.split(",").map(&:strip)
           arg_strs.unshift("@")
 
-          args = arg_strs.map do |arg_str|
-            next node if arg_str == "@"
-
-            next arg_str[1...-1] if arg_str.start_with?("'") # string literal
-
-            send(arg_str[1..])
-          end
+          args = arg_strs.map { _convert_effect_arg_to_value _1, node }
 
           send(method_name.strip, *args)
         end
@@ -116,5 +100,17 @@ module Heartml
         attribute.name = "host-effect"
       end
     end
+
+    def _convert_effect_arg_to_value(arg_str, node)
+      return node if arg_str == "@"
+
+      return arg_str[1...-1] if arg_str.start_with?("'") # string literal
+
+      if arg_str.match(/^[0-9]/)
+        return arg_str.include?(".") ? arg_str.to_f : arg_str.to_i
+      end
+
+      send(arg_str[1..])
+    end
   end
 end

data/lib/heartml/version.rb

@@ -2,5 +2,5 @@
 
 module Heartml
   # @return [String]
-  VERSION = "1.0.0.beta5"
+  VERSION = "1.0.0.beta6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heartml
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta5
+  version: 1.0.0.beta6
 platform: ruby
 authors:
 - Jared White
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby