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

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/dynamic.rb

@@ -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

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

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

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

@@ -1,4 +1,6 @@
 module Matestack::Ui::Core::Del
   class Del < Matestack::Ui::Core::Component::Static
+    html_attributes :cite, :datetime
+    optional :text
   end
 end

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

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

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

@@ -1,5 +1,5 @@
 module Matestack::Ui::Core::Details
   class Details < Matestack::Ui::Core::Component::Static
-
+    html_attributes :open
   end
 end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,6 @@
 module Matestack::Ui::Core::Fieldset
   class Fieldset < Matestack::Ui::Core::Component::Static
-    def setup
-      @tag_attributes.merge!({
-        disabled: options[:disabled]
-      })
-    end
+    html_attributes :disabled, :form, :name
+    optional :text
   end
-end
+end

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

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

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

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

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

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

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

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

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

@@ -1,2 +1,2 @@
-%form{@tag_attributes}
+%form{ form_attributes }
   = yield

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

@@ -1,49 +1,55 @@
 module Matestack::Ui::Core::Form
   class Form < Matestack::Ui::Core::Component::Dynamic
     vue_js_component_name "matestack-ui-core-form"
+    
+    html_attributes :'accept-charset', :action, :autocomplete, :enctype, :method, :name, :novalidate, :rel, :target
 
-    requires :for, :path, method: { as: :form_method }
+    requires :path, for: { as: :for_option }, method: { as: :form_method }
+    optional :success, :failure, :multipart, params: { as: :form_params }
 
     def setup
       begin
         @component_config[:for] = form_wrapper
         @component_config[:submit_path] = submit_path
-        @component_config[:method] = options[:method]
-        @component_config[:success] = options[:success]
-        @component_config[:multipart] = options[:multipart] == true
-        unless options[:success].nil?
-          unless options[:success][:transition].nil?
-            @component_config[:success][:transition][:path] = transition_path options[:success]
+        @component_config[:method] = form_method
+        @component_config[:success] = success
+        @component_config[:multipart] = multipart == true
+        unless success.nil?
+          unless success[:transition].nil?
+            @component_config[:success][:transition][:path] = transition_path success
           end
-          unless options[:success][:redirect].nil?
-            @component_config[:success][:redirect][:path] = redirect_path options[:success]
+          unless success[:redirect].nil?
+            @component_config[:success][:redirect][:path] = redirect_path success
           end
         end
-        @component_config[:failure] = options[:failure]
-        unless options[:failure].nil?
-          unless options[:failure][:transition].nil?
-            @component_config[:failure][:transition][:path] = transition_path options[:failure]
+        @component_config[:failure] = failure
+        unless failure.nil?
+          unless failure[:transition].nil?
+            @component_config[:failure][:transition][:path] = transition_path failure
           end
-          unless options[:failure][:redirect].nil?
-            @component_config[:failure][:redirect][:path] = redirect_path options[:failure]
+          unless failure[:redirect].nil?
+            @component_config[:failure][:redirect][:path] = redirect_path failure
           end
         end
-        @tag_attributes.merge!({
-          "@submit.prevent": true,
-          "class": "matestack-form #{options[:class]}",
-          "v-bind:class": "{ 'has-errors': hasErrors(), 'loading': loading }"
-        })
       rescue => e
         raise "Form component could not be setted up. Reason: #{e}"
       end
     end
 
+    def form_attributes
+      html_attributes.merge({
+        "@submit.prevent": true,
+        "class": "matestack-form #{options[:class]}",
+        "v-bind:class": "{ 'has-errors': hasErrors(), 'loading': loading }"
+      })
+    end
+
     def submit_path
       begin
-        if options[:path].is_a?(Symbol)
-          return ::Rails.application.routes.url_helpers.send(options[:path], options[:params])
+        if path.is_a?(Symbol)
+          return ::Rails.application.routes.url_helpers.send(path, form_params)
         else
-          return options[:path]
+          return path
         end
       rescue
         raise "Submit path not found"
@@ -81,15 +87,15 @@ module Matestack::Ui::Core::Form
     end
 
     def form_wrapper
-      case options[:for]
+      case for_option
       when Symbol
-        return options[:for]
+        return for_option
       when String
-        return options[:for]
+        return for_option
       end
 
-      if options[:for].respond_to?(:model_name)
-        return options[:for].model_name.singular
+      if for_option.respond_to?(:model_name)
+        return for_option.model_name.singular
       end
     end