fixed rest of failing specs, adjusted rendering in order to match previous rendering behavior

Author: jonasjabari

lib/matestack/ui/core/base.rb

@@ -30,12 +30,12 @@ def initialize(html_tag = nil, text = nil, options = {}, &block)
         def extract_options(text, options)
           if text.is_a? Hash
             # we need to dup the text object because we're deleting keys from this object which manipulates the object passed in here
-            # if this object is reused after beeing injected into this component, the keys would be missing 
-            self.options = text.dup 
+            # if this object is reused after beeing injected into this component, the keys would be missing
+            self.options = text.dup
           else
             self.text = text
             # we need to dup the options object because we're deleting keys from this object which manipulates the object passed in here
-            # if this object is reused after beeing injected into this component, the keys would be missing 
+            # if this object is reused after beeing injected into this component, the keys would be missing
             self.options = options.dup || {}
           end
           self.options.symbolize_keys!
@@ -68,12 +68,13 @@ def render_content
           if children.empty?
             child_content = self.escape ? ERB::Util.html_escape(text) : text if text
           else
-            child_content = children.map { |child| child.render_content }.join.html_safe
+            # using "\n" in order to preserve the 1.x rendering behavior which impacts appearance in browser
+            child_content = (children.map { |child| " \n " + child.render_content }.join + " \n ").html_safe
           end
           result = ''
           if self.html_tag
             result = tag.public_send(self.html_tag, child_content, self.options || {})
-          else
+          elsif child_content
             result = child_content
           end
           result

lib/matestack/ui/core/properties.rb

@@ -2,39 +2,38 @@ module Matestack
   module Ui
     module Core
       module Properties
-        
+
         def self.included(base)
           base.extend ClassMethods
           base.send :prepend, Initializer
         end
-        
+
         module Initializer
           def initialize(html_tag = nil, text = nil, options = {}, &block)
             extract_options(text, options)
             create_context
-            warn "[DEPRECATION] passing text with option :text is deprecated. Please pass text as first argument." if self.options.has_key?(:text)
+            # warn "[DEPRECATION] passing text with option :text is deprecated. Please pass text as first argument." if self.options.has_key?(:text)
             self.text = self.options.delete(:text) if self.options.has_key?(:text)
             super
           end
         end
-        
+
         module ClassMethods
           extend Gem::Deprecate
 
           def required(*args)
             @required = (@required || []).concat(args)
           end
           alias requires required
-          deprecate :requires, :required, 2021, 10
 
           def optional(*args)
             @optional = (@optional || []).concat(args)
           end
-          
+
           def required_property_keys
             @required
           end
-      
+
           def optional_property_keys
             @optional
           end
@@ -45,20 +44,20 @@ def inherited(subclass)
             super
           end
         end
-    
-        def context 
+
+        def context
           @context ||= OpenStruct.new
         end
         alias :ctx :context
-        
+
         def required_property_keys
           self.class.required_property_keys || []
         end
-        
+
         def optional_property_keys
           self.class.optional_property_keys || []
         end
-        
+
         def create_context
           create_context_for_properties(self.required_property_keys, required: true)
           create_context_for_properties(self.optional_property_keys)
@@ -78,8 +77,8 @@ def create_context_for_properties(properties, required: false)
             end
           end if properties
         end
-    
+
       end
     end
   end
-end
+end

lib/matestack/ui/core/tag_helper.rb

@@ -5,35 +5,34 @@ module Core
       module TagHelper
         extend Gem::Deprecate
         include Slots
-        
+
         # can't take content or a block
         VOID_TAGS = %i[area base br col hr img input link meta param command keygen source]
-        
+
         TAGS = [:a, :abbr, :acronym, :address, :applet, :area, :article, :aside, :audio, :b, :base, :basefont, :bdi, :bdo, :big, :blockquote, :body, :br, :button, :canvas, :caption, :center, :cite, :code, :col, :colgroup, :data, :datalist, :dd, :del, :details, :dfn, :dialog, :dir, :div, :dl, :dt, :em, :embed, :fieldset, :figcaption, :figure, :font, :footer, :form, :frame, :frameset, :h1, :h2, :h3, :h4, :h5, :h6, :head, :header, :hr, :html, :i, :iframe, :img, :input, :ins, :kbd, :label, :legend, :li, :link, :main, :map, :mark, :meta, :meter, :nav, :noframes, :noscript, :object, :ol, :optgroup, :option, :output, :paragraph, :param, :picture, :pre, :progress, :q, :rp, :rt, :ruby, :s, :samp, :script, :section, :select, :small, :source, :span, :strike, :strong, :style, :sub, :summary, :sup, :svg, :table, :tbody, :td, :template, :textarea, :tfoot, :th, :thead, :time, :title, :tr, :track, :tt, :u, :ul, :var, :video, :wbr]
-        
+
         VOID_TAGS.each do |tag|
           define_method tag do |options = {}|
             Matestack::Ui::Core::Base.new(tag, nil, options)
           end
         end
-        
+
         TAGS.each do |tag|
           define_method tag do |text = nil, options = {}, &block|
             tag = :p if tag == :paragraph
             Matestack::Ui::Core::Base.new(tag, text, options, &block)
           end
         end
-        
+
         def plain(text)
           Matestack::Ui::Core::Base.new(nil, text, nil)
         end
-        
+
         def unescape(text)
           Matestack::Ui::Core::Base.new(nil, text&.html_safe, escape: false)
         end
         alias unescaped unescape
-        deprecate :unescaped, :unescape, 2021, 10
-        
+
         def matestack(&block)
           div(id: 'matestack-ui') do
             Base.new(:component, component_attributes) do
@@ -61,11 +60,35 @@ def a(text = nil, options = {}, &block)
           Matestack::Ui::Core::Base.new(:a, text, options, &block)
         end
 
+        # support old heading component
+        def heading(text = nil, options=nil, &block)
+          if text.is_a?(Hash)
+            options = text
+          end
+
+          case options[:size]
+          when 1
+            h1(text, options, &block)
+          when 2
+            h2(text, options, &block)
+          when 3
+            h3(text, options, &block)
+          when 4
+            h4(text, options, &block)
+          when 5
+            h5(text, options, &block)
+          when 6
+            h6(text, options, &block)
+          else
+            h1(text, options, &block)
+          end
+        end
+
         def rails_render(options = {})
           plain render options
         end
 
       end
     end
   end
-end
+end

lib/matestack/ui/vue_js/components/collection/order_toggle_indicator.rb

@@ -5,7 +5,8 @@ module Components
         module Collection
           class OrderToggleIndicator < Matestack::Ui::Component
 
-            required :key, :asc, :desc, :default
+            required :key, :asc, :desc
+            optional :default
 
             def response
               span do

spec/dummy/app/controllers/legacy_views/pages_controller.rb

@@ -1,6 +1,7 @@
 class LegacyViews::PagesController < ApplicationController
   include Matestack::Ui::Core::Helper
-  # include Matestack::Ui::Core::Collection::Helper
+  include Matestack::Ui::VueJs::Components::Collection::Helper
+
   layout 'legacy_views'
 
   def action_inline

spec/dummy/app/matestack/app.rb

@@ -1,17 +1,7 @@
 class App < Matestack::Ui::App
 
   def response
-    html do
-      head do
-        unescape csrf_meta_tags
-        unescape Matestack::Ui::Core::Context.controller.view_context.javascript_pack_tag(:application)
-      end
-    end
-    body do
-      matestack do
-        yield
-      end
-    end
+    yield
   end
 
-end
+end

spec/dummy/app/matestack/components/legacy_views/pages/collection.rb

@@ -1,36 +1,35 @@
-class Components::LegacyViews::Pages::Collection < Matestack::Ui::StaticComponent
+class Components::LegacyViews::Pages::Collection < Matestack::Ui::Component
+
   requires :collection_config
 
   def response
     heading size: 2, text: 'My Collection'
     filter
-    async rerender_on: "#{collection_config.id}-update", id: 'async-collection' do
+    async rerender_on: "#{context.collection_config.id}-update", id: 'async-collection' do
       content
     end
   end
 
   private
 
   def filter
-    collection_filter collection_config.config do 
-      collection_filter_input key: :title, type: :text, placeholder: "Filter by Title", label: 'Title', id: 'title-filter'
-      collection_filter_submit do
-        button text: "filter"
-      end
+    collection_filter context.collection_config.config do
+      form_input key: :title, type: :text, placeholder: "Filter by Title", label: 'Title', id: 'title-filter'
+      button text: "filter", type: "submit"
       collection_filter_reset do
         button text: "reset"
       end
     end
   end
 
   def content
-    collection_content collection_config.config do
+    collection_content context.collection_config.config do
       ul do
-        collection_config.data.each do |dummy|
+        context.collection_config.data.each do |dummy|
           li text: dummy.title
         end
       end
     end
   end
 
-end
+end

spec/dummy/app/views/legacy_views/pages/collection_custom_component.html.erb

@@ -1,2 +1,2 @@
 <h1>Collection Custom Component</h1>
-<%= matestack_component(:legacy_views_pages_collection, collection_config: @my_collection) %>
+<%= Components::LegacyViews::Pages::Collection.(collection_config: @my_collection) %>

spec/test/base/core/render/app_resolving_spec.rb

@@ -21,7 +21,7 @@
     Rails.application.reload_routes!
   end
 
-  it "wraps a Page with a minimal default App when no App is explicitly specified" do
+  it "does not wrap a Page with a minimal default App when no App is explicitly specified" do
 
     class ExamplePage < Matestack::Ui::Page
 
@@ -47,8 +47,9 @@ def example
 
     visit "render_app_resolving_spec/example_a"
 
-    # dom structure implies correct rendering with wrapping minimal app
-    text = find(:xpath, 'id("matestack-ui")/div[@class="matestack-app-wrapper"]/div[@class="matestack-page-container"]/div[@class="matestack-page-wrapper"]/div/div[@class="matestack-page-root"]/div[1]').text
+    expect(page).not_to have_selector('div.matestack-app-wrapper')
+
+    text = find(:xpath, 'id("matestack-ui")/div[@class="matestack-page-container"]/div[@class="matestack-page-wrapper"]/div/div[@class="matestack-page-root"]/div[1]').text
     expect(text).to eq("hello from page")
   end
 
@@ -166,43 +167,6 @@ def second_example
     expect(text).to eq("hello from page")
   end
 
-  it "does not wrap a Page with an App when explicitly set to false" do
-
-    class ExamplePage < Matestack::Ui::Page
-      def response
-        matestack do
-          div do
-            plain "hello from page"
-          end
-        end
-      end
-    end
-
-    # otherwise the matestack_app_class class var would be set as specified in the former spec
-    class RenderTestDController < ActionController::Base
-      include Matestack::Ui::Core::Helper
-      layout "application"
-
-      def example
-        render ExamplePage # should be wrapped by a minimal default
-      end
-
-      def second_example
-        render ExamplePage, matestack_app: false # should not be wrapped by an app at all
-      end
-    end
-
-    visit "render_app_resolving_spec/example_d"
-    # dom structure implies correct rendering with wrapping specified app
-    text = find(:xpath, 'id("matestack-ui")//div[@class="matestack-app-wrapper"]/div[@class="matestack-page-container"]//div[@class="matestack-page-wrapper"]/div/div[@class="matestack-page-root"]/div[1]').text
-    expect(text).to eq("hello from page")
-
-    visit "render_app_resolving_spec/second_example_d"
-    # dom structure implies correct rendering without app
-    text = find(:xpath, '//div[@class="matestack-page-root"]/div').text
-    expect(text).to eq("hello from page")
-  end
-
   describe "is compatible with 0.7.x namespacing approach" do
 
     it "when app is defined on controller (top) level" do

spec/test/components/div_spec.rb

@@ -19,6 +19,7 @@ def response
     end
 
     visit "/example"
+
     static_output = page.html
     expected_static_output = <<~HTML
       <div></div>