finalized preparation of repo/gem split, various refactorings, prepared version bumps

Author: jonasjabari

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (2.1.1)
+    matestack-ui-core (3.0.0)
       rails (>= 5.2)
 
 GEM

lib/matestack/ui/app.rb

@@ -1 +1 @@
-Matestack::Ui::App = Matestack::Ui::Core::App
+Matestack::Ui::App = Matestack::Ui::Core::Layout

lib/matestack/ui/core.rb

@@ -14,11 +14,12 @@ module Core
 require "#{base_path}/base"
 require "#{base_path}/component"
 require "#{base_path}/page"
-require "#{base_path}/app"
+require "#{base_path}/layout"
 require "#{base_path}/helper"
 
 # require abbreveations for apps, pages and components
-require "matestack/ui/app"
+require "matestack/ui/app" # deprecated
+require "matestack/ui/layout"
 require "matestack/ui/page"
 require "matestack/ui/component"
 
@@ -35,8 +36,8 @@ module VueJs
 require "#{vue_js_base_path}/utils"
 require "#{vue_js_base_path}/vue_attributes"
 require "#{vue_js_base_path}/vue"
-require "#{vue_js_base_path}/app"
-require "#{vue_js_base_path}/page"
+require "#{vue_js_base_path}/components/app"
+require "#{vue_js_base_path}/components/page_switch"
 require "#{vue_js_base_path}/components/toggle"
 require "#{vue_js_base_path}/components/onclick"
 require "#{vue_js_base_path}/components/transition"
@@ -70,3 +71,4 @@ module VueJs
 
 # require abbreveations for apps, pages and components
 require "matestack/ui/vue_js_component"
+require "matestack/ui/isolated_component"

lib/matestack/ui/core/helper.rb

@@ -2,22 +2,22 @@ module Matestack
   module Ui
     module Core
       module Helper
-        
+
         def self.included(base)
           base.extend ClassMethods
         end
-        
+
         module ClassMethods
           def inherited(subclass)
-            subclass.matestack_app(@matestack_app)
+            subclass.matestack_layout(@matestack_layout)
             super
           end
-          
-          def matestack_app(app = nil)
-            @matestack_app = app ? app : @matestack_app
+
+          def matestack_layout(layout = nil)
+            @matestack_layout = layout ? layout : @matestack_layout
           end
         end
-        
+
         def render(*args)
           setup_context
           if args.first.is_a?(Class) && args.first.ancestors.include?(Base)
@@ -30,62 +30,62 @@ def render(*args)
             end
 
             options = args.second || {}
-            app = options.delete(:matestack_app) || self.class.matestack_app
+            layout = options.delete(:matestack_layout) || self.class.matestack_layout
             page = args.first
 
             if controller_layout == false
-              layout = app ? app.layout : false
+              root_layout = layout ? layout.layout : false
             else
               if controller_layout.nil?
-                layout = "application"
+                root_layout = "application"
               else
-                layout = controller_layout
+                root_layout = controller_layout
               end
             end
-            
-            if app && params[:only_page].nil? && params[:component_key].nil? && params[:component_class].nil?
-              render_app app, page, options, layout
+
+            if layout && params[:only_page].nil? && params[:component_key].nil? && params[:component_class].nil?
+              render_layout layout, page, options, root_layout
             else
               if params[:component_key] && params[:component_class].nil?
-                render_component app, page, params[:component_key], options
+                render_component layout, page, params[:component_key], options
               elsif params[:component_class]
                 if params[:component_key]
                   render_component nil, params[:component_class].constantize, params[:component_key], JSON.parse(params[:public_options] || '{}')
-                else 
+                else
                   render html: params[:component_class].constantize.(public_options: JSON.parse(params[:public_options] || '{}'))
                 end
               else
                 if params[:only_page]
                   render_page page, options, false
                 else
-                  render_page page, options, layout
+                  render_page page, options, root_layout
                 end
               end
             end
           else
             super
           end
         end
-        
-        def render_app(app, page, options, layout)
-          render html: app.new(options) { page.new(options) }.render_content.html_safe, layout: layout
+
+        def render_layout(layout, page, options, root_layout)
+          render html: layout.new(options) { page.new(options) }.render_content.html_safe, layout: root_layout
         end
-        
-        def render_page(page, options, layout)
-          render html: page.new(options).render_content.html_safe, layout: layout
+
+        def render_page(page, options, root_layout)
+          render html: page.new(options).render_content.html_safe, layout: root_layout
         end
-        
-        def render_component(app, page, component_key, options)
-          app ? app.new(options) { page.new(options) } : page.new(options) # create page structure in order to later access registered async components
+
+        def render_component(layout, page, component_key, options)
+          layout ? layout.new(options) { page.new(options) } : page.new(options) # create page structure in order to later access registered async components
           render html: Matestack::Ui::Core::Context.async_components[component_key].render_content.html_safe, layout: false
         end
-        
+
         def setup_context
           Matestack::Ui::Core::Context.params = self.params
           Matestack::Ui::Core::Context.controller = (self.class <= ActionController::Base) ? self : @_controller
         end
-        
+
       end
     end
   end
-end
+end

lib/matestack/ui/core/app.rb renamed to lib/matestack/ui/core/layout.rb

@@ -1,7 +1,7 @@
 module Matestack
   module Ui
     module Core
-      class App < Base
+      class Layout < Base
 
         def initialize(options = {})
           @controller = Context.controller

lib/matestack/ui/core/version.rb

@@ -1,7 +1,7 @@
 module Matestack
   module Ui
     module Core
-      VERSION = '2.1.1'
+      VERSION = '3.0.0'
     end
   end
 end

lib/matestack/ui/isolated_component.rb

@@ -0,0 +1 @@
+Matestack::Ui::IsolatedComponent = Matestack::Ui::VueJs::Components::Isolated

lib/matestack/ui/layout.rb

@@ -0,0 +1 @@
+Matestack::Ui::Layout = Matestack::Ui::Core::Layout

lib/matestack/ui/page.rb

@@ -1 +1 @@
-Matestack::Ui::Page = Matestack::Ui::Core::Page
+Matestack::Ui::Page = Matestack::Ui::Core::Page