organism-ui 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f27836996619577882186d159e7ca50cc282dddcfd8090832f901965cce8828c
-  data.tar.gz: abb2ae83b2f31627e6df9ea53b2f5fbe9a240ea1a7ec1f6e089c97ae265789a8
+  metadata.gz: 45abc828f8e47547304444edd15b9ffb4ec4377feb286c5559fe4c60d6e23dfd
+  data.tar.gz: 411a58b849148a4f9c1635a8a318784bc25421a4b146a4911ce0bc4c1cec4dfb
 SHA512:
-  metadata.gz: 5a4e588f073083ac3d9dc3cb735567c4e5fd7d9b899de3c33e040c0af948e68700ceba48d76d893f7ad2e2ab6ba60df8b6514749aa16d14821c5e6f787acf916
-  data.tar.gz: ae0d450685712bc9d35669299de10c8ba0f132ec56ff03865d78004d1b7917105ffc59a041a4d70768f84c1cb4731cf96bfdb9c6c294be73b5a12bd7950e2fdd
+  metadata.gz: db0d57b58f82cd7cf96aa9afad5f6862f7ce8b11652e383ca1ac13b5b38c4c1d360b4c6ad9bdbb66d28926f8c9cc66f657efc16ccab365ed5df8bbd3b6ce6649
+  data.tar.gz: d75702678ac862483be221af7bd4a3a19fc60e502767214a14688ca2710814b893a33c1a7907857d9b6631596f13dd24425e051148249bf569656a0c57f9fb1b

data/app/views/ui/style_guide/show.html.erb

@@ -674,11 +674,10 @@
                 ).()
               }
             ],
-            renderable: ->(item) {
+            item_renderer: ->(item) {
               content_tag(
                 :div,
-                render_group([
-                  content_tag(:p, item),
+                  content_tag(:p, item) +
                   content_tag(
                     :nav,
                     cell(
@@ -687,8 +686,7 @@
                       path: '#',
                       size: :small
                     ).call(:edit)
-                  )
-                ]),
+                  ),
                 class: 'flex flex-row justify-between items-center p-4'
               )
             }

data/lib/ui.rb

@@ -4,6 +4,8 @@ require "cells-erb"
 require "cells-rails"
 require 'dry-struct'
 
+require "ui/errors/base"
+
 require "ui/types"
 require "ui/value"
 

data/lib/ui/actionable.rb

@@ -2,18 +2,25 @@ module Ui
   module Actionable
     Actions = Types::Array.default([].freeze).of(Types::Callable)
 
-    def actions
+    def actions(object = model)
       content_tag(:nav, class: 'ui-actions', role: 'navigation') do
         render_group(
-          Actions[actions_list].map do |action|
-            action.call(model)
+          actions_list.map do |action|
+            action.call(object)
           end
         )
       end
     end
 
     def actions_list
-      options.fetch(:actions, Array.new) || Array.new
+      begin
+        Actions[options.fetch(:actions, Array.new)]
+      rescue Dry::Types::ConstraintError
+        raise Ui::Errors::InvalidActions.new(
+          "Actions for #{self.class.to_s} are invalid. Ensure you are passing " \
+          "an array of callable objects that will be passed a model"
+        )
+      end
     end
 
     def actions_length

data/lib/ui/breadcrumbs.rb

@@ -1,9 +1,9 @@
 module Ui
   class Breadcrumbs < Component
+    include Stylable
+
     def show
-      content_tag(:nav, class: 'ui-breadcrumbs') do
-        breadcrumb_links
-      end
+      content_tag(:nav, render_group(breadcrumb_links.flatten), class: style)
     end
 
     private
@@ -13,13 +13,11 @@ module Ui
     end
 
     def breadcrumb_links
-      render_group(
-        breadcrumbs.map.with_index do |crumb, index|
-          [item_renderer.call(crumb)].tap do |renderable|
-            renderable.unshift(delimiter) unless index == 0
-          end
-        end.flatten
-      )
+      breadcrumbs.map.with_index do |crumb, index|
+        [item_renderer.call(crumb)].tap do |array|
+          array.unshift(delimiter) unless index == 0
+        end
+      end
     end
 
     def delimiter
@@ -27,7 +25,20 @@ module Ui
     end
 
     def item_renderer
-      options[:item_renderer] || Ui::Breadcrumbs::Breadcrumb
+      options[:item_renderer] || default_item_renderer
+    end
+
+    def default_item_renderer
+      ->(item) {
+        cell(
+          Ui::Breadcrumbs::Breadcrumb,
+          item
+        ).()
+      }
+    end
+
+    def component_style
+      'ui-breadcrumbs'
     end
   end
 end

data/lib/ui/breadcrumbs/breadcrumb.rb

@@ -1,6 +1,8 @@
 module Ui
   class Breadcrumbs < Component
     class Breadcrumb < Component
+      include Stylable
+
       property :name
       property :path
       property :current?
@@ -9,7 +11,7 @@ module Ui
       def show
         content_tag(
           :span,
-          link_to(path, title),
+          link_to(render_group(title), path),
           class: style
         )
       end
@@ -17,17 +19,19 @@ module Ui
       private
 
       def title
-        [name].tap do |array|
-          array.unshift(content_tag(:i, nil, class: icon)) if model.try(:icon)
-        end.join(' ')
+        [content_tag(:span, name)].tap do |array|
+          array.unshift(content_tag(:i, nil, class: icon)) if has_icon? 
+        end
       end
 
-      def style
-        [
-          'breadcrumb'
-        ].tap do |array|
-          array << 'breadcrumb--current' if current?
-        end
+      def has_icon?
+        model.try(:icon)
+      end
+
+      def component_style
+        ['ui-breadcrumb'].tap do |array|
+          array << 'ui-breadcrumb--current' if current?
+        end.join(' ')
       end
     end
   end

data/lib/ui/card.rb

@@ -16,9 +16,7 @@ module Ui
     end
 
     def card_actions
-      content_tag(:nav, class: "ui-card__controls") do
-        actions
-      end if has_actions?
+      actions if has_actions?
     end
 
     def title

data/lib/ui/descriptive_list/item.rb

@@ -5,19 +5,33 @@ module Ui
         content_tag(
           :div,
           render_group([
-            content_tag(:dt, title),
+            content_tag(:dt, item_title),
             content_tag(:dd, value)
           ]),
           class: 'ui-descriptive-list__item'
         )
       end
 
-      def title
+      def value
+        render_group([
+          display(item_value)
+        ])
+      end
+
+      def display(value)
+        if value.is_a?(Proc)
+          value.call
+        else
+          value
+        end
+      end
+
+      def item_title
         model[0]
       end
 
-      def value
-        model[1].try(:call) || model[1]
+      def item_value
+        model[1]
       end
     end
   end

data/lib/ui/dropdown.rb

@@ -1,5 +1,7 @@
 module Ui
   class Dropdown < Component
+    include Stylable
+
     Modes = Types::String.enum(
       'click',
       'hover'
@@ -18,5 +20,9 @@ module Ui
     def mode
       Modes[options.fetch(:mode, 'click')]
     end
+
+    def component_style
+      "ui-dropdown"
+    end
   end
 end

data/lib/ui/dropdown/show.erb

@@ -4,7 +4,7 @@
   data-dropdown-expanded-value="false"
   data-dropdown-mode-value="<%= mode %>"
   data-action="click->dropdown#toggle"
-  class="ui-dropdown">
+  class="<%= style %>">
   <%= yield %>
 
   <div data-dropdown-target="expandable" class="ui-dropdown__expandable">

data/lib/ui/empty/show.erb

@@ -4,8 +4,6 @@
 
   <figcaption>
     <%= caption %>
-    <nav>
-      <%= actions %>
-    </nav>
+    <%= actions %>
   </figcaption>
 </figure>

data/lib/ui/errors/base.rb

@@ -0,0 +1,6 @@
+module Ui
+  module Errors
+    class Base < StandardError
+    end
+  end
+end

data/lib/ui/errors/invalid_actions.rb

@@ -0,0 +1,6 @@
+module Ui
+  module Errors
+    class InvalidActions < Base
+    end
+  end
+end

data/lib/ui/errors/invalid_list_items.rb

@@ -0,0 +1,6 @@
+module Ui
+  module Errors
+    class InvalidListItems < Base
+    end
+  end
+end

data/lib/ui/list.rb

@@ -4,6 +4,7 @@ module Ui
     include Actionable
 
     Renderable = Types.Interface(:call)
+    ListItems = Types.Interface(:each, :map, :any?)
 
     def show
       render
@@ -11,21 +12,32 @@ module Ui
 
     private
 
+    def list_data
+      begin
+        ListItems[model]
+      rescue Dry::Types::ConstraintError
+        raise Ui::Errors::InvalidListItems.new(
+          "List items for #{self.class.to_s} are invalid. Ensure you are passing " \
+          "an empty array or array of items that will be passed to the item renderer"
+        )
+      end
+    end
+
     def list
       content_tag(:ul, list_items)
     end
 
     def list_items
-      if list_data.any?
-        render_group(list_data)
+      if rendered_items.any?
+        render_group(rendered_items)
       else
         render_empty
       end
     end
 
-    def list_data
-      model.map do |item|
-        renderable.call(item)
+    def rendered_items
+      list_data.map do |item|
+        item_renderer.call(item)
       end
     end
 
@@ -46,8 +58,8 @@ module Ui
       ) if options[:footer]
     end
 
-    def renderable
-      Renderable[options.fetch(:renderable, default_renderable)]
+    def item_renderer
+      Renderable[options.fetch(:item_renderer, default_renderable)]
     end
 
     def default_renderable

data/lib/ui/pagination/window.rb

@@ -60,7 +60,7 @@ module Ui
       def page_links
         render_group(
           pages.map do |page|
-            content += content_tag(
+            content_tag(
               :li,
               cell(
                 Ui::Pagination::PageLink,

data/lib/ui/version.rb

@@ -1,3 +1,3 @@
 module Ui
-  VERSION = '0.2.15'
+  VERSION = '0.2.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: organism-ui
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Nolan Tait
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -215,6 +215,9 @@ files:
 - lib/ui/empty.rb
 - lib/ui/empty/show.erb
 - lib/ui/engine.rb
+- lib/ui/errors/base.rb
+- lib/ui/errors/invalid_actions.rb
+- lib/ui/errors/invalid_list_items.rb
 - lib/ui/list.rb
 - lib/ui/list/item.rb
 - lib/ui/list/show.erb
@@ -260,7 +263,7 @@ homepage: https://github.com/nolantait/organism-ui
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -276,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A collection of ui components implemented in cells.
 test_files: []