matestack-ui-core 0.7.3 → 0.7.4

data/app/concepts/matestack/ui/core/html/html.js

@@ -1,5 +1,5 @@
 import Vue from 'vue/dist/vue.esm'
-import componentMixin from 'component/component'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin]

data/app/concepts/matestack/ui/core/iframe/iframe.haml

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

data/app/concepts/matestack/ui/core/iframe/iframe.rb

@@ -0,0 +1,14 @@
+module Matestack::Ui::Core::Iframe
+  class Iframe < Matestack::Ui::Core::Component::Static
+
+    def setup
+      @tag_attributes.merge!({
+        src: options[:src],
+        height: options[:height],
+        width: options[:width],
+        srcdoc: options[:srcdoc]
+      })
+    end
+
+  end
+end

data/app/concepts/matestack/ui/core/js/core.js

@@ -1,19 +1,20 @@
 import Vue from 'vue/dist/vue.esm'
 
-import app from 'app/app'
-import async from 'async/async'
-import pageContent from 'page/content'
-import store from 'app/store'
-import component from 'component/component'
-import anonymDynamicComponent from 'component/anonym-dynamic-component'
-import html from 'html/html'
-import transition from 'transition/transition'
-import action from 'action/action'
-import form from 'form/form'
-import onclick from 'onclick/onclick'
-import collectionContent from 'collection/content/content'
-import collectionFilter from 'collection/filter/filter'
-import collectionOrder from 'collection/order/order'
+// Import from app/concepts/matestack/ui/core:
+import app from '../app/app'
+import async from '../async/async'
+import pageContent from '../page/content'
+import store from '../app/store'
+import component from '../component/component'
+import anonymDynamicComponent from '../component/anonym-dynamic-component'
+import html from '../html/html'
+import transition from '../transition/transition'
+import action from '../action/action'
+import form from '../form/form'
+import onclick from '../onclick/onclick'
+import collectionContent from '../collection/content/content'
+import collectionFilter from '../collection/filter/filter'
+import collectionOrder from '../collection/order/order'
 
 let matestackUiApp = undefined
 

data/app/concepts/matestack/ui/core/onclick/onclick.js

@@ -1,8 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
 
-import matestackEventHub from 'js/event-hub'
-
-import componentMixin from 'component/component'
+import matestackEventHub from '../js/event-hub'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],

data/app/concepts/matestack/ui/core/optgroup/optgroup.haml

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

data/app/concepts/matestack/ui/core/optgroup/optgroup.rb

@@ -0,0 +1,10 @@
+module Matestack::Ui::Core::Optgroup
+  class Optgroup < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        disabled: options[:disabled] ||= nil,
+        label: options[:label]
+      )
+    end
+  end
+end

data/app/concepts/matestack/ui/core/option/option.haml

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

data/app/concepts/matestack/ui/core/option/option.rb

@@ -0,0 +1,12 @@
+module Matestack::Ui::Core::Option
+  class Option < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        disabled: options[:disabled] ||= nil,
+        selected: options[:selected] ||= nil,
+        label: options[:label],
+        value: options[:value]
+      )
+    end
+  end
+end

data/app/concepts/matestack/ui/core/page/content.js

@@ -1,6 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
-import componentMixin from 'component/component'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],

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

@@ -2,9 +2,10 @@ module Matestack::Ui::Core::Page
   class Page < Trailblazer::Cell
 
     include ActionView::Helpers::TranslationHelper
-    include ::Cell::Haml
+    include Matestack::Ui::Core::Cell
     include Matestack::Ui::Core::ApplicationHelper
     include Matestack::Ui::Core::ToCell
+    include Matestack::Ui::Core::HasViewContext
 
     view_paths << "#{Matestack::Ui::Core::Engine.root}/app/concepts"
 
@@ -93,7 +94,7 @@ module Matestack::Ui::Core::Page
         begin
           render_child_component component_key
         rescue => e
-          raise "Component '#{component_key}' could not be resolved."
+          raise "Component '#{component_key}' could not be resolved, because of #{e},\n#{e.backtrace.join("\n")}"
         end
       end
     end

data/app/concepts/matestack/ui/core/picture/picture.haml

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

data/app/concepts/matestack/ui/core/picture/picture.rb

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

data/app/concepts/matestack/ui/core/plain/plain.rb

@@ -2,7 +2,7 @@ module Matestack::Ui::Core::Plain
   class Plain < Matestack::Ui::Core::Component::Static
 
     def show
-      @argument
+      html_escape @argument
     end
 
   end

data/app/concepts/matestack/ui/core/samp/samp.haml

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

data/app/concepts/matestack/ui/core/samp/samp.rb

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

data/app/concepts/matestack/ui/core/template/template.haml

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

data/app/concepts/matestack/ui/core/template/template.rb

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

data/app/concepts/matestack/ui/core/transition/transition.js

@@ -1,6 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
-import componentMixin from 'component/component'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],

data/app/concepts/matestack/ui/core/u/u.haml

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

data/app/concepts/matestack/ui/core/u/u.rb

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

data/app/concepts/matestack/ui/core/unescaped/unescaped.rb

@@ -0,0 +1,7 @@
+module Matestack::Ui::Core::Unescaped
+  class Unescaped < Matestack::Ui::Core::Component::Static
+    def show
+      @argument
+    end
+  end
+end

data/app/concepts/matestack/ui/core/wbr/wbr.haml

@@ -0,0 +1 @@
+%wbr{@tag_attributes}

data/app/concepts/matestack/ui/core/wbr/wbr.rb

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

data/app/helpers/matestack/ui/core/application_helper.rb

@@ -2,11 +2,13 @@ module Matestack
   module Ui
     module Core
       module ApplicationHelper
+        include Matestack::Ui::Core::Render
 
         def render_page(page_class, only_page=false)
           page_class.new(nil, context: {
             params: params,
-            request: request
+            request: request,
+            view_context: view_context
           }, controller_instance: self).call(:show, nil, only_page)
         end
 

data/app/javascript/matestack-ui-core/index.js

@@ -0,0 +1,22 @@
+import Vue from 'vue/dist/vue.esm'
+import Vuex from 'vuex'
+import axios from 'axios'
+
+// Import from app/concepts/matestack/ui/core:
+import matestackEventHub from '../../../app/concepts/matestack/ui/core/js/event-hub'
+import componentMixin from '../../../app/concepts/matestack/ui/core/component/component'
+import matestackUiCore from '../../../app/concepts/matestack/ui/core/js/core'
+
+import styles from './styles/index.scss'
+
+const MatestackUiCore = {
+  Vue,
+  Vuex,
+  axios,
+  matestackEventHub,
+  componentMixin
+}
+
+window.MatestackUiCore = MatestackUiCore
+
+export default MatestackUiCore

data/app/javascript/matestack-ui-core/styles/index.scss

@@ -0,0 +1,5 @@
+// glob imports are not supported out of the box.
+// 
+// @import "../../../concepts/matestack/ui/core/**/*.scss";
+// @import "../../../concepts/matestack/ui/core/**/*.sass";
+// @import "../../../concepts/matestack/ui/core/**/*.css";

data/app/javascript/packs/matestack-ui-core.js

@@ -0,0 +1,8 @@
+// // Add polyfills for the asset pipeline
+// // https://github.com/matestack/matestack-ui-core/issues/238#issuecomment-583905838
+//
+// import 'core-js/stable'
+// import 'regenerator-runtime/runtime'
+
+import '../matestack-ui-core/index'
+export default MatestackUiCore

data/app/lib/matestack/ui/core/component_node.rb

@@ -21,7 +21,11 @@ module Matestack::Ui::Core
 
     def method_missing meth, *args, &block
       begin
-        @component_instance.send(meth, *args, &block)
+        if (result = @component_instance.send(meth, *args, &block)).kind_of? ActiveSupport::SafeBuffer
+          plain result
+        else
+          result
+        end
       rescue
         node_id = @node_start_id + 1
         @node_start_id = node_id
@@ -32,6 +36,16 @@ module Matestack::Ui::Core
         @hash[current_node]["argument"] = nil
         @hash[current_node]["included_config"] = @included_config
 
+        if args.second == :include
+          included = args.first
+        else
+          unless @included_config.nil?
+            included = @included_config
+          else
+            included = nil
+          end
+        end
+
         if meth == :isolate
           raise("isolate > only works on page level currently. component support is comming soon!")
         end
@@ -48,15 +62,15 @@ module Matestack::Ui::Core
             @hash[current_node]["argument"] = args.first
           end
 
-          if args.second == :include
-            included = args.first
-          else
-            unless @included_config.nil?
-              included = @included_config
-            else
-              included = nil
-            end
-          end
+          # if args.second == :include
+          #   included = args.first
+          # else
+          #   unless @included_config.nil?
+          #     included = @included_config
+          #   else
+          #     included = nil
+          #   end
+          # end
 
           if block_given?
             @hash[current_node]["components"] = ComponentNode.build(@component_instance, included, &block)

data/app/lib/matestack/ui/core/has_view_context.rb

@@ -0,0 +1,10 @@
+module Matestack::Ui::Core::HasViewContext
+  def initialize(model = nil, options = {})
+    @view_context = options[:context][:view_context]
+    super
+  end
+
+  def method_missing(*args, &block)
+    @view_context.send(*args, &block)
+  end
+end

data/app/lib/matestack/ui/core/page_node.rb

@@ -22,7 +22,11 @@ module Matestack::Ui::Core
 
     def method_missing meth, *args, &block
       begin
-        @page_instance.send(meth, *args, &block)
+        if (result = @page_instance.send(meth, *args, &block)).kind_of? ActiveSupport::SafeBuffer
+          plain result
+        else
+          result
+        end
       rescue
         node_id = @node_start_id + 1
         @node_start_id = node_id

data/app/lib/matestack/ui/core/render.rb

@@ -0,0 +1,89 @@
+module Matestack::Ui::Core::Render
+
+  # Matestack allows you to use `render` to render matestack pages.
+  #
+  #     render Pages::Member::Bookings::Index
+  #     render matestack: Pages::Member::Bookings::Index
+  #     render matestack: 'member/bookings/index'
+  #
+  def render(*args)
+    if (matestack_class = args.first).is_a?(Class) && (matestack_class < Matestack::Ui::Page)
+      responder_for matestack_class
+    elsif (options = args.first).kind_of?(Hash) && (matestack_arg = options[:matestack]).present?
+      if (matestack_path = matestack_arg).kind_of? String
+        matestack_path = "pages/#{matestack_path}" unless matestack_path.start_with?("pages/") or matestack_path.start_with?("components/")
+        matestack_class = matestack_path.split("/").collect { |str| str.camelcase }.join("::").constantize
+      elsif matestack_arg.is_a?(Class) && (matestack_arg < Matestack::Ui::Page)
+        matestack_class = matestack_arg
+      end
+      responder_for matestack_class
+    else
+      super
+    end
+  end
+
+  # Matestack allows implicit rendering. The matestack page class name is inferred from the
+  # controller path and action name.
+  #
+  #     class Clients::BookingsController < ApplicationController
+  #       def index
+  #         @bookings = Booking.all
+  #         # looks for Pages::Clients::Bookings::Index
+  #       end
+  #
+  #       def show
+  #         @booking = Booking.find params[:id]
+  #         # looks for Pages::Clients::Bookings::Show
+  #       end
+  #     end
+  #
+  # In this example, `clients/bookings#index` will render `Pages::Clients::Bookings::Index`,
+  # `clients/bookings#show` will render `Pages::Clients::Bookings::Show`.
+  #
+  # Custom action names translate also into page names.
+  #
+  #     class Clients::BookingsController < ApplicationController
+  #       def step1
+  #         # looks for Pages::Clients::Bookings::Step1
+  #       end
+  #     end
+  #
+  # In this example, the `clients/bookings#step1` action will render
+  # `Pages::Clients::Bookings::Step1`.
+  #
+  def default_render(*args)
+    if matestack_page_class = default_render_matestack_page_class
+      render matestack: matestack_page_class
+    else
+      super
+    end
+  end
+
+  def possible_default_render_matestack_page_paths
+    paths = []
+    paths << "pages/#{controller_path}/#{action_name}"
+    paths << "pages/#{controller_path}" if action_name == "index"
+    paths << "pages/#{controller_path.singularize}" if action_name == "show"
+    paths << "#{controller_path}/#{action_name}_page"
+    paths << "#{controller_path}_page" if action_name == "index"
+    paths << "#{controller_path.singularize}_page" if action_name == "show"
+    paths
+  end
+
+  def possible_default_render_matestack_page_class_names
+    possible_default_render_matestack_page_paths.collect { |page_path|
+      page_path.split("/").collect { |str| str.camelcase }.join("::")
+    }
+  end
+
+  def default_render_matestack_page_class
+    possible_default_render_matestack_page_class_names.each do |class_name|
+      begin
+        return matestack_class = class_name.constantize
+      rescue NameError
+      end
+    end
+    return nil
+  end
+
+end