fixed all bugs due to 2.0 migration

Author: jonasjabari

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/matestack/matestack-ui-core
-  revision: 0bbd207c34dea89cc0056e4de563141ceb8aa284
+  revision: fc89a8a8dd61b88a764aac41d90b228951d28288
   branch: matestack-ui-core-2.0
   specs:
     matestack-ui-core (2.0.0)
@@ -124,10 +124,10 @@ GEM
     mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     msgpack (1.4.2)
-    nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nio4r (2.5.7)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)

app/concepts/matestack/ui/bootstrap/apps/admin_template.rb

@@ -1,32 +1,12 @@
 class Matestack::Ui::Bootstrap::Apps::AdminTemplate < Matestack::Ui::App
 
-  def response
-    html do
-      head do
-        title "Matestack UI Addon Dummy App"
-
-        unescape csrf_meta_tags
-        # unescape csp_meta_tag
-    
-        meta charset: "utf-8"
-        meta name: "viewport", content: "width=device-width, initial-scale=1"
-    
-        # unescape stylesheet_pack_tag("application", media: "all")
-        unescape javascript_pack_tag("application")
-        # unescape Matestack::Ui::Core::Context.controller.view_context.stylesheet_pack_tag(:application)
-        # unescape Matestack::Ui::Core::Context.controller.view_context.javascript_pack_tag(:application)
-      end
-    end
-    body do
-      matestack do
-        body_response do
-          yield
-        end
-      end
+  def response(&block)
+    matestack do
+      body_response(&block)
     end
   end
 
-  def body_response
+  def body_response(&block)
     div class: "d-flex flex-row" do
       if should_show_sidebar?
         bs_sidebar sidebar_navigation_items: sidebar_navigation_items, slots: { sidebar_top: method(:sidebar_top_slot) }

app/concepts/matestack/ui/bootstrap/components/accordion.rb

@@ -4,7 +4,8 @@ class Matestack::Ui::Bootstrap::Components::Accordion < Matestack::Ui::Bootstrap
   optional :items # array with 2 Hashes: header and body
   optional :open
   optional :variant
-  optional :attributes, :class, :id
+  optional :attributes, class: { as:  :bs_class }
+  optional :id
 
   def prepare
     @accordion_id = (context.id.present? ? context.id : "matestack-accordion-#{SecureRandom.hex(3)}")
@@ -49,7 +50,7 @@ def accordion_classes
       classes << 'accordion'
       classes << 'open' if context.open
       classes << 'accordion-flush' if context.variant == :flush
-      classes << context.class
+      classes << context.bs_class
     end.join(' ').strip
   end
 end

app/concepts/matestack/ui/bootstrap/components/alert.rb

@@ -1,12 +1,12 @@
 class Matestack::Ui::Bootstrap::Components::Alert < Matestack::Ui::Bootstrap::BaseVueJsComponent
   vue_name "matestack-ui-bootstrap-alert"
 
-  optional :title, :text, :variant, :dismissible, :animate, :title_size, :class
+  optional :title, :text, :variant, :dismissible, :animate, :title_size, class: { as:  :bs_class }
   optional :close_on, :dispose_on # event names on which occourences we close or dispose the modal
 
   def response
     div alert_attributes do
-      heading context.title, size: (title_size || 4), class: 'alert-heading' if context.title
+      heading context.title, size: (context.title_size || 4), class: 'alert-heading' if context.title
       plain context.text if context.text
       yield if block_given?
       bs_close dismiss: "alert" if context.dismissible
@@ -15,12 +15,19 @@ def response
 
   protected
 
+  def config
+    {}.tap do |props|
+      props[:close_on] = context.close_on
+      props[:dispose_on] = context.dispose_on
+    end
+  end
+
   def alert_classes
     classes = ['alert']
     classes << "alert-#{context.variant || "primary"}"
     classes << "alert-dismissible" if context.dismissible
     classes << "fade show" if context.animate
-    classes << context.class
+    classes << context.bs_class
     classes.join(' ')
   end
 

app/concepts/matestack/ui/bootstrap/components/avatar.rb

@@ -1,27 +1,27 @@
 class Matestack::Ui::Bootstrap::Components::Avatar < Matestack::Ui::Bootstrap::BaseComponent
 
-  optional :text, :bg_variant, :text_variant, :img_path, :size, :class
+  optional :text, :bg_variant, :text_variant, :img_path, :size, class: { as:  :bs_class }
 
   def response
     if context.text.present? && context.img_path.nil?
-      div class: "rounded-circle bg-#{context.bg_variant || 'primary'} text-#{context.text_variant || 'white'} text-center p-2 #{context.class}", 
+      div class: "rounded-circle bg-#{context.bg_variant || 'primary'} text-#{context.text_variant || 'white'} text-center p-2 #{context.bs_class}", 
         style: "height: #{height}px; width: #{width}px; display: inline-block;" do
         plain context.text
       end
     else
-      div class: "rounded-circle text-#{context.text_variant || 'white'} text-center p-2 #{context.class}", 
+      div class: "rounded-circle text-#{context.text_variant || 'white'} text-center p-2 #{context.bs_class}", 
         style: "height: #{height}px; width: #{width}px; display: inline-block; background-image: url(#{context.img_path}); background-size: contain;" do
         plain context.text
       end
     end
   end
 
   def height
-    size || 40
+    context.size || 40
   end
 
   def width
-    size || 40
+    context.size || 40
   end
 
 end

app/concepts/matestack/ui/bootstrap/components/badge.rb

@@ -1,6 +1,6 @@
 class Matestack::Ui::Bootstrap::Components::Badge < Matestack::Ui::Bootstrap::BaseComponent
 
-  optional :class
+  optional class: { as:  :bs_class }
   optional :text, :variant, :rounded, :visually_hidden
 
   def response
@@ -24,7 +24,7 @@ def badge_classes
       classes << 'badge'
       classes << (context.variant.present? ? "bg-#{context.variant}" : "bg-secondary")
       classes << "rounded-pill" if context.rounded
-      classes << context.class
+      classes << context.bs_class
     end.join(' ').strip
   end
 end

app/concepts/matestack/ui/bootstrap/components/breadcrumb.rb

@@ -1,7 +1,7 @@
 class Matestack::Ui::Bootstrap::Components::Breadcrumb < Matestack::Ui::Bootstrap::BaseComponent
 
   optional :items # list of items  with path and text
-  optional :class # adding custom class to breadcrumb list
+  optional class: { as:  :bs_class } # adding custom class to breadcrumb list
   optional :nav_class
 
   def response
@@ -11,7 +11,7 @@ def response
           li link_attrs((context.items.size - 1) == index) do
             case item[:type]
             when :link
-              link item
+              a item
             when :transition
               transition item
             else
@@ -42,7 +42,7 @@ def breadcrumb_attributes
   def breadcrumb_classes
     [].tap do |classes|
       classes << "breadcrumb"
-      classes << context.class
+      classes << context.bs_class
     end.join(' ').strip
   end
 end

app/concepts/matestack/ui/bootstrap/components/button.rb

@@ -1,42 +1,42 @@
 class Matestack::Ui::Bootstrap::Components::Button < Matestack::Ui::Bootstrap::BaseComponent
 
   optional :text, :type, :variant, :size, :outline
-  optional :attributes, :class
+  optional :attributes, class: { as:  :bs_class }
   optional :transition 
   optional :action 
   optional :onclick 
   optional :link
 
-  def response
+  def response(&block)
     if context.transition.present? && context.transition.is_a?(Hash)
       transition button_attributes.merge(context.transition.merge({role: "button"})) do
-        inner_response
+        inner_response(&block)
       end
     elsif context.action.present? && context.action.is_a?(Hash)
       action button_attributes.merge(context.action.merge({role: "button"})) do
-        inner_response
+        inner_response(&block)
       end
     elsif context.onclick.present? && context.onclick.is_a?(Hash)
       onclick button_attributes.merge(context.onclick.merge({role: "button"})) do
-        inner_response
+        inner_response(&block)
       end
     elsif context.link.present? && context.link.is_a?(Hash)
-      link button_attributes.merge(context.link.merge({role: "button"})) do
-        inner_response
+      a button_attributes.merge(context.link.merge({role: "button"})) do
+        inner_response(&block)
       end
     else
-      button_response
+      button_response(&block)
     end
   end
 
-  def button_response
+  def button_response(&block)
     button button_attributes do
-      inner_response
+      inner_response(&block)
     end
   end
 
-  def inner_response
-    plain text if text
+  def inner_response(&block)
+    plain context.text if context.text
     yield if block_given?
   end
 
@@ -62,7 +62,7 @@ def button_classes
       # btn size
       classes << "btn-#{context.size}" if context.size
       # custom classes
-      classes << context.class
+      classes << context.bs_class
     end.join(' ').strip
   end
 

app/concepts/matestack/ui/bootstrap/components/button_group.rb

@@ -1,6 +1,6 @@
 class Matestack::Ui::Bootstrap::Components::ButtonGroup < Matestack::Ui::Bootstrap::BaseComponent
 
-  optional :class
+  optional class: { as:  :bs_class }
   optional :label
   optional :toolbar, :size, :vertical
 
@@ -16,7 +16,7 @@ def buttongroup_attributes
     attributes = {}.tap do |hash|
       hash[:class] = buttongroup_classes
       hash[:role] = "#{context.toolbar ? :toolbar : :group}"
-      hash[:"aria-label"] = 'aria-label': context.label  
+      hash[:"aria-label"] = context.label  
     end
     options.merge(
       attributes
@@ -27,7 +27,7 @@ def buttongroup_classes
     [].tap do |classes|
       classes << ("btn-#{context.toolbar ? :toolbar : :group}#{'-vertical' if context.vertical}")
       classes << "btn-group-#{context.size}" if context.size.present?
-      classes << context.class
+      classes << context.bs_class
     end.join(' ').strip
   end
 

app/concepts/matestack/ui/bootstrap/components/card.rb

@@ -1,6 +1,6 @@
 class Matestack::Ui::Bootstrap::Components::Card < Matestack::Ui::Bootstrap::BaseComponent
 
-  optional :class
+  optional class: { as:  :bs_class }
 
   # header attributes, expects a hash or string
   # possible keys `:class, :text`
@@ -14,25 +14,23 @@ class Matestack::Ui::Bootstrap::Components::Card < Matestack::Ui::Bootstrap::Bas
 
   optional :content_wrapper_class # class for content wrapper -> useful for content padding without affecting top image
 
-  optional :slots # passed in slots for card header or footer
-
   def response
     div card_attributes do
-      if context.header || context.slots && context.slots[:header]
+      if context.header || slots && slots[:header]
         header_partial
       end
 
       img_partial :top unless context.img_pos == :bottom
       div class: context.content_wrapper_class do
-        body_partial if context.title || context.body || context.slots && context.slots[:body]
+        body_partial if context.title || context.body || slots && slots[:body]
 
         # custom body components
         # needed a div otherwise it will be displayed below footer
         div class: "p-3 pt-1" do yield if block_given? end
 
         img_partial :bottom if context.img_pos == :bottom
 
-        footer_partial if context.footer || context.slots && context.slots[:footer]
+        footer_partial if context.footer || slots && slots[:footer]
       end
     end
   end
@@ -41,9 +39,9 @@ def response
 
   def header_partial
     header = self.context.header.is_a?(Hash) ? self.context.header : { text: self.context.header }
-    div class: "card-header #{context.header[:class]}" do
-      plain context.header[:text] if context.header[:text].present?
-      slot context.slots[:header] if context.slots && context.slots[:header]
+    div class: "card-header #{header[:class]}" do
+      plain header[:text] if header[:text].present?
+      slot :header if slots && slots[:header]
     end
   end
 
@@ -60,18 +58,18 @@ def body_partial
         end
       elsif context.body
         paragraph class: "card-text" do
-          plain body
+          plain context.body
         end
       end
-      slot context.slots[:body] if context.slots && context.slots[:body]
+      slot :body if slots && slots[:body]
     end
   end
 
   def footer_partial
     footer = self.context.footer.is_a?(Hash) ? self.context.footer : { text: self.context.footer }
-    div class: "card-footer #{context.footer[:class]}" do
-      plain context.footer[:text] if context.footer[:text].present?
-      slot context.slots[:footer] if context.slots && context.slots[:footer]
+    div class: "card-footer #{footer[:class]}" do
+      plain footer[:text] if footer[:text].present?
+      slot :footer if slots && slots[:footer]
     end
   end
 
@@ -88,14 +86,13 @@ def card_attributes
   def card_classes
     [].tap do |classes|
       classes << 'card'
-      classes << context.class
+      classes << context.bs_class
     end.join(' ').strip
   end
 
   def card_title(options, default_size = 5, title_class)
     if options.is_a? Hash
-      heading size: (context.size || default_size), class: "#{context.class} #{title_class}",
-        plain context.text
+      heading context.text, size: (context.size || default_size), class: "#{context.bs_class} #{title_class}"
     elsif options
       heading size: default_size, class: title_class do
         plain options