Polish some static core components

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (0.6.0)
+    matestack-ui-core (0.7.0)
       cells-haml
       cells-rails
       haml

app/concepts/matestack/ui/core/blockquote/blockquote.haml

@@ -0,0 +1,5 @@
+%blockquote{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/blockquote/blockquote.rb

@@ -0,0 +1,9 @@
+module Matestack::Ui::Core::Blockquote
+  class Blockquote < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        "cite": options[:cite]
+      })
+    end
+  end
+end

app/concepts/matestack/ui/core/button/button.haml

@@ -1,7 +1,5 @@
-- if options[:text].nil?
-  %button{@tag_attributes}
-    - if block_given?
-      = yield
-- else
-  %button{@tag_attributes}
+%button{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/caption/caption.haml

@@ -0,0 +1,6 @@
+%caption{@tag_attributes}
+  - if options[:text].nil?
+    - if block_given?
+      = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/caption/caption.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Caption
+  class Caption < Matestack::Ui::Core::Component::Static
+
+  end
+end

app/concepts/matestack/ui/core/details/details.haml

@@ -0,0 +1,3 @@
+%details{@tag_attributes}
+  - if block_given?
+    = yield

app/concepts/matestack/ui/core/details/details.rb

@@ -0,0 +1,4 @@
+module Matestack::Ui::Core::Details
+  class Details < Matestack::Ui::Core::Component::Static
+  end
+end

app/concepts/matestack/ui/core/label/label.haml

@@ -1,7 +1,5 @@
-- if options[:text].blank?
-  %label{@tag_attributes}
-    - if block_given?
-      = yield
-- else
-  %label{@tag_attributes}
+%label{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/link/link.haml

@@ -1,6 +1,5 @@
-- if options[:text].nil?
-  = link_to link_path, @tag_attributes do
-    - if block_given?
-      = yield
-- else
-  = link_to options[:text], link_path, @tag_attributes
+%a{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/link/link.rb

@@ -4,10 +4,12 @@ class Link < Matestack::Ui::Core::Component::Static
     REQUIRED_KEYS = [:path]
 
     def setup
-      @tag_attributes.merge!({ "class": options[:class],
+      @tag_attributes.merge!({
+        "class": options[:class],
         "id": component_id,
         "method": options[:method],
-        "target": options[:target] ||= nil
+        "target": options[:target] ||= nil,
+        "href": link_path
       })
     end
 

app/concepts/matestack/ui/core/page/page.rb

@@ -82,25 +82,28 @@ def show(component_key=nil, only_page=false)
 
       when :only_page
         nodes_to_cell
-        # keys_array = ["div_2","components", "partial_1", "components", "form_1"]
-        # puts @nodes.dig(*keys_array)
         render :page
       when :render_page_with_app
         concept(@app_class).call(:show, @page_id, @nodes)
       when :render_component
-        if component_key.include?("__")
-          keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
-          page_content_keys = keys_array.select{|key| key.match(/^page_content_/)}
-          if page_content_keys.any?
-            keys_array = keys_array.drop(keys_array.find_index(page_content_keys[0])+2)
+        begin
+          if component_key.include?("__")
+            keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
+            page_content_keys = keys_array.select{|key| key.match(/^page_content_/)}
+            if page_content_keys.any?
+              keys_array = keys_array.drop(keys_array.find_index(page_content_keys[0])+2)
+            end
+            node = @nodes.dig(*keys_array)
+            cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
+            return cell.render_content
+          else
+            node = @nodes[component_key]
+            cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
+            return cell.render_content
           end
-          node = @nodes.dig(*keys_array)
-          cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
-          return cell.render_content
-        else
-          node = @nodes[component_key]
-          cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
-          return cell.render_content
+        rescue
+          raise "Component '#{component_key}' could not be resolved. Notice: Rerendering currently works only on page-level. \
+          You are therefore currently not able to use 'async' within a component for example!"
         end
       end
     end

app/concepts/matestack/ui/core/paragraph/paragraph.haml

@@ -1,8 +1,5 @@
-- if options[:text].nil?
-  %p{@tag_attributes}
-    - if block_given?
-      = yield
-
-- else
-  %p{@tag_attributes}
+%p{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/pg/pg.haml

@@ -1,8 +1,5 @@
-- if options[:text].nil?
-  %p{@tag_attributes}
-    - if block_given?
-      = yield
-
-- else
-  %p{@tag_attributes}
+%p{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/small/small.haml

@@ -0,0 +1,5 @@
+%small{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/small/small.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Small
+  class Small < Matestack::Ui::Core::Component::Static
+
+  end
+end

app/concepts/matestack/ui/core/span/span.haml

@@ -1,3 +1,5 @@
 %span{@tag_attributes}
-  - if block_given?
+  - if options[:text].nil? && block_given?
     = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/strong/strong.haml

@@ -0,0 +1,5 @@
+%strong{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/strong/strong.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Strong
+  class Strong < Matestack::Ui::Core::Component::Static
+
+  end
+end

app/concepts/matestack/ui/core/summary/summary.haml

@@ -0,0 +1,6 @@
+%summary{@tag_attributes}
+  - if options[:text].blank?
+    - if block_given?
+      = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/summary/summary.rb

@@ -0,0 +1,4 @@
+module Matestack::Ui::Core::Summary
+  class Summary < Matestack::Ui::Core::Component::Static
+  end
+end

app/concepts/matestack/ui/core/td/td.haml

@@ -1,8 +1,5 @@
-- if options[:text].nil?
-  %td{@tag_attributes}
-    - if block_given?
-      = yield
-
-- else
-  %td{@tag_attributes}
+%td{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/th/th.haml

@@ -1,8 +1,5 @@
-- if options[:text].nil?
-  %th{@tag_attributes}
-    - if block_given?
-      = yield
-
-- else
-  %th{@tag_attributes}
+%th{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/transition/transition.haml

@@ -1,7 +1,5 @@
-- if options[:text].nil?
-  %a{@tag_attributes}
-    - if block_given?
-      = yield
-- else
-  %a{@tag_attributes}
+%a{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/video/video.haml

@@ -0,0 +1 @@
+= video_tag(ActionController::Base.helpers.asset_path(options[:path]), height: options[:height], width: options[:width], preload: options[:preload], autoplay: options[:autoplay], muted: options[:muted], playsinline: options[:playsinline], loop: options[:loop], class: options[:class], id: options[:id], controls: options[:controls])

app/concepts/matestack/ui/core/video/video.rb

@@ -0,0 +1,7 @@
+module Matestack::Ui::Core::Video
+  class Video < Matestack::Ui::Core::Component::Static
+
+    REQUIRED_KEYS = [:path]
+
+  end
+end

app/concepts/plain/cell/plain.rb

@@ -0,0 +1,9 @@
+module Plain::Cell
+  class Plain < Component::Cell::Static
+
+    def show
+      @argument
+    end
+
+  end
+end

docs/components/async.md

@@ -6,6 +6,8 @@ As the name suggests, the async component allows us to let our components behave
 
 Please be aware that, if not configured otherwise, the async core component does get loaded and displayed on initial pageload!
 
+**the async component currently only works on page-level --> we're working on it in order support the usage of async within a component [#75](https://github.com/basemate/matestack-ui-core/issues/75)**
+
 ## Parameters
 
 The async core component accepts the following parameters:

docs/components/blockquote.md

@@ -0,0 +1,48 @@
+# matestack core component: Blockquote
+
+Show [specs](../../spec/usage/components/blockquote_spec.rb)
+
+The HTML blockquote tag implemented in ruby.
+
+## Parameters
+
+This component can take 3 optional configuration params and either yield content or display what gets passed to the `text` configuration param.
+
+#### # id (optional)
+Expects a string with all ids the span should have.
+
+#### # class (optional)
+Expects a string with all classes the span should have.
+
+#### # cite (optional)
+Expects a string referencing a cite for the blockquote.
+
+## Example 1: Yield a given block
+
+```ruby
+blockquote id: "foo", class: "bar", cite: "this is a cite" do
+  plain 'Hello World' # optional content
+end
+```
+
+returns
+
+```html
+<blockquote cite="this is a cite" id="foo" class="bar">
+  Hello World
+</blockquote>
+```
+
+## Example 2: Render options[:text] param
+
+```ruby
+blockquote id: "foo", class: "bar", cite: "this is a cite", text: 'Hello World'
+```
+
+returns
+
+```html
+<blockquote cite="this is a cite" id="foo" class="bar">
+  Hello World
+</blockquote>
+```