matestack-ui-core 1.0.0.rc.1 → 1.3.0

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

@@ -0,0 +1,28 @@
+module Matestack::Ui::Core::Cable
+  class Cable < Matestack::Ui::Core::Component::Dynamic
+    vue_js_component_name 'matestack-ui-core-cable'
+
+    requires :id
+
+    def setup
+      component_config[:component_key] = id
+    end
+    
+    def show
+      render :cable
+    end
+
+    def render_content
+      render :children_wrapper do
+        render :children
+      end
+    end
+
+    def children_wrapper_attributes
+      html_attributes.merge({
+        id: component_config[:component_key]
+      })
+    end
+
+  end
+end

data/app/concepts/matestack/ui/core/cable/children_wrapper.haml

@@ -0,0 +1,2 @@
+%div{ children_wrapper_attributes.merge(class: "matestack-cable-component-root") }
+  =yield

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

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

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

@@ -1,5 +1,5 @@
 module Matestack::Ui::Core::Caption
   class Caption < Matestack::Ui::Core::Component::Static
-
+    optional :text
   end
 end

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

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

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

@@ -1,5 +1,5 @@
 module Matestack::Ui::Core::Cite
   class Cite < Matestack::Ui::Core::Component::Static
-
+    optional :text
   end
 end

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

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

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

@@ -1,5 +1,5 @@
 module Matestack::Ui::Core::Code
   class Code < Matestack::Ui::Core::Component::Static
-
+    optional :text
   end
 end

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

@@ -2,10 +2,10 @@ import Vue from 'vue/dist/vue.esm'
 import matestackEventHub from '../../js/event-hub'
 import queryParamsHelper from '../../js/helpers/query-params-helper'
 import componentMixin from '../../component/component'
-import asyncMixin from '../../async/async'
+// import asyncMixin from '../../async/async'
 
 const componentDef = {
-  mixins: [componentMixin, asyncMixin],
+  mixins: [componentMixin],
   data: function(){
     return {
       currentLimit: null,

data/app/concepts/matestack/ui/core/collection/content/content.rb

@@ -1,5 +1,5 @@
 module Matestack::Ui::Core::Collection::Content
-  class Content < Matestack::Ui::Core::Component::Rerender
+  class Content < Matestack::Ui::Core::Component::Dynamic
     vue_js_component_name 'matestack-ui-core-collection-content'
 
     def setup
@@ -7,11 +7,9 @@ module Matestack::Ui::Core::Collection::Content
     end
 
     def response
-      components {
-        div @tag_attributes do
-          yield_components
-        end
-      }
+      div @tag_attributes do
+        yield_components
+      end
     end
 
   end

data/app/concepts/matestack/ui/core/collection/content/next/next.haml

@@ -1,3 +1,3 @@
-%a{@tag_attributes, "@click": "next()"}
+%a{ html_attributes , "@click": "next()" }
   - if block_given?
     = yield

data/app/concepts/matestack/ui/core/collection/content/page/link/link.haml

@@ -1,3 +1,3 @@
-%a{@tag_attributes, "@click": "goToPage(#{@options[:page]})"}
+%a{ html_attributes, "@click": "goToPage(#{page})" }
   - if block_given?
     = yield

data/app/concepts/matestack/ui/core/collection/content/page/link/link.rb

@@ -1,7 +1,7 @@
 module Matestack::Ui::Core::Collection::Content::Page
   module Link
     class Link::Link < Matestack::Ui::Core::Component::Static
-
+      requires :page
     end
   end
 end

data/app/concepts/matestack/ui/core/collection/content/previous/previous.haml

@@ -1,3 +1,3 @@
-%a{@tag_attributes, "@click": "previous()"}
+%a{ html_attributes, "@click": "previous()" }
   - if block_given?
     = yield

data/app/concepts/matestack/ui/core/collection/filter/filter.rb

@@ -7,7 +7,7 @@ module Matestack::Ui::Core::Collection::Filter
     end
 
     def response
-      div @tag_attributes do
+      div html_attributes do
         yield_components
       end
     end

data/app/concepts/matestack/ui/core/collection/filter/input/input.rb

@@ -1,24 +1,27 @@
 module Matestack::Ui::Core::Collection::Filter::Input
   class Input < Matestack::Ui::Core::Component::Static
+    include Matestack::Ui::Core::Form::HasInputHtmlAttributes
 
-    def setup
-      @tag_attributes.merge!({
-        "v-model#{'.number' if options[:type] == :number}": input_key,
-        type: options[:type],
-        class: options[:class],
+    requires :key, :type
+    optional :placeholder, class: { as: :klass }
+
+    def response
+      input html_attributes.merge(attributes: {
+        "v-model#{'.number' if type == :number}": input_key,
+        type: type,
         id: component_id,
         "@keyup.enter": "submitFilter()",
         ref: "filter.#{attr_key}",
-        placeholder: options[:placeholder]
+        placeholder: placeholder
       })
     end
 
     def input_key
-      'filter["' + options[:key].to_s + '"]'
+      'filter["' + key.to_s + '"]'
     end
 
     def attr_key
-      return options[:key].to_s
+      key.to_s
     end
 
   end

data/app/concepts/matestack/ui/core/collection/filter/reset/reset.haml

@@ -1,3 +1,3 @@
-%a{@tag_attributes, "@click": "resetFilter()"}
+%a{ html_attributes , "@click": "resetFilter()"}
   - if block_given?
     = yield

data/app/concepts/matestack/ui/core/collection/filter/select/select.haml

@@ -1,10 +1,10 @@
 - if options[:type] == :dropdown
 
-  %select{@tag_attributes}
-    %option{disabled: true}= options[:placeholder]
-    - if @options[:options].is_a?(Hash)
-      - @options[:options].each do |key, value|
+  %select{ select_attributes }
+    %option{disabled: true}= placeholder
+    - if select_options.is_a?(Hash)
+      - select_options.each do |key, value|
         %option{value: key}=value
-    - if @options[:options].is_a?(Array)
-      - @options[:options].each do |option|
+    - if select_options.is_a?(Array)
+      - select_options.each do |option|
         %option{value: option}=option

data/app/concepts/matestack/ui/core/collection/filter/select/select.rb

@@ -1,28 +1,29 @@
 module Matestack::Ui::Core::Collection::Filter::Select
   class Select < Matestack::Ui::Core::Component::Static
 
+    requires :key
+    optional :placeholder, options: { as: :select_options }
+
     def setup
       if options[:type].nil?
         options[:type] = :dropdown #nothing else supported at the moment
       end
-      @tag_attributes.merge!({
+    end
+
+    def select_attributes
+      html_attributes.merge!({
         "v-model#{'.number' if options[:type] == :number}": input_key,
         type: options[:type],
-        class: options[:class],
         id: component_id,
         "@keyup.enter": "submitFilter()",
         "@change": "$forceUpdate()",
-        ref: "filter.#{attr_key}",
-        placeholder: options[:placeholder]
+        ref: "filter.#{key.to_s}",
+        placeholder: placeholder
       })
     end
 
     def input_key
-      'filter["' + options[:key].to_s + '"]'
-    end
-
-    def attr_key
-      return options[:key].to_s
+      'filter["' + key.to_s + '"]'
     end
 
   end

data/app/concepts/matestack/ui/core/collection/filter/submit/submit.haml

@@ -1,3 +1,3 @@
-%a{@tag_attributes, "@click": "submitFilter()"}
+%a{ html_attributes, "@click": "submitFilter()" }
   - if block_given?
     = yield

data/app/concepts/matestack/ui/core/collection/order/order.rb

@@ -7,7 +7,7 @@ module Matestack::Ui::Core::Collection::Order
     end
 
     def response
-      div @tag_attributes do
+      div html_attributes do
         yield_components
       end
     end

data/app/concepts/matestack/ui/core/collection/order/toggle/indicator/indicator.rb

@@ -2,10 +2,13 @@ module Matestack::Ui::Core::Collection::Order::Toggle::Indicator
   class Indicator < Matestack::Ui::Core::Component::Static
 
     def response
-      span @tag_attributes do
+      span html_attributes do
         span attributes: {"v-if": "ordering['#{@component_config[:key]}'] === undefined"}, text: @component_config[:default]
         unescaped "{{
-          orderIndicator('#{@component_config[:key]}', { asc: '#{@component_config[:asc]}', desc: '#{@component_config[:desc]}'})
+          orderIndicator(
+            '#{@component_config[:key]}', 
+            { asc: '#{@component_config[:asc]}', desc: '#{@component_config[:desc]}'}
+          )
         }}"
       end
     end

data/app/concepts/matestack/ui/core/collection/order/toggle/toggle.haml

@@ -1,3 +1,3 @@
-%a{@tag_attributes, "@click": "toggleOrder(\"#{@component_config[:key]}\")"}
+%a{ html_attributes, "@click": "toggleOrder(\"#{@component_config[:key]}\")" }
   - if block_given?
     = yield

data/app/concepts/matestack/ui/core/collection/order/toggle/toggle.rb

@@ -1,5 +1,4 @@
 module Matestack::Ui::Core::Collection::Order::Toggle
   class Toggle < Matestack::Ui::Core::Component::Static
-
   end
 end

data/app/concepts/matestack/ui/core/component/base.rb

@@ -4,12 +4,11 @@ module Matestack::Ui::Core::Component
     include Matestack::Ui::Core::HasViewContext
     include Matestack::Ui::Core::HtmlAttributes
     include Matestack::Ui::Core::Properties
+    include Matestack::Ui::Core::DSL
 
     # define html global attributes
     html_attributes *HTML_GLOBAL_ATTRIBUTES, *HTML_EVENT_ATTRIBUTES
 
-    # probably need to remove for other tests to be green again
-    include Matestack::Ui::Core::DSL
 
     view_paths << "#{Matestack::Ui::Core::Engine.root}/app/concepts"
     view_paths << "#{::Rails.root}#{'/' unless ::Rails.root.nil?}app/matestack"
@@ -99,6 +98,11 @@ module Matestack::Ui::Core::Component
     def get_included_config
       @included_config
     end
+    alias :included_config :get_included_config
+
+    def component_config
+      @component_config
+    end
 
     # TODO: modifies/recreates view lookup paths on every invocation?!
     # At least memoize it I guess...
@@ -161,8 +165,10 @@ module Matestack::Ui::Core::Component
     def params
       if @matestack_context.present? && @matestack_context[:controller].present?
         @matestack_context[:controller].params
-      else
+      elsif context.present? && context[:params]
         context[:params]
+      else
+        ActionController::Parameters.new({})
       end
     end
 
@@ -239,7 +245,7 @@ module Matestack::Ui::Core::Component
 
       # check only allowed keys are passed to isolated components
       if child_class < Matestack::Ui::Core::Isolated::Isolated
-        unless args.empty? || args[0].keys.all? { |key| [:defer, :public_options, :rerender_on, :init_on, :rerender_delay, :matestack_context].include? key }
+        unless args.empty? || args[0].keys.all? { |key| [:defer, :public_options, :rerender_on, :init_on, :rerender_delay, :matestack_context, :context].include? key }
           raise "isolated components can only take params in a public_options hash, which will be exposed to the client side in order to perform an async request with these params."
         end
         if args.any? { |arg| arg[:init_on].present? } && @matestack_skip_defer == true

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

@@ -1,5 +1,22 @@
+import matestackEventHub from '../js/event-hub'
+
 const componentMixin = {
-  props: ['componentConfig', 'params']
+  props: ['componentConfig', 'params'],
+  methods: {
+    registerEvents: function(events, callback){
+      if(events != undefined){
+        var event_names = events.split(",")
+        event_names.forEach(event_name => matestackEventHub.$on(event_name.trim(), callback));
+      }
+    },
+    removeEvents: function(events, callback){
+      if(events != undefined){
+        var event_names = events.split(",")
+        event_names.forEach(event_name => matestackEventHub.$off(event_name.trim(), callback));
+      }
+    }
+  }
+
 }
 
 export default componentMixin

data/app/concepts/matestack/ui/core/component/dynamic.rb

@@ -16,7 +16,7 @@ module Matestack::Ui::Core::Component
         "is": get_vue_js_name,
         "ref": component_id,
         ":params":  params.except(:controller, :action).to_json,
-        ":component-config": @component_config.to_json,
+        ":component-config": component_config.to_json,
         "inline-template": true,
       }
       attrs.merge!(options[:attributes]) unless options[:attributes].nil?
@@ -30,6 +30,7 @@ module Matestack::Ui::Core::Component
     class << self
 
       def inherited(subclass)
+        super # do not overwrite inherited implementation of Base
         subclass.vue_js_component_name vue_js_name unless self == Matestack::Ui::Core::Component::Dynamic
       end
 

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

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

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

@@ -1,9 +1,6 @@
 module Matestack::Ui::Core::Data
   class Data < Matestack::Ui::Core::Component::Static
-    def setup
-      @tag_attributes.merge!({
-        "value": options[:value] ||= nil
-      })
-    end
+    html_attributes :value
+    optional :text
   end
 end

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

@@ -1,3 +1,3 @@
-%datalist{@tag_attributes}
+%datalist{ html_attributes }
   - if block_given?
-    = yield
+    = yield

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

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

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

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

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

@@ -1,5 +1,5 @@
 module Matestack::Ui::Core::Dd
   class Dd < Matestack::Ui::Core::Component::Static
-
+    optional :text
   end
 end