do not require attributes hash for custom attributes

Author: Nils Henning

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

@@ -2,6 +2,7 @@ module Matestack::Ui::Core::Component
   class Base < Trailblazer::Cell
     include Matestack::Ui::Core::Cell
     include Matestack::Ui::Core::HasViewContext
+    include Matestack::Ui::Core::HtmlAttributes
     include Matestack::Ui::Core::Properties
 
     # probably eed to remove for other tests to be green again
@@ -76,6 +77,7 @@ def initialize(model = nil, options = {})
       # TODO: do we realy have to call this every time on initialize or should
       # it maybe be called more dynamically like its dynamic_tag_attributes
       # equivalent in Dynamic?
+      extract_html_attributes(options)
       set_tag_attributes
       setup
       validate_options

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

@@ -114,15 +114,19 @@ const componentDef = {
     },
     perform: function(){
       const self = this
-      if (self.componentConfig["emit"] != undefined) {
-        matestackEventHub.$emit(self.componentConfig["emit"]);
-      }
-      if (self.componentConfig["delay"] != undefined) {
-        setTimeout(function () {
+      if(self.$el.querySelector('form').checkValidity()){
+        if (self.componentConfig["emit"] != undefined) {
+          matestackEventHub.$emit(self.componentConfig["emit"]);
+        }
+        if (self.componentConfig["delay"] != undefined) {
+          setTimeout(function () {
+            self.sendRequest()
+          }, parseInt(self.componentConfig["delay"]));
+        } else {
           self.sendRequest()
-        }, parseInt(self.componentConfig["delay"]));
+        }
       } else {
-        this.sendRequest()
+        matestackEventHub.$emit('static_form_errors');
       }
     },
     sendRequest: function(){

app/concepts/matestack/ui/core/form/input/input.haml

@@ -1,8 +1,8 @@
-- if label
-  %label=label
+- if input_label
+  %label=input_label
 
 - if [:text, :number, :email, :date, :password].include?(type)
-  %input{ @tag_attributes,
+  %input{ html_attributes,
     "v-model#{'.number' if type == :number}": input_key,
     type: type,
     "@change": "inputChanged(\"#{attr_key}\")",

app/concepts/matestack/ui/core/form/input/input.rb

@@ -2,19 +2,12 @@ module Matestack::Ui::Core::Form::Input
   class Input < Matestack::Ui::Core::Component::Static
 
     requires :key, :type
+    optional :placeholder, :multiple, :init, for: { as: :input_for }, label: { as: :input_label }
 
     def custom_options_validation
       raise "included form config is missing, please add ':include' to parent form component" if @included_config.nil?
     end
 
-    def label
-      options[:label]
-    end
-
-    def placeholder
-      options[:placeholder]
-    end
-
     def input_key
       "data['#{key.to_s}']"
     end
@@ -24,30 +17,30 @@ def error_key
     end
 
     def input_wrapper
-      case options[:for]
+      case input_for
       when nil
         return nil
       when Symbol, String
-        return options[:for]
+        return input_for
       end
-      if options[:for].respond_to?(:model_name)
-        return options[:for].model_name.singular
+      if input_for.respond_to?(:model_name)
+        return input_for.model_name.singular
       end
     end
 
     def attr_key
       if input_wrapper.nil?
-        return "#{key.to_s}#{'[]' if options[:multiple]}"
+        return "#{key.to_s}#{'[]' if multiple}"
       else
-        return "#{input_wrapper}.#{key.to_s}#{'[]' if options[:multiple]}"
+        return "#{input_wrapper}.#{key.to_s}#{'[]' if multiple}"
       end
     end
 
     def init_value
-      return options[:init] unless options[:init].nil?
+      return init unless init.nil?
 
-      unless options[:for].nil?
-        value = parse_value(options[:for].send key)
+      unless input_for.nil?
+        value = parse_value(input_for.send key)
       else
         unless @included_config.nil? && @included_config[:for].nil?
           if @included_config[:for].respond_to?(key)

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

@@ -0,0 +1,16 @@
+module Matestack::Ui::Core::HtmlAttributes
+
+  # contains all passed options
+  attr_accessor :html_attributes
+
+  def extract_html_attributes(options)
+    self.html_attributes = options.except(
+      :context,
+      :included_config,
+      :matestack_context,
+      :children,
+      :url_params
+    )
+  end
+
+end

lib/matestack/ui/core/components.rb

@@ -20,6 +20,7 @@ def self.require_core_component(name)
 
   require_app_path "helpers/matestack/ui/core/application_helper"
   require_app_path "lib/matestack/ui/core/has_view_context"
+  require_app_path "lib/matestack/ui/core/html_attributes"
   require_app_path "lib/matestack/ui/core/properties"
 
   require_app_path "concepts/matestack/ui/core/component/base"

spec/0.8/components/rails_view_spec.rb

@@ -4,8 +4,11 @@
 describe 'Rails View Component', type: :feature, js: true do
 
   after :all do
-    Object.send(:remove_const, :ExampleController)
-    load "#{Rails.root}/app/controllers/example_controller.rb"
+    class ExampleController < ApplicationController
+      def page
+        render ExamplePage
+      end
+    end
   end
 
   it 'renders given view on to page' do

spec/dummy/app/matestack/demo/pages/my_fourth_page.rb

@@ -11,7 +11,8 @@ def response
       heading size: 3, text: "Dummy Model Form:"
 
       form my_form_config, :include do
-        form_input key: :title, type: :text, placeholder: "title"
+        form_input key: :title, type: :text, placeholder: "title", required: true
+        form_input key: :description, type: :text, placeholder: "Description", label: 'Description', attributes: { required: true }
         br
         form_submit do
           button text: "Submit me!"

spec/dummy/app/matestack/demo/pages/my_third_page.rb

@@ -23,10 +23,6 @@ def response
         async show_on: "my_action_succeeded", hide_after: 2000 do
           plain "action succeeded!"
         end
-
-        @title = 'Test Title'
-        rails_view view: '/header'
-        rails_view partial: '/header'
       end
     }
   end