protos 0.3.0 → 0.4.0

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 view_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 view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/drawer/trigger.rb

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

data/lib/protos/drawer.rb

@@ -16,17 +16,11 @@ module Protos
       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 view_template(&block)
-        li(**attrs, &block)
+      def view_template(&)
+        li(**attrs, &)
       end
     end
   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 view_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 view_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 view_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 view_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 view_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/trigger.rb

@@ -5,8 +5,8 @@ module Protos
     class Trigger < Component
       # DOCS: A trigger is a button that opens a modal
 
-      def view_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 view_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,6 +7,8 @@ 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 view_template(&block)
         template_tag(**template_attrs) do

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 view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/popover.rb

@@ -80,17 +80,13 @@ module Protos
            reader: false,
            type: TriggerTypes | Types::Array.of(TriggerTypes)
 
-    def view_template(&block)
-      div(**attrs, &block)
+    def view_template(&)
+      div(**attrs, &)
     end
 
-    def content(...)
-      Content.new(...)
-    end
+    def content(...) = render Content.new(...)
 
-    def trigger(...)
-      Trigger.new(...)
-    end
+    def trigger(...) = render Trigger.new(...)
 
     private
 

data/lib/protos/stats/actions.rb

@@ -5,8 +5,8 @@ module Protos
     class Actions < Component
       # DOCS: A container for the actions (e.g. buttons) for a group of stats
 
-      def view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats/description.rb

@@ -5,8 +5,8 @@ module Protos
     class Description < Component
       # DOCS: A description for a group of stats
 
-      def view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats/figure.rb

@@ -5,8 +5,8 @@ module Protos
     class Figure < Component
       # DOCS: A figure for a single stat
 
-      def view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats/stat.rb

@@ -5,8 +5,8 @@ module Protos
     class Stat < Component
       # DOCS: A single stat container
 
-      def view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats/title.rb

@@ -5,8 +5,8 @@ module Protos
     class Title < Component
       # DOCS: A title for a group of stats
 
-      def view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats/value.rb

@@ -5,8 +5,8 @@ module Protos
     class Value < Component
       # DOCS: A value for a single stat
 
-      def view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/stats.rb

@@ -5,33 +5,21 @@ module Protos
     # DOCS: Stats component that contains a collection of stats
     # https://daisyui.com/components/stat/
 
-    def view_template(&block)
-      div(**attrs, &block)
+    def view_template(&)
+      div(**attrs, &)
     end
 
-    def actions(...)
-      Actions.new(...)
-    end
+    def actions(...) = render Actions.new(...)
 
-    def description(...)
-      Description.new(...)
-    end
+    def description(...) = render Description.new(...)
 
-    def figure(...)
-      Figure.new(...)
-    end
+    def figure(...) = render Figure.new(...)
 
-    def stat(...)
-      Stat.new(...)
-    end
+    def stat(...) = render Stat.new(...)
 
-    def title(...)
-      Title.new(...)
-    end
+    def title(...) = render Title.new(...)
 
-    def value(...)
-      Value.new(...)
-    end
+    def value(...) = render Value.new(...)
 
     private
 

data/lib/protos/swap/off.rb

@@ -5,8 +5,8 @@ module Protos
     class Off < Component
       # DOCS: The off state for a swap component. This is the default state.
 
-      def view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/swap/on.rb

@@ -5,8 +5,8 @@ module Protos
     class On < Component
       # DOCS: The on state for a swap component. This is the active state.
 
-      def view_template(&block)
-        div(**attrs, &block)
+      def view_template(&)
+        div(**attrs, &)
       end
 
       private

data/lib/protos/swap.rb

@@ -13,13 +13,9 @@ module Protos
       end
     end
 
-    def on(...)
-      On.new(...)
-    end
+    def on(...) = render On.new(...)
 
-    def off(...)
-      Off.new(...)
-    end
+    def off(...) = render Off.new(...)
 
     private
 

data/lib/protos/table/body.rb

@@ -5,8 +5,8 @@ module Protos
     class Body < Component
       # DOCS: The body of a table
 
-      def view_template(&block)
-        tbody(**attrs, &block)
+      def view_template(&)
+        tbody(**attrs, &)
       end
     end
   end

data/lib/protos/table/caption.rb

@@ -5,15 +5,15 @@ module Protos
     class Caption < Component
       # DOCS: The caption of a table
 
-      def view_template(&block)
-        caption(**attrs, &block)
+      def view_template(&)
+        caption(**attrs, &)
       end
 
       private
 
       def theme
         {
-          container: tokens("caption-bottom", "p-sm")
+          container: tokens("caption-bottom")
         }
       end
     end

data/lib/protos/table/cell.rb

@@ -11,8 +11,8 @@ module Protos
                :left
              }
 
-      def view_template(&block)
-        td(**attrs, &block)
+      def view_template(&)
+        td(**attrs, &)
       end
 
       private

data/lib/protos/table/footer.rb

@@ -5,8 +5,8 @@ module Protos
     class Footer < Component
       # DOCS: The footer of a table
 
-      def view_template(&block)
-        tfoot(**attrs, &block)
+      def view_template(&)
+        tfoot(**attrs, &)
       end
     end
   end

data/lib/protos/table/head.rb

@@ -11,8 +11,8 @@ module Protos
                :left
              }
 
-      def view_template(&block)
-        th(**attrs, &block)
+      def view_template(&)
+        th(**attrs, &)
       end
 
       private

data/lib/protos/table/header.rb

@@ -6,8 +6,8 @@ module Protos
       # DOCS: The header of a table that contains many Protos::Table::Head
       # components
 
-      def view_template(&block)
-        thead(**attrs, &block)
+      def view_template(&)
+        thead(**attrs, &)
       end
     end
   end

data/lib/protos/table/row.rb

@@ -5,8 +5,8 @@ module Protos
     class Row < Component
       # DOCS: The row of a table
 
-      def view_template(&block)
-        tr(**attrs, &block)
+      def view_template(&)
+        tr(**attrs, &)
       end
     end
   end

data/lib/protos/table.rb

@@ -24,33 +24,19 @@ module Protos
       end
     end
 
-    def body(...)
-      Body.new(...)
-    end
+    def body(...) = render Body.new(...)
 
-    def caption(...)
-      Caption.new(...)
-    end
+    def caption(...) = render Caption.new(...)
 
-    def cell(...)
-      Cell.new(...)
-    end
+    def cell(...) = render Cell.new(...)
 
-    def footer(...)
-      Footer.new(...)
-    end
+    def footer(...) = render Footer.new(...)
 
-    def head(...)
-      Head.new(...)
-    end
+    def head(...) = render Head.new(...)
 
-    def header(...)
-      Header.new(...)
-    end
+    def header(...) = render Header.new(...)
 
-    def row(...)
-      Row.new(...)
-    end
+    def row(...) = render Row.new(...)
 
     private