heartml 1.0.0.beta4 → 1.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76684cce6c5e1c52ce68f4b0b0770a60377aefc908ce38c469ee540b576eac8d
-  data.tar.gz: 388c37ecfc4829cbe1c0635ff301d4957b8eca52b6f75603d83b9184c36accc8
+  metadata.gz: c09bc70bc5761750cc99010a62b106ff435e0f0ee9f72a259d62631c8913785c
+  data.tar.gz: 44bb47fca2eb847d2e6636ae99eb8446d32b488702a6c8e5dc57d39d571bf076
 SHA512:
-  metadata.gz: 531c6b5411396f98d55ef33e3b2f8abb8c12fabd251c9fdfc2bfed032d36f188fc9d5f5721c7262bdb8adaa1e63c94f4744e1a4b5354f895579a97f359013406
-  data.tar.gz: dd55039932a06904f0fd911b9d3d2ddca7ee696fd3a085a5a3e931bac7ec1b31d9004092cacf9ea02b8b4048b463eed35480d68f563e01cf8778bcbd1f057afa
+  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,14 @@
 ## [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
+- Add fragment error handling
+
 ## [1.0.0.beta4] - 2023-08-27
 
 - Refactor and improve Bridgetown plugin and simplify context handling for template rendering

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heartml (1.0.0.beta4)
+    heartml (1.0.0.beta6)
       concurrent-ruby (~> 1.2)
       nokolexbor (>= 0.4.2)
 
@@ -38,7 +38,9 @@ GEM
       racc (~> 1.4)
     nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
+    nokolexbor (0.5.0)
     nokolexbor (0.5.0-arm64-darwin)
+    nokolexbor (0.5.0-x86_64-linux)
     parallel (1.22.1)
     parser (3.2.2.0)
       ast (~> 2.4.1)

data/lib/heartml/fragment.rb

@@ -38,7 +38,7 @@ module Heartml
 
             params.each do |param|
               new_key, v2 = param.split(":").map(&:strip)
-              v2 = new_key unless v2
+              v2 ||= new_key
 
               new_attrs[new_key] = @component.evaluate_attribute_expression(attr, v2)
             end
@@ -82,7 +82,7 @@ module Heartml
           break unless attribute_binding.method.(attribute: attr_node, node: node)
         end
       rescue Exception => e # rubocop:disable Lint/RescueException
-        line_segments = [@component.class.heart_module, @component.class.line_number_of_node(attr_node)]
+        line_segments = [@component.class.heart_module, @component._line_number_of_node(attr_node)]
         raise e.class, e.message.lines.first, [line_segments.join(":"), *e.backtrace]
       end
     end

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.beta4"
+  VERSION = "1.0.0.beta6"
 end

data/lib/heartml.rb

@@ -54,9 +54,13 @@ module Heartml
     klass.attribute_binding "server-unsafe-eval", :_server_replace_binding
 
     # Don't stomp on a superclass's `content` method
-    return if klass.instance_methods.include?(:content)
+    has_content_method = begin
+      klass.instance_method(:content)
+    rescue NameError
+      false
+    end
 
-    klass.include ContentMethod
+    klass.include ContentMethod unless has_content_method
   end
 
   # Extends the component class
@@ -124,10 +128,8 @@ module Heartml
       end
     end
 
-    def line_number_of_node(node)
-      loc = node.source_location
-      instance_variable_get(:@doc_html)[0..loc].count("\n") + 1
-    end
+    # @return [String]
+    def doc_html = @doc_html
 
     def attribute_bindings = @attribute_bindings ||= []
 
@@ -175,6 +177,7 @@ module Heartml
   # @param content [String, Nokolexbor::Element]
   def render_element(attributes: self.attributes, content: self.content, context: self.context) # rubocop:disable Metrics
     doc = self.class.doc.clone
+    @doc_html ||= self.class.doc_html # keep a spare copy for determining error line number
     @_content = content
     @context = context
 
@@ -305,7 +308,7 @@ module Heartml
     _context_locals.keys.reverse_each do |name|
       eval_code = "#{name} = _context_locals[\"#{name}\"];" + eval_code
     end
-    instance_eval(eval_code, self.class.heart_module, self.class.line_number_of_node(attribute))
+    instance_eval(eval_code, self.class.heart_module, _line_number_of_node(attribute))
   end
 
   def class_list_for(obj)
@@ -320,6 +323,11 @@ module Heartml
     end.join(" ")
   end
 
+  def _line_number_of_node(node)
+    loc = node.source_location
+    instance_variable_get(:@doc_html)[0..loc].count("\n") + 1
+  end
+
   def _context_nodes = @_context_nodes ||= []
 
   def _context_locals = @_context_locals ||= {}
@@ -376,12 +384,8 @@ module Heartml
       "eval"
     end
 
-    def self.line_number_of_node(_node)
-      # FIXME: this should actually work!
-      0
-    end
-
     def initialize(body:, context:) # rubocop:disable Lint/MissingSuper
+      @doc_html = body.is_a?(String) ? body : body.to_html
       @body = body.is_a?(String) ? Nokolexbor::DocumentFragment.parse(body) : body
       @context = context
     end

metadata

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