protos 0.2.3 → 0.4.0

data/lib/protos/chat_bubble/image.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: An image within a chat bubble. This would typically be an avatar
       # component.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/chat_bubble.rb

@@ -15,25 +15,17 @@ module Protos
              :end
            )
 
-    def template(&block)
-      div(**attrs, &block)
+    def view_template(&)
+      div(**attrs, &)
     end
 
-    def content(...)
-      Content.new(...)
-    end
+    def content(...) = render Content.new(...)
 
-    def footer(...)
-      Footer.new(...)
-    end
+    def footer(...) = render Footer.new(...)
 
-    def header(...)
-      Header.new(...)
-    end
+    def header(...) = render Header.new(...)
 
-    def image(...)
-      Image.new(...)
-    end
+    def image(...) = render Image.new(...)
 
     private
 

data/lib/protos/collapse/content.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: The content of a collapse. This would be hidden until the collapse
       # is opened.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/collapse/title.rb

@@ -10,11 +10,11 @@ module Protos
              reader: false,
              default: -> { "" }
 
-      def template(&block)
+      def view_template(&)
         if @id.size.positive?
-          label(for: @id, **attrs, &block)
+          label(for: @id, **attrs, &)
         else
-          div(**attrs, &block)
+          div(**attrs, &)
         end
       end
 

data/lib/protos/collapse.rb

@@ -11,20 +11,16 @@ module Protos
            default: -> { "collapse-#{SecureRandom.hex(4)}" },
            type: Types::String
 
-    def template
+    def view_template
       div(**attrs) do
-        input(type: "checkbox", id:) if @checkbox
+        input(type: "checkbox", id:, autocomplete: :off) if @checkbox
         yield if block_given?
       end
     end
 
-    def title(*args, **kwargs, &block)
-      Title.new(*args, id:, **kwargs, &block)
-    end
+    def title(*, **, &) = render Title.new(*, id:, **, &)
 
-    def content(...)
-      Content.new(...)
-    end
+    def content(...) = render Content.new(...)
 
     private
 

data/lib/protos/combobox.rb

@@ -11,37 +11,21 @@ module Protos
            reader: false,
            type: TriggerTypes | Types::Array.of(TriggerTypes)
 
-    def trigger(...)
-      Popover::Trigger.new(...)
-    end
+    def trigger(...) = render Popover::Trigger.new(...)
 
-    def content(...)
-      Popover::Content.new(...)
-    end
+    def content(...) = render Popover::Content.new(...)
 
-    def input(...)
-      Command::Input.new(...)
-    end
+    def input(...) = render Command::Input.new(...)
 
-    def group(...)
-      Command::Group.new(...)
-    end
+    def group(...) = render Command::Group.new(...)
 
-    def item(...)
-      Command::Item.new(...)
-    end
+    def item(...) = render Command::Item.new(...)
 
-    def list(...)
-      Command::List.new(...)
-    end
+    def list(...) = render Command::List.new(...)
 
-    def title(...)
-      Command::Title.new(...)
-    end
+    def title(...) = render Command::Title.new(...)
 
-    def empty(...)
-      Command::Empty.new(...)
-    end
+    def empty(...) = render Command::Empty.new(...)
 
     private
 

data/lib/protos/command/dialog.rb

@@ -6,7 +6,7 @@ module Protos
       # DOCS: The dialog for a command wraps the command content and provides a
       # modal backdrop for the command when it is opened.
 
-      def template(&block)
+      def view_template(&block)
         dialog(**attrs) do
           div(class: css[:modal], &block)
           form(method: :dialog, class: css[:form]) do

data/lib/protos/command/empty.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: The empty component is displayed in the list when there are no
       # matches in an input.
 
-      def template(&block)
-        li(**attrs, &block)
+      def view_template(&)
+        li(**attrs, &)
       end
 
       private

data/lib/protos/command/group.rb

@@ -7,7 +7,7 @@ module Protos
       # Items in the group will have a divider line on the left side and can
       # optionally have a title.
 
-      def template(&block)
+      def view_template(&block)
         li(**attrs) do
           ul(class: css[:list], &block)
         end

data/lib/protos/command/input.rb

@@ -11,7 +11,7 @@ module Protos
              },
              reader: :private
 
-      def template(&block)
+      def view_template(&block)
         div(**attrs) do
           label(class: css[:label]) do
             div(class: css[:icon], &block) if block
@@ -19,7 +19,8 @@ module Protos
               type: :text,
               data: { action: "protos--command#filter" },
               class: css[:input],
-              placeholder:
+              placeholder:,
+              autocomplete: :off
             )
           end
         end

data/lib/protos/command/item.rb

@@ -5,8 +5,8 @@ module Protos
     class Item < Component
       # DOCS: A single option within a command
 
-      def template(&block)
-        li(**attrs, &block)
+      def view_template(&)
+        li(**attrs, &)
       end
 
       private

data/lib/protos/command/list.rb

@@ -5,8 +5,8 @@ module Protos
     class List < Component
       # DOCS: A list of commands. This can contain either items or groups.
 
-      def template(&block)
-        ul(**attrs, &block)
+      def view_template(&)
+        ul(**attrs, &)
       end
 
       private

data/lib/protos/command/title.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: The title for a group of commands. This is expected to be used
       # inside a Protos::Command::Group component.
 
-      def template(&block)
-        h2(**attrs, &block)
+      def view_template(&)
+        h2(**attrs, &)
       end
 
       private

data/lib/protos/command/trigger.rb

@@ -5,8 +5,8 @@ module Protos
     class Trigger < Component
       # DOCS: A trigger is a button that opens a command palette modal
 
-      def template(&block)
-        button(**attrs, &block)
+      def view_template(&)
+        button(**attrs, &)
       end
 
       private

data/lib/protos/command.rb

@@ -6,41 +6,25 @@ module Protos
     # filterable list of commands. Command modals are by default closable by
     # clicking the overlay rather than a specific close button.
 
-    def template(&block)
-      div(**attrs, &block)
+    def view_template(&)
+      div(**attrs, &)
     end
 
-    def input(...)
-      Input.new(...)
-    end
+    def input(...) = render Input.new(...)
 
-    def list(...)
-      List.new(...)
-    end
+    def list(...) = render List.new(...)
 
-    def trigger(...)
-      Trigger.new(...)
-    end
+    def trigger(...) = render Trigger.new(...)
 
-    def dialog(...)
-      Dialog.new(...)
-    end
+    def dialog(...) = render Dialog.new(...)
 
-    def title(...)
-      Title.new(...)
-    end
+    def title(...) = render Title.new(...)
 
-    def group(...)
-      Group.new(...)
-    end
+    def group(...) = render Group.new(...)
 
-    def item(...)
-      Item.new
-    end
+    def item(...) = render Item.new(...)
 
-    def empty(...)
-      Empty.new(...)
-    end
+    def empty(...) = render Empty.new(...)
 
     private
 

data/lib/protos/component.rb

@@ -21,35 +21,24 @@ module Protos
     default_attrs_method :default_attrs
 
     # Theme can override the css hash and add additional styles
-    option :theme, as: :theme_override, default: -> { {} }, reader: :private
+    option :theme, as: :theme_override, default: -> { {} }, reader: false
     # Class becomes the :container key in the css hash
-    option :class, as: :container_class, default: -> { "" }, reader: :private
-    option :html_options, default: -> { {} }, reader: :private
+    option :class, as: :container_class, default: -> { "" }, reader: false
+    option :html_options, default: -> { {} }, reader: false
 
     # Adds non-defined options to the html_options hash
-    def initialize(*args, **kwargs, &block)
-      raise_block_in_initializer_error if block
-
+    def initialize(*args, **kwargs, &)
       defined_keys = self.class.dry_initializer.definitions.keys
       defined, undefined =
         kwargs
           .partition { |key, _| defined_keys.include?(key) }
-          .map(&:to_h)
+          .map!(&:to_h)
 
-      super(*args, html_options: undefined, **defined)
+      super(*args, html_options: undefined, **defined, &)
     end
 
     private
 
-    def raise_block_in_initializer_error
-      raise(
-        ArgumentError,
-        "It is unexpected to pass a block to the initializer of a component. " \
-        "You might have tried to render and passed a block but it went to " \
-        "the component.new. Check your render call."
-      )
-    end
-
     def attrs
       @attrs ||= build_attrs
     end
@@ -59,33 +48,35 @@ module Protos
     end
 
     def build_attrs(...)
-      defaults = if respond_to?(
-        self.class.default_attrs_method,
-        :include_private
-      )
-        send(self.class.default_attrs_method)
+      defaults = if respond_to?(default_attrs_method, :include_private)
+        send(default_attrs_method)
       end
 
       Attributes
         .new(...)
         .merge(defaults)
-        .merge(html_options)
+        .merge(@html_options)
         .merge(class: css[:container])
     end
 
     def build_theme(...)
-      component_style = if respond_to?(
-        self.class.theme_method,
-        :include_private
-      )
-        send(self.class.theme_method)
+      component_style = if respond_to?(theme_method, :include_private)
+        send(theme_method)
       end
 
       Theme
         .new(...)
         .merge(component_style)
-        .merge(theme_override)
-        .merge(container: container_class)
+        .merge(@theme_override)
+        .merge(container: @container_class)
+    end
+
+    def theme_method
+      self.class.theme_method
+    end
+
+    def default_attrs_method
+      self.class.default_attrs_method
     end
   end
 end

data/lib/protos/drawer/content.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: The content of a drawer. This would be visible at all times and
       # represents the main content of your page.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/drawer/side.rb

@@ -8,7 +8,7 @@ module Protos
 
       option :id, type: Types::Coercible::String
 
-      def template
+      def view_template
         aside(**attrs) do
           label(for: id, aria_label: "close sidebar", class: css[:toggle])
           yield if block_given?

data/lib/protos/drawer/trigger.rb

@@ -8,8 +8,8 @@ module Protos
 
       option :id, type: Types::Coercible::String
 
-      def template(&block)
-        label(for: id, **attrs, &block)
+      def view_template(&)
+        label(for: id, **attrs, &)
       end
 
       private

data/lib/protos/drawer.rb

@@ -9,24 +9,18 @@ module Protos
 
     option :id, type: Types::Coercible::String
 
-    def template
+    def view_template
       div(**attrs) do
-        input(id:, type: :checkbox, class: css[:toggle])
+        input(id:, type: :checkbox, class: css[:toggle], autocomplete: :off)
         yield if block_given?
       end
     end
 
-    def content(...)
-      Content.new(...)
-    end
+    def content(...) = render Content.new(...)
 
-    def side(*args, **kwargs, &block)
-      Side.new(*args, id:, **kwargs, &block)
-    end
+    def side(*, **, &) = render Side.new(*, id:, **, &)
 
-    def trigger(*args, **kwargs, &block)
-      Trigger.new(*args, id:, **kwargs, &block)
-    end
+    def trigger(*, **, &) = render Trigger.new(*, id:, **, &)
 
     private
 

data/lib/protos/dropdown/item.rb

@@ -5,8 +5,8 @@ module Protos
     class Item < Component
       # DOCS: A single item within a dropdown
 
-      def template(&block)
-        li(**attrs, &block)
+      def view_template(&)
+        li(**attrs, &)
       end
     end
   end

data/lib/protos/dropdown/menu.rb

@@ -7,7 +7,7 @@ module Protos
       # Protos::Popover::Content component as the main functionality for
       # dropdowns comes from there.
 
-      def template(&block)
+      def view_template(&block)
         template_tag(**template_attrs) do
           ul(**attrs, &block)
         end

data/lib/protos/dropdown.rb

@@ -19,16 +19,10 @@ module Protos
            reader: false,
            type: TriggerTypes | Types::Array.of(TriggerTypes)
 
-    def item(...)
-      Item.new(...)
-    end
+    def item(...) = render Item.new(...)
 
-    def menu(...)
-      Menu.new(...)
-    end
+    def menu(...) = render Menu.new(...)
 
-    def trigger(...)
-      Trigger.new(...)
-    end
+    def trigger(...) = render Trigger.new(...)
   end
 end

data/lib/protos/hero/content.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: The content of a hero. This would be centered within the main
       # component container.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/hero/overlay.rb

@@ -7,8 +7,8 @@ module Protos
       # their opacity through the opacity of the overlay. This can be useful to
       # make text readable on noisy images.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/hero.rb

@@ -6,17 +6,13 @@ module Protos
     # optionally layout an image for a responsive layout.
     # https://daisyui.com/components/hero/
 
-    def template(&block)
-      div(**attrs, &block)
+    def view_template(&)
+      div(**attrs, &)
     end
 
-    def content(...)
-      Content.new(...)
-    end
+    def content(...) = render Content.new(...)
 
-    def overlay(...)
-      Overlay.new(...)
-    end
+    def overlay(...) = render Overlay.new(...)
 
     private
 

data/lib/protos/list/item.rb

@@ -7,8 +7,8 @@ module Protos
       # work for list items, including border radius. E.g. only the first and
       # last items will have border radius on the top and bottom.
 
-      def template(&block)
-        li(**attrs, &block)
+      def view_template(&)
+        li(**attrs, &)
       end
 
       private

data/lib/protos/list.rb

@@ -7,13 +7,11 @@ module Protos
 
     option :ordered, Types::Bool, default: -> { false }, reader: false
 
-    def template(&block)
-      send(element, **attrs, &block)
+    def view_template(&)
+      send(element, **attrs, &)
     end
 
-    def item(...)
-      Item.new(...)
-    end
+    def item(...) = render Item.new(...)
 
     private
 

data/lib/protos/modal/close_button.rb

@@ -5,7 +5,7 @@ module Protos
     class CloseButton < Component
       # DOCS: A close button for a modal
 
-      def template(&block)
+      def view_template(&block)
         form(method: :dialog, class: css[:form]) do
           button(
             **attrs,

data/lib/protos/modal/dialog.rb

@@ -6,7 +6,7 @@ module Protos
       # DOCS: A modal dialog. This is the place for the main content of the
       # modal that will be displayed when the trigger is clicked.
 
-      def template(&block)
+      def view_template(&block)
         dialog(**attrs) do
           div(class: css[:modal], &block)
         end

data/lib/protos/modal/trigger.rb

@@ -5,8 +5,8 @@ module Protos
     class Trigger < Component
       # DOCS: A trigger is a button that opens a modal
 
-      def template(&block)
-        button(**attrs, &block)
+      def view_template(&)
+        button(**attrs, &)
       end
 
       private

data/lib/protos/modal.rb

@@ -5,21 +5,15 @@ module Protos
     # DOCS: A modal component that can be triggered by a button or a link and
     # will open a fullscreen modal, usually with a close button.
 
-    def template(&block)
-      div(**attrs, class: css[:container], &block)
+    def view_template(&)
+      div(**attrs, class: css[:container], &)
     end
 
-    def close_button(...)
-      CloseButton.new(...)
-    end
+    def close_button(...) = render CloseButton.new(...)
 
-    def dialog(...)
-      Dialog.new(...)
-    end
+    def dialog(...) = render Dialog.new(...)
 
-    def trigger(...)
-      Trigger.new(...)
-    end
+    def trigger(...) = render Trigger.new(...)
 
     private
 

data/lib/protos/popover/content.rb

@@ -7,8 +7,10 @@ module Protos
       # added to the DOM by tippy.js to handle the position of the content.
       # This means content in here will not be available in system tests that
       # use rack_test.
+      #
+      # TODO: Move away from using template
 
-      def template(&block)
+      def view_template(&block)
         template_tag(**template_attrs) do
           div(**attrs, &block)
         end

data/lib/protos/popover/trigger.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: The trigger of a popover. This is the element that you would hover
       # or click on to show the popover.
 
-      def template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private