scarpe 0.2.1 → 0.3.0

data/lib/scarpe/wv/rect.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Scarpe::Webview
+  class Rect < Drawable
+    def initialize(properties)
+      super(properties)
+    end
+
+    def element(&block)
+      render("rect", &block)
+    end
+  end
+end

data/lib/scarpe/wv/shape.rb

@@ -1,21 +1,30 @@
 # frozen_string_literal: true
 
-require_relative "shape_helper"
+module Scarpe::Webview
+  class Shape < Drawable
+    def to_html
+      @children ||= []
+      child_markup = @children.map(&:to_html).join
 
-class Scarpe
-  class WebviewShape < Scarpe::WebviewWidget
-    include ShapeHelper
+      color = @draw_context["fill"] || "black"
+      self_markup = HTML.render do |h|
+        h.div(id: html_id, style: style) do
+          h.svg(width: "400", height: "500") do
+            h.path(d: path_from_shape_commands, style: "fill:#{color};stroke-width:2;")
+          end
+        end
+      end
 
-    def initialize(properties)
-      @color = color_for_fill
-      super(properties)
+      # Put child markup first for backward compatibility, but I'm pretty sure this is wrong.
+      child_markup + self_markup
     end
 
     def element(&block)
+      color = @draw_context["fill"] || "black"
       HTML.render do |h|
         h.div(id: html_id, style: style) do
           h.svg(width: "400", height: "500") do
-            h.path(d: shape_path, style: "fill:#{@color};stroke-width:2;")
+            h.path(d: path_from_shape_commands, style: "fill:#{color};stroke-width:2;")
           end
           block.call(h) if block_given?
         end
@@ -24,11 +33,33 @@ class Scarpe
 
     private
 
+    # We have a set of Shoes shape commands, but we need SVG objects like paths.
+    def path_from_shape_commands
+      current_path = ""
+
+      @shape_commands.each do |cmd, *args|
+        case cmd
+        when "move_to"
+          x, y = *args
+          current_path += "M #{x} #{y} "
+        when "line_to"
+          x, y = *args
+          current_path += "L #{x} #{y} "
+        else
+          raise Scarpe::UnknownShapeCommandError, "Unknown shape command! #{cmd.inspect}"
+        end
+      end
+
+      current_path
+    end
+
+    protected
+
     def style
-      {
+      super.merge({
         width: "400",
         height: "900",
-      }
+      })
     end
   end
 end

data/lib/scarpe/wv/slot.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Scarpe::Webview
+  class Slot < Drawable
+    def initialize(properties)
+      @event_callbacks = {}
+
+      super
+    end
+
+    def element(&block)
+      props = shoes_styles.merge("html_attributes" => html_attributes)
+      render_name = self.class.name.split("::")[-1].downcase # usually "stack" or "flow" or "documentroot"
+      render(render_name, props, &block)
+    end
+
+    def set_event_callback(obj, event_name, js_code)
+      event_name = event_name.to_s
+      @event_callbacks[event_name] ||= {}
+      if @event_callbacks[event_name][obj]
+        raise Scarpe::DuplicateCallbackError, "Can't have two callbacks on the same event, from the same object, on the same parent!"
+      end
+
+      @event_callbacks[event_name][obj] = js_code
+
+      update_dom_event(event_name)
+    end
+
+    def remove_event_callback(obj, event_name)
+      event_name = event_name.to_s
+      @event_callbacks[event_name] ||= {}
+      @event_callbacks[event_name].delete(obj)
+
+      update_dom_event(event_name)
+    end
+
+    def remove_event_callbacks(obj)
+      changed = []
+
+      @event_callbacks.each do |event_name, items|
+        changed << event_name if items.delete(obj)
+      end
+
+      changed.each { |event_name| update_dom_event(event_name) }
+    end
+
+    protected
+
+    def update_dom_event(event_name)
+      html_element.set_attribute(event_name, @event_callbacks[event_name].values.join(";"))
+    end
+
+    # These get added for event handlers and passed to Calzini
+    def html_attributes
+      attr = {}
+
+      @event_callbacks.each do |event_name, handlers|
+        attr[event_name] = handlers.values.join(";")
+      end
+
+      attr
+    end
+  end
+end

data/lib/scarpe/wv/span.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class Scarpe
-  class WebviewSpan < Scarpe::WebviewWidget
+module Scarpe::Webview
+  class Span < TextDrawable
     SIZES = {
       inscription: 10,
       ins: 10,
@@ -34,33 +34,11 @@ class Scarpe
     end
 
     def element(&block)
-      HTML.render do |h|
-        h.span(**options, &block)
-      end
+      render("span", &block)
     end
 
     def to_html
       element { @text }
     end
-
-    private
-
-    def options
-      @html_attributes.merge(id: html_id, style: style)
-    end
-
-    def style
-      {
-        "color" => @stroke,
-        "font-size" => font_size,
-        "font-family" => @font,
-      }.compact
-    end
-
-    def font_size
-      font_size = @size.is_a?(Symbol) ? SIZES[@size] : @size
-
-      Dimensions.length(font_size)
-    end
   end
 end

data/lib/scarpe/wv/stack.rb

@@ -1,42 +1,6 @@
 # frozen_string_literal: true
 
-class Scarpe
-  class WebviewStack < Scarpe::WebviewWidget
-    include Scarpe::WebviewBackground
-    include Scarpe::WebviewBorder
-    include Scarpe::WebviewSpacing
-
-    def initialize(properties)
-      super
-    end
-
-    def element(&block)
-      HTML.render do |h|
-        h.div(id: html_id, style: style, &block)
-      end
-    end
-
-    def get_style
-      style
-    end
-
-    private
-
-    def style
-      styles = super
-
-      styles["margin-top"] = @margin_top if @margin_top
-      styles["margin-bottom"] = @margin_bottom if @margin_bottom
-      styles["margin-left"] = @margin_left if @margin_left
-      styles["margin-right"] = @margin_right if @margin_right
-
-      styles[:display] = "flex"
-      styles["flex-direction"] = "column"
-      styles[:width] = Dimensions.length(@width) if @width
-      styles[:height] = Dimensions.length(@height) if @height
-      styles["overflow"] = "auto" if @scroll
-
-      styles
-    end
+module Scarpe::Webview
+  class Stack < Slot
   end
 end

data/lib/scarpe/wv/star.rb

@@ -1,64 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "shape_helper"
-
-class Scarpe
-  class WebviewStar < Scarpe::WebviewWidget
-    include ShapeHelper
+module Scarpe::Webview
+  class Star < Drawable
     def initialize(properties)
       super(properties)
     end
 
     def element(&block)
-      HTML.render do |h|
-        h.div(id: html_id, style: style) do
-          h.svg(width: @outer, height: @outer, style: "fill:#{@color};") do
-            h.polygon(points: star_points, style: "stroke:#{stroke_color};stroke-width:2")
-          end
-          block.call(h) if block_given?
-        end
-      end
-    end
-
-    private
-
-    def style
-      {
-        width: Dimensions.length(@width),
-        height: Dimensions.length(@height),
-      }
-    end
-
-    def star_points
-      get_star_points.join(",")
-    end
-
-    def get_star_points
-      angle = 2 * Math::PI / @points
-      coordinates = []
-
-      @points.times do |i|
-        outer_angle = i * angle
-        inner_angle = outer_angle + angle / 2
-
-        coordinates.concat(get_coordinates(outer_angle, inner_angle))
-      end
-
-      coordinates
-    end
-
-    def get_coordinates(outer_angle, inner_angle)
-      outer_x = @outer / 2 + Math.cos(outer_angle) * @outer / 2
-      outer_y = @outer / 2 + Math.sin(outer_angle) * @outer / 2
-
-      inner_x = @outer / 2 + Math.cos(inner_angle) * @inner / 2
-      inner_y = @outer / 2 + Math.sin(inner_angle) * @inner / 2
-
-      [outer_x, outer_y, inner_x, inner_y]
-    end
-
-    def stroke_color
-      "black"
+      render("star", &block)
     end
   end
 end

data/lib/scarpe/wv/subscription_item.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+class Scarpe::Webview::SubscriptionItem < Scarpe::Webview::Drawable
+  def initialize(properties)
+    super
+
+    bind(@shoes_api_name) do |*args|
+      send_self_event(*args, event_name: @shoes_api_name)
+    end
+
+    @wrangler = Scarpe::Webview::DisplayService.instance.wrangler
+
+    case @shoes_api_name
+    when "animate"
+      frame_rate = (@args[0] || 10)
+      @counter = 0
+      @wrangler.periodic_code("animate_#{@shoes_linkable_id}", 1.0 / frame_rate) do
+        @counter += 1
+        send_self_event(@counter, event_name: @shoes_api_name)
+      end
+    when "every"
+      delay = @args[0]
+      @counter = 0
+      @wrangler.periodic_code("every_#{@shoes_linkable_id}", delay) do
+        @counter += 1
+        send_self_event(@counter, event_name: @shoes_api_name)
+      end
+    when "timer"
+      # JS setTimeout?
+      raise "Implement me!"
+    when "motion", "hover", "leave", "click", "release", "keypress"
+      # Wait for set_parent
+    else
+      raise Scarpe::UnknownShoesEventAPIError, "Unknown Shoes event API: #{@shoes_api_name}!"
+    end
+  end
+
+  def element
+    ""
+  end
+
+  # This will get called once we know the parent, which is useful for events
+  # like hover, where our subscription is likely to depend on what our parent is.
+  def set_parent(new_parent)
+    super
+
+    case @shoes_api_name
+    when "motion"
+      # TODO: what do we do for whole-screen mousemove outside the window?
+      # Those should be set on body, which right now doesn't have a drawable.
+      # TODO: figure out how to handle alt and meta keys - does Shoes3 recognise those?
+      new_parent.set_event_callback(
+        self,
+        "onmousemove",
+        handler_js_code(
+          @shoes_api_name,
+          "arguments[0].x",
+          "arguments[0].y",
+          "arguments[0].ctrlKey",
+          "arguments[0].shiftKey",
+        ),
+      )
+    when "hover"
+      new_parent.set_event_callback(self, "onmouseenter", handler_js_code(@shoes_api_name))
+    when "leave"
+      new_parent.set_event_callback(self, "onmouseleave", handler_js_code(@shoes_api_name))
+    when "click"
+      new_parent.set_event_callback(self, "onclick", handler_js_code(@shoes_api_name, "arguments[0].button", "arguments[0].x", "arguments[0].y"))
+    when "release"
+      new_parent.set_event_callback(self, "onmouseup", handler_js_code(@shoes_api_name, "arguments[0].button", "arguments[0].x", "arguments[0].y"))
+    when "keypress"
+      raise "Implement me!"
+    when "animate", "every", "timer"
+      # These were handled in initialize(), ignore them here
+    else
+      raise Scarpe::UnknownShoesEventAPIError, "Unknown Shoes event API: #{@shoes_api_name}!"
+    end
+  end
+
+  def destroy_self
+    @parent&.remove_event_callbacks(self)
+    super
+  end
+end

data/lib/scarpe/wv/text_drawable.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Scarpe::Webview
+  class TextDrawable < Drawable
+    def to_html
+      # Do not render TextDrawables with individual wrapper divs.
+      element
+    end
+  end
+
+  class << self
+    def default_wv_text_drawable_with(element)
+      webview_class_name = element.capitalize
+      webview_drawable_class = Class.new(Scarpe::Webview::TextDrawable) do
+        def initialize(properties)
+          class_name = self.class.name.split("::")[-1]
+          @html_tag = class_name.delete_prefix("Webview").downcase
+          super
+        end
+
+        def element
+          render(@html_tag) { @content.to_s }
+        end
+      end
+      Scarpe::Webview.const_set webview_class_name, webview_drawable_class
+    end
+  end
+end
+
+Scarpe::Webview.default_wv_text_drawable_with(:code)
+Scarpe::Webview.default_wv_text_drawable_with(:em)
+Scarpe::Webview.default_wv_text_drawable_with(:strong)

data/lib/scarpe/wv/video.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Scarpe::Webview
+  class Video < Drawable
+    SUPPORTED_FORMATS = {
+      "video/mp4" => [".mp4"],
+      "video/webp" => [".webp"],
+      "video/quicktime" => [".mov"],
+      "video/x-matroska" => [".mkv"],
+      # Add more formats and their associated file extensions if needed
+    }.freeze
+    FORMAT_FOR_EXT = {}
+    SUPPORTED_FORMATS.each do |format, extensions|
+      extensions.each do |ext|
+        if FORMAT_FOR_EXT.key?(ext)
+          raise "Internal Scarpe-Webview error! Must have a specific format for each extension!"
+        end
+
+        FORMAT_FOR_EXT[ext] = format
+      end
+    end
+    FORMAT_FOR_EXT.freeze
+
+    def initialize(properties)
+      @url = properties[:url]
+      super
+      @format = FORMAT_FOR_EXT[File.extname(@url)]
+    end
+
+    def element
+      render "video", shoes_styles.merge("format" => @format)
+    end
+  end
+end