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

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

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

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

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

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

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

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

@@ -1,3 +1,3 @@
-%video{@tag_attributes}
-  %source{:src => @source, :type => @type}
+%video{ html_attributes }
+  %source{ src: @source, type: @type}
   Your browser does not support the video tag.

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

@@ -1,22 +1,12 @@
 module Matestack::Ui::Core::Video
   class Video < Matestack::Ui::Core::Component::Static
+    html_attributes :autoplay, :controls, :height, :loop, :muted, :poster, :preload, :src, :width
 
     requires :path, :type
 
     def setup
-      @tag_attributes.merge!({
-        autoplay: options[:autoplay],
-        controls: options[:controls],
-        height: options[:height],
-        loop: options[:loop],
-        muted: options[:muted],
-        playsinline: options[:playsinline],
-        preload: options[:preload],
-        width: options[:width]
-      })
-
-      @source = ActionController::Base.helpers.asset_path(options[:path])
-      @type = "video/#{@options[:type]}"
+      @source = ActionController::Base.helpers.asset_path(path)
+      @type = "video/#{type}"
     end
 
   end

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

@@ -1 +1,5 @@
-%wbr{@tag_attributes}
+%wbr{ html_attributes }
+  - if text.nil? && block_given?
+    = yield
+  - else
+    = text

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

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

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

@@ -1 +1 @@
-%iframe{@tag_attributes}
+%iframe{ youtube_attributes }

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

@@ -1,25 +1,27 @@
 module Matestack::Ui::Core::Youtube
   class Youtube < Matestack::Ui::Core::Component::Static
+    html_attributes :allow, :allowfullscreen, :allowpaymentrequest, :height, :name, 
+      :referrerpolicy, :sandbox, :src, :srcdoc, :width
 
-    requires :yt_id, :height, :width
+    requires :youtube_id
+    optional :privacy_mode, :no_controls, :start_at
 
     def setup
-      url = 'https://www.youtube.com/embed/'
-      url = 'https://www.youtube-nocookie.com/embed/' if options[:privacy_mode] == true
-      url << options[:yt_id]
-      url << '?' unless options[:no_controls] != true and options[:start_at].nil?
-      url << 'controls=0' if options[:no_controls] == true
-      url << '&amp;' if (options[:no_controls] != nil) and (options[:start_at] != nil)
-      url << "start=#{options[:start_at]}" unless options[:start_at].nil?
+      url = privacy_mode ? 'https://www.youtube-nocookie.com/embed/' : 'https://www.youtube.com/embed/'
+      @uri = URI("#{url}#{youtube_id}")
+      @uri.query = { 
+        controls: (no_controls ? 0 : 1),
+        start: start_at
+      }.to_query
+    end
 
-      @tag_attributes.merge!({
-        'src': url,
-        'allow': 'accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture',
-        'allowfullscreen': '',
-        'frameborder': 0,
-        'height': options[:height],
-        'width': options[:width]
-      })
+    def youtube_attributes
+      html_attributes.merge(
+        src: @uri.to_s,
+        allow: 'accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture',
+        allowfullscreen: '',
+        frameborder: 0,
+      )
     end
 
   end

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

@@ -14,6 +14,7 @@ module Matestack
         def self.included(base)
           base.extend(ClassMethods)
         end
+
         module ClassMethods
           def matestack_app _class
             @matestack_app_class = _class
@@ -98,8 +99,11 @@ module Matestack
         end
 
         def matestack_component(component, options = {}, &block)
-          context = (options[:matestack_context] ||= {}).merge(controller: @_controller)
-          Matestack::Ui::Core::Component::Base.new(options.merge(matestack_context: context)).send(component, options.merge(matestack_context: context), &block)
+          controller = (self.class <= ActionController::Base) ? self : @_controller
+          context = (options[:matestack_context] ||= {}).merge(controller: controller)
+          Matestack::Ui::Core::Component::Base
+            .new(options.merge(context: context, matestack_context: context))
+            .send(component, options.merge(context: context, matestack_context: context), &block).to_s
         end
       end
     end

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

@@ -5,6 +5,11 @@ 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 formInputMixin from '../../../app/concepts/matestack/ui/core/form/input/mixin'
+import formSelectMixin from '../../../app/concepts/matestack/ui/core/form/select/mixin'
+import formRadioMixin from '../../../app/concepts/matestack/ui/core/form/radio/mixin'
+import formCheckboxMixin from '../../../app/concepts/matestack/ui/core/form/checkbox/mixin'
+import formTextareaMixin from '../../../app/concepts/matestack/ui/core/form/textarea/mixin'
 import matestackUiCore from '../../../app/concepts/matestack/ui/core/js/core'
 
 import styles from './styles/index.scss'
@@ -14,9 +19,14 @@ const MatestackUiCore = {
   Vuex,
   axios,
   matestackEventHub,
-  componentMixin
+  componentMixin,
+  formInputMixin,
+  formSelectMixin,
+  formCheckboxMixin,
+  formTextareaMixin,
+  formRadioMixin
 }
 
 window.MatestackUiCore = MatestackUiCore
 
-export default MatestackUiCore
+export default MatestackUiCore

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

@@ -2,8 +2,10 @@ module Matestack::Ui::Core::HasViewContext
   def initialize(*args)
     super
     @view_context = @options.dig(:context, :view_context)
+    unless @view_context
+      @view_context = @options.dig(:matestack_context, :controller)&.view_context
+    end
   end
-
   def method_missing(*args, &block)
     if @view_context.respond_to? args.first
       @view_context.send(*args, &block)
@@ -11,4 +13,4 @@ module Matestack::Ui::Core::HasViewContext
       raise NameError, "NameError: undefined method or local variable `#{args.first}' for #{self.class.name}"
     end
   end
-end
+end

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

@@ -10,7 +10,6 @@ module Matestack::Ui::Core::HtmlAttributes
     :onoffline, :ononline, :onpagehide, :onpageshow, :onpopstate, :onresize, :onstorage, :onunload
   ]
 
-  # prepend the initializer and add class methods
   def self.included(base)
     base.class_eval do
       extend ClassMethods
@@ -20,6 +19,7 @@ module Matestack::Ui::Core::HtmlAttributes
   module ClassMethods
 
     def inherited(subclass)
+      super
       subclass.html_attributes *self.allowed_html_attributes
     end
 

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

@@ -18,21 +18,63 @@ module Matestack::Ui::Core::Properties
   module Initializer
     def initialize(model=nil, options={})
       options = model.dup if options.empty? && model.is_a?(Hash)
-      required_hooks(options)
-      optional_hooks(options)
+      # required_hooks(options)
+      # optional_hooks(options)
+      set_values(options) unless options[:skip_set_values]
       super
     end
   end
   
   module ClassMethods
+
+    def inherited(subclass)
+      super
+      # self.new(nil, skip_set_values: true)
+      subclass.property_keys *self.all_property_keys
+      subclass.all_required_properties.concat(self.all_required_properties)
+      subclass.created_properties.concat(self.created_properties)
+    end
+    
+    # contains all property keys, or property hashes regardless of wheter they are optional or required
+    # used in order to initialize values of properties correctly for subclasses and make properties inheritable
+    def all_property_keys
+      @all_properties.flatten!&.uniq! if defined? @all_properties
+      @all_properties ||= []
+    end
+
+    def all_required_properties
+      @all_required_properties ||= []
+    end
+
+    def created_properties
+      @created_properties ||= []
+    end
+
+    # add property keys to array containing all property keys
+    def property_keys(*attributes)
+      attributes.each do |attribute|
+        if attribute.is_a?(Hash)
+          attribute.each do |temp|
+            all_property_keys.push({ "#{temp.first}": temp.last})
+          end
+        else
+          all_property_keys.push(attribute) 
+        end
+      end
+    end
+
     # define optinoal properties for custom components with `optional :foo, :bar`
     def optional(*properties)
+      property_keys *properties
       add_properties_to_list(optional_properties, properties)
+      optional_hooks
     end
   
     # define required properties for custom components with `requires :title, :foo, :bar`
     def requires(*properties)
+      property_keys *properties
       add_properties_to_list(requires_properties, properties)
+      required_hooks
     end
 
     def add_properties_to_list(list, properties)
@@ -47,42 +89,73 @@ module Matestack::Ui::Core::Properties
   
     # array of properties created from the component
     def optional_properties
-      @component_properties ||= []
+      @optional_properties ||= []
     end
   
     # array of required properties from the component
     def requires_properties
       @requires_properties ||= []
     end
-  end
 
-  def optional_hooks(options)
-    self.class.optional_properties.compact.each do |prop|
-      if prop.is_a? Array
-        hash = prop.flatten
-        options[hash.last[:as]] = options[hash.first]
-        prop = hash.last[:as]
+    def optional_hooks
+      self.optional_properties.compact.each do |prop|
+        prop = extract_property_key({}, prop)
+        define_getter_and_setter_for_property(prop)
       end
-      raise PropertyOverwritingExistingMethodException, "Optional property #{prop} would overwrite already defined instance method for #{self.class}" if self.respond_to? prop
-      send(:define_singleton_method, prop) do 
-        options[prop]
+    end
+
+    def required_hooks
+      self.requires_properties.compact.each do |prop|
+        prop = extract_property_key({}, prop)
+        self.all_required_properties.push(prop).uniq!
+        define_getter_and_setter_for_property(prop)
       end
     end
-  end
 
-  def required_hooks(options)
-    self.class.requires_properties.compact.each do |prop|
-      if prop.is_a? Array
+    def extract_property_key(options, prop)
+      if prop.is_a?(Array) || prop.is_a?(Hash)
         hash = prop.flatten
-        options[hash.last[:as]] = options[hash.first]
         prop = hash.last[:as]
       end
-      raise PropertyMissingException, "Required property #{prop} is missing for #{self.class}" if options[prop].nil?
-      raise PropertyOverwritingExistingMethodException, "Required property #{prop} would overwrite already defined instance method for #{self.class}" if self.respond_to? prop
-      send(:define_singleton_method, prop) do
-        options[prop]
+      prop
+    end
+
+    def define_getter_and_setter_for_property(prop)
+      self.created_properties.push(prop)
+      self.send(:define_method, prop) do 
+        self.instance_variable_get(:"@#{prop}")
+      end
+      self.send(:define_method, :"#{prop}=") do |value|
+        self.instance_variable_set(:"@#{prop}", value)
+      end
+    end
+
+    def method_added(name)
+      if all_property_keys.include?(name) && !created_properties.include?(name)
+        raise PropertyOverwritingExistingMethodException, "Property \"#{name}\" would overwrite already defined instance method for #{self}"
+      end
+    end
+  end
+
+  def set_values(options)
+    self.class.all_property_keys.compact.each do |prop|
+      value_key = prop
+      prop = extract_property_key(options, prop)
+      if self.class.all_required_properties.include?(prop) && options[prop].nil?
+        raise PropertyMissingException, "Required property #{prop} is missing for #{self.class}" 
       end
+      send(:"#{prop}=", options[prop])
+    end
+  end
+
+  # returns property key and sets alias if hash with as option is given
+  def extract_property_key(options, prop)
+    if prop.is_a?(Array) || prop.is_a?(Hash)
+      hash = prop.flatten
+      options[hash.last[:as]] = options[hash.first]
+      prop = hash.last[:as]
     end
+    prop
   end
 
 end

data/app/lib/matestack/ui/core/rendering/main_renderer.rb

@@ -21,9 +21,10 @@ module Matestack::Ui::Core::Rendering::MainRenderer
       render_matestack_object(controller_instance, page_instance)
     elsif (params[:component_key].present? && params[:component_class].blank?)
       # async component rerendering from non isolated context
+      app_instance = app_class.new(page_class, controller_instance, context)
       component_key = params[:component_key]
       page_instance = page_class.new(controller_instance: controller_instance, context: context)
-      render_component(component_key, page_instance, controller_instance, context)
+      render_component(component_key, app_instance, controller_instance, context)
     elsif (params[:component_class].present? && params[:component_key].blank?)
       # isolated component rendering
       component_class = params[:component_class]
@@ -60,11 +61,14 @@ module Matestack::Ui::Core::Rendering::MainRenderer
     end
   end
 
+  # needs refactoring!
+  # we shouldn't pass in the parts of the controller_instance and the instance itself
   def create_context_hash(controller_instance)
     {
       view_context: controller_instance.view_context,
       params: controller_instance.params,
-      request: controller_instance.request
+      request: controller_instance.request,
+      controller: controller_instance # if this is not included here, rails route helpers will fail with undefined method `url_options' for nil:NilClass in some cases
     }
   end
 
@@ -75,15 +79,15 @@ module Matestack::Ui::Core::Rendering::MainRenderer
     controller_instance.render rendering_options
   end
 
-  def render_component(component_key, page_instance, controller_instance, context)
+  def render_component(component_key, app_or_page_instance, controller_instance, context)
     matched_component = nil
 
-    page_instance.matestack_set_skip_defer(false)
+    app_or_page_instance.matestack_set_skip_defer(false)
 
-    page_instance.prepare
-    page_instance.response
+    app_or_page_instance.prepare
+    app_or_page_instance.response
 
-    matched_component = dig_for_component(component_key, page_instance)
+    matched_component = dig_for_component(component_key, app_or_page_instance)
 
     unless matched_component.nil?
       render_matestack_object(controller_instance, matched_component, {}, :render_content)

data/lib/matestack/ui/core/components.rb

@@ -25,7 +25,6 @@ module Matestack::Ui::Core::Components
 
   require_app_path "concepts/matestack/ui/core/component/base"
   require_app_path "concepts/matestack/ui/core/component/dynamic"
-  require_app_path "concepts/matestack/ui/core/component/rerender"
   require_app_path "concepts/matestack/ui/core/component/static"
 
   require_core_component "abbr"
@@ -41,9 +40,12 @@ module Matestack::Ui::Core::Components
   require_core_component "blockquote"
   require_core_component "br"
   require_core_component "button"
+  require_core_component "cable"
   require_core_component "caption"
   require_core_component "cite"
   require_core_component "code"
+  require_core_component "form" # required before collection
+  require_app_path "concepts/matestack/ui/core/form/has_input_html_attributes" # required before collection
   require_app_path "concepts/matestack/ui/core/collection/helper"
   require_core_component "collection/content"
   require_core_component "collection/content/next"
@@ -71,7 +73,6 @@ module Matestack::Ui::Core::Components
   require_core_component "fieldset"
   require_core_component "figure"
   require_core_component "footer"
-  require_core_component "form"
   require_core_component "form/checkbox"
   require_core_component "form/input"
   require_core_component "form/radio"
@@ -119,6 +120,7 @@ module Matestack::Ui::Core::Components
   require_core_component "s"
   require_core_component "samp"
   require_core_component "section"
+  require_core_component "select"
   require_core_component "small"
   require_core_component "span"
   require_core_component "strong"
@@ -161,6 +163,7 @@ Matestack::Ui::Core::Component::Registry.register_components(
   blockquote: Matestack::Ui::Core::Blockquote::Blockquote,
   br: Matestack::Ui::Core::Br::Br,
   button: Matestack::Ui::Core::Button::Button,
+  cable: Matestack::Ui::Core::Cable::Cable,
   caption: Matestack::Ui::Core::Caption::Caption,
   cite: Matestack::Ui::Core::Cite::Cite,
   code: Matestack::Ui::Core::Code::Code,
@@ -239,6 +242,7 @@ Matestack::Ui::Core::Component::Registry.register_components(
   s: Matestack::Ui::Core::S::S,
   samp: Matestack::Ui::Core::Samp::Samp,
   section: Matestack::Ui::Core::Section::Section,
+  select: Matestack::Ui::Core::Select::Select,
   small: Matestack::Ui::Core::Small::Small,
   span: Matestack::Ui::Core::Span::Span,
   strong: Matestack::Ui::Core::Strong::Strong,