updated to fresh 2.0.0 core release and made adjustments according to changed from core 2.0.0

Author: jonasjabari

Gemfile

@@ -23,7 +23,6 @@ gemspec
 
 gem 'rails', '6.1.2'
 
-gem 'matestack-ui-core', git: "https://github.com/matestack/matestack-ui-core", branch: "2.0.0"
 
 gem 'rspec-rails', '~> 4.0.2'
 gem 'capybara'

Gemfile.lock

@@ -1,15 +1,8 @@
-GIT
-  remote: https://github.com/matestack/matestack-ui-core
-  revision: fc89a8a8dd61b88a764aac41d90b228951d28288
-  branch: matestack-ui-core-2.0
-  specs:
-    matestack-ui-core (2.0.0)
-      rails (>= 5.2)
-
 PATH
   remote: .
   specs:
-    matestack-ui-bootstrap (1.5.1)
+    matestack-ui-bootstrap (2.0.0)
+      matestack-ui-core (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -76,7 +69,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     bcrypt (3.1.16)
-    bootsnap (1.7.2)
+    bootsnap (1.7.3)
       msgpack (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
@@ -103,35 +96,39 @@ GEM
     diff-lcs (1.4.4)
     docile (1.3.5)
     erubi (1.10.0)
-    faker (2.16.0)
+    faker (2.17.0)
       i18n (>= 1.6, < 2)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashdiff (1.0.1)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
+    matestack-ui-core (2.0.0)
+      rails (>= 5.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.1.0)
     mini_portile2 (2.5.0)
     minitest (5.14.4)
     msgpack (1.4.2)
     nio4r (2.5.7)
-    nokogiri (1.11.2)
+    nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    paper_trail (11.1.0)
+    paper_trail (12.0.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
     pg (1.2.3)
@@ -144,7 +141,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (5.2.1)
+    puma (5.2.2)
       nio4r (~> 2.0)
     racc (1.5.2)
     rack (2.2.3)
@@ -181,13 +178,13 @@ GEM
     rake (13.0.3)
     redcarpet (3.5.1)
     redis (4.2.5)
-    regexp_parser (2.0.3)
+    regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rouge (3.26.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -218,7 +215,7 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    semantic_range (2.3.1)
+    semantic_range (3.0.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -237,7 +234,7 @@ GEM
       concurrent-ruby (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webmock (3.11.2)
+    webmock (3.12.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -264,7 +261,6 @@ DEPENDENCIES
   faker
   generator_spec
   matestack-ui-bootstrap!
-  matestack-ui-core!
   paper_trail
   pg (>= 0.18, < 2.0)
   pry-byebug

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

@@ -1,5 +1,7 @@
 class Matestack::Ui::Bootstrap::Apps::AdminTemplate < Matestack::Ui::App
 
+  include Matestack::Ui::Bootstrap::Registry
+
   def response(&block)
     matestack do
       body_response(&block)

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

@@ -31,25 +31,25 @@ Vue.component('matestack-ui-bootstrap-alert', {
   created: function() {
     const self = this
     // close_on event registration
-    if(self.componentConfig["close_on"] != undefined){
-      var close_events = self.componentConfig["close_on"].split(",")
+    if(self.props["close_on"] != undefined){
+      var close_events = self.props["close_on"].split(",")
       close_events.forEach(close_event => MatestackUiCore.matestackEventHub.$on(close_event.trim(), self.close));
     }
     // dispose_on event registration
-    if(self.componentConfig["dispose_on"] != undefined){
-      var dispose_events = self.componentConfig["dispose_on"].split(",")
+    if(self.props["dispose_on"] != undefined){
+      var dispose_events = self.props["dispose_on"].split(",")
       dispose_events.forEach(dispose_event => MatestackUiCore.matestackEventHub.$on(dispose_event.trim(), self.dispose));
     }
   },
 
   beforeDestroy: function() {
     const self = this
-    if(self.componentConfig["close_on"] != undefined){
-      var closen_events = self.componentConfig["close_on"].split(",")
+    if(self.props["close_on"] != undefined){
+      var closen_events = self.props["close_on"].split(",")
       closen_events.forEach(close_event => MatestackUiCore.matestackEventHub.$off(close_event.trim(), self.close));
     }
-    if(self.componentConfig["dispose_on"] != undefined){
-      var dispose_events = self.componentConfig["dispose_on"].split(",")
+    if(self.props["dispose_on"] != undefined){
+      var dispose_events = self.props["dispose_on"].split(",")
       dispose_events.forEach(dispose_event => MatestackUiCore.matestackEventHub.$off(dispose_event.trim(), self.dispose));
     }
   },

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

@@ -1,7 +1,7 @@
 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: { as:  :bs_class }
+  optional :title, :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
@@ -15,7 +15,7 @@ def response
 
   protected
 
-  def config
+  def vue_props
     {}.tap do |props|
       props[:close_on] = context.close_on
       props[:dispose_on] = context.dispose_on

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

@@ -1,15 +1,15 @@
 class Matestack::Ui::Bootstrap::Components::Avatar < Matestack::Ui::Bootstrap::BaseComponent
 
-  optional :text, :bg_variant, :text_variant, :img_path, :size, class: { as:  :bs_class }
+  optional :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.bs_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.bs_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

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

@@ -1,7 +1,7 @@
 class Matestack::Ui::Bootstrap::Components::Badge < Matestack::Ui::Bootstrap::BaseComponent
 
   optional class: { as:  :bs_class }
-  optional :text, :variant, :rounded, :visually_hidden
+  optional :variant, :rounded, :visually_hidden
 
   def response
     span badge_attributes do

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

@@ -1,10 +1,10 @@
 class Matestack::Ui::Bootstrap::Components::Button < Matestack::Ui::Bootstrap::BaseComponent
 
-  optional :text, :type, :variant, :size, :outline
+  optional :type, :variant, :size, :outline
   optional :attributes, class: { as:  :bs_class }
-  optional :transition 
-  optional :action 
-  optional :onclick 
+  optional :transition
+  optional :action
+  optional :onclick
   optional :link
 
   def response(&block)

app/concepts/matestack/ui/bootstrap/components/carousel.js

@@ -34,48 +34,48 @@ Vue.component('matestack-ui-bootstrap-carousel', {
     const self = this;
     var myCarousel = self.$el;
     self.carouselInstance = new bootstrap.Carousel(myCarousel, {
-      interval: (self.componentConfig['interval'] || 5000)
+      interval: (self.props['interval'] || 5000)
     })
   },
 
   created: function() {
     const self = this
-    if(self.componentConfig["cycle_on"] != undefined){
-      var cycle_events = self.componentConfig["cycle_on"].split(",")
+    if(self.props["cycle_on"] != undefined){
+      var cycle_events = self.props["cycle_on"].split(",")
       cycle_events.forEach(cycle_event => MatestackUiCore.matestackEventHub.$on(cycle_event.trim(), self.cycle));
     }
-    if(self.componentConfig["pause_on"] != undefined){
-      var pause_events = self.componentConfig["pause_on"].split(",")
+    if(self.props["pause_on"] != undefined){
+      var pause_events = self.props["pause_on"].split(",")
       pause_events.forEach(pause_event => MatestackUiCore.matestackEventHub.$on(pause_event.trim(), self.pause));
     }
-    if(self.componentConfig["prev_on"] != undefined){
-      var prev_events = self.componentConfig["prev_on"].split(",")
+    if(self.props["prev_on"] != undefined){
+      var prev_events = self.props["prev_on"].split(",")
       prev_events.forEach(prev_event => MatestackUiCore.matestackEventHub.$on(prev_event.trim(), self.prev));
     }
-    if(self.componentConfig["next_on"] != undefined){
-      var next_events = self.componentConfig["next_on"].split(",")
+    if(self.props["next_on"] != undefined){
+      var next_events = self.props["next_on"].split(",")
       next_events.forEach(next_event => MatestackUiCore.matestackEventHub.$on(next_event.trim(), self.next));
     }
   },
 
   beforeDestroy: function() {
     const self = this
-    if(self.componentConfig["cycle_on"] != undefined){
-      var cycle_events = self.componentConfig["cycle_on"].split(",")
+    if(self.props["cycle_on"] != undefined){
+      var cycle_events = self.props["cycle_on"].split(",")
       cycle_events.forEach(cycle_event => MatestackUiCore.matestackEventHub.$off(cycle_event.trim(), self.cycle));
     }
 
-    if(self.componentConfig["pause_on"] != undefined){
-      var pause_events = self.componentConfig["pause_on"].split(",")
+    if(self.props["pause_on"] != undefined){
+      var pause_events = self.props["pause_on"].split(",")
       pause_events.forEach(pause_event => MatestackUiCore.matestackEventHub.$off(pause_event.trim(), self.pause));
     }
 
-    if(self.componentConfig["prev_on"] != undefined){
-      var prev_events = self.componentConfig["prev_on"].split(",")
+    if(self.props["prev_on"] != undefined){
+      var prev_events = self.props["prev_on"].split(",")
       prev_events.forEach(prev_event => MatestackUiCore.matestackEventHub.$off(prev_event.trim(), self.prev));
     }
-    if(self.componentConfig["next_on"] != undefined){
-      var next_events = self.componentConfig["next_on"].split(",")
+    if(self.props["next_on"] != undefined){
+      var next_events = self.props["next_on"].split(",")
       next_events.forEach(next_event => MatestackUiCore.matestackEventHub.$off(next_event.trim(), self.next));
     }
   },

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

@@ -22,7 +22,7 @@ def response
 
   protected
 
-  def config
+  def vue_props
     {}.tap do |props|
       props["carousel-id"] = carousel_id
       props[:interval] = context.interval