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

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

@@ -1,7 +1,7 @@
 - if input_label
   %label= input_label
 
-%select{html_attributes.merge(vue_attributes)}
+%select{ html_attributes.merge(vue_attributes) }
   - if placeholder
     %option{value: 'null', disabled: true, selected: init_value.nil?}= placeholder
   - select_options.to_a.each do |item|

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

@@ -13,26 +13,6 @@ module Matestack::Ui::Core::Form::Select
       label: { as: :input_label }, 
       options: { as: :select_options }
 
-    # def response
-    #   radio_options.to_a.each do |item|
-    #     input html_attributes.merge(
-    #       attributes: vue_attributes.merge(ref: "select.#{attr_key}"), 
-    #       type: :radio,
-    #       id: "#{id_for_item(item_value(item))}",
-    #       name: item_name(item),
-    #       value: item_value(item),
-    #     )
-    #     label text: item_label(item), for: id_for_item(item_value(item))
-    #   end
-    #   render_errors
-    # end
-
-    # def html_options
-    #   html_attributes.merge(
-    #     attributes: vue_attributes,
-    #   )
-    # end
-
     def vue_attributes
       (options[:attributes] || {}).merge({
         "@change": change_event,

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

@@ -1,3 +1,3 @@
-%span{@tag_attributes}
+%span{ submit_attributes }
   - if block_given?
     = yield

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

@@ -1,11 +1,11 @@
 module Matestack::Ui::Core::Form::Submit
   class Submit < Matestack::Ui::Core::Component::Static
 
-    def setup
-      @tag_attributes.merge!({
+    def submit_attributes
+      html_attributes.merge!({
         "@click.prevent": "perform",
         "v-bind:class": "{ 'loading': loading }"
-        })
+      })
     end
 
   end

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

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

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

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

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

@@ -1,50 +1,5 @@
-- case options[:size]
-- when 1
-  %h1{@tag_attributes}
-    - if options[:text].blank?
-      - if block_given?
-        = yield
-    - else
-      = options[:text]
-- when 2
-  %h2{@tag_attributes}
-    - if options[:text].blank?
-      - if block_given?
-        = yield
-    - else
-      = options[:text]
-- when 3
-  %h3{@tag_attributes}
-    - if options[:text].blank?
-      - if block_given?
-        = yield
-    - else
-      = options[:text]
-- when 4
-  %h4{@tag_attributes}
-    - if options[:text].blank?
-      - if block_given?
-        = yield
-    - else
-      = options[:text]
-- when 5
-  %h5{@tag_attributes}
-    - if options[:text].blank?
-      - if block_given?
-        = yield
-    - else
-      = options[:text]
-- when 6
-  %h6{@tag_attributes}
-    - if options[:text].blank?
-      - if block_given?
-        = yield
-    - else
-      = options[:text]
+- if text.blank? && block_given?
+  = content_tag("h#{size || 1}", html_attributes) do
+    = yield
 - else
-  %h1{@tag_attributes}
-    - if options[:text].blank?
-      - if block_given?
-        = yield
-    - else
-      = options[:text]
+  = content_tag("h#{size || 1}", text, html_attributes)

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

@@ -1,7 +1,5 @@
 module Matestack::Ui::Core::Heading
   class Heading < Matestack::Ui::Core::Component::Static
-
-    attr_reader :argument, :options
-
+    optional :text, :size
   end
 end

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

@@ -1 +1 @@
-%hr{@tag_attributes}
+%hr{ html_attributes }

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

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

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

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

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

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

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

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

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

@@ -1,14 +1,7 @@
 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
-
+    html_attributes :allow, :allowfullscreen, :allowpaymentrequest, :height, :name, 
+      :referrerpolicy, :sandbox, :src, :srcdoc, :width
+    optional :text
   end
 end

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

@@ -1 +1 @@
-%img{@tag_attributes}
+%img{ img_attributes }

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

@@ -1,14 +1,14 @@
 module Matestack::Ui::Core::Img
   class Img < Matestack::Ui::Core::Component::Static
+    html_attributes :alt, :crossorigin, :height, :ismap, :longdesc, :referrerpolicy, 
+      :sizes, :src, :srcset, :usemap, :width
 
-    def setup
-      @tag_attributes.merge!({
-        src: ActionController::Base.helpers.asset_path(options[:path]),
-        height: options[:height],
-        width: options[:width],
-        usemap: options[:usemap],
-        alt: options[:alt]
-      })
+    optional :path
+
+    def img_attributes
+      html_attributes.tap do |attributes|
+        attributes[:src] = ActionController::Base.helpers.asset_path(path) if path
+      end
     end
 
   end

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

@@ -5,9 +5,5 @@ module Matestack::Ui::Core::Input
       :formenctype, :formmethod, :formnovalidate, :formtarget, :height, :list, :max, :maxlength, :min, :minlength, 
       :multiple, :name, :pattern, :placeholder, :readonly, :required, :size, :src, :step, :type, :value, :width
 
-    def type
-      options[:type]
-    end
-
   end
 end

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

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

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

@@ -1,10 +1,6 @@
 module Matestack::Ui::Core::Ins
   class Ins < Matestack::Ui::Core::Component::Static
-    def setup
-      @tag_attributes.merge!({
-        cite: options[:cite],
-        datetime: options[:datetime]
-      })
-    end
+    html_attributes :cite, :datetime
+    optional :text
   end
 end

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

@@ -1,2 +1,2 @@
-%div{@tag_attributes.merge(class: "matestack-isolated-component-root")}
+%div{ html_attributes.merge(class: "matestack-isolated-component-root") }
   =yield

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

@@ -4,7 +4,7 @@ module Matestack::Ui::Core::Isolated
 
     def initialize(*args)
       super
-      @public_options = args.map { |hash| hash[:public_options] }[0]
+      @public_options = args.map { |hash| hash&.dig(:public_options) }[0]
     end
 
     def public_options

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 module Matestack::Ui::Core::Li
   class Li < Matestack::Ui::Core::Component::Static
-
+    html_attributes :value
+    optional :text
   end
 end

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

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

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

@@ -1,25 +1,21 @@
 module Matestack::Ui::Core::Link
   class Link < Matestack::Ui::Core::Component::Static
+    html_attributes :download, :href, :hreflang, :media, :ping, :referrerpolicy, :rel, :target, :type
 
-    requires :path
+    optional :text, :path, params: { as: :link_params }
 
-    def setup
-      @tag_attributes.merge!({
-        class: options[:class],
-        id: component_id,
-        method: options[:method],
-        target: options[:target] ||= nil,
-        href: link_path,
-        title: options[:title]
-      })
+    def link_attributes
+      html_attributes.tap do |attributes|
+        attributes[:href] = link_path if path
+      end
     end
 
     def link_path
-      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, link_params)
       end
-      if options[:path].is_a?(String)
-        return options[:path]
+      if path.is_a?(String)
+        return path
       end
     end
 

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

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

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

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

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

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

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

@@ -1,11 +1,5 @@
 module Matestack::Ui::Core::Map
   class Map < Matestack::Ui::Core::Component::Static
-    requires :name
-
-    def setup
-      @tag_attributes.merge!({
-        name: options[:name]
-      })
-    end
+    html_attributes :name
   end
 end

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

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

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

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

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

@@ -1,4 +1,4 @@
-%meter{@tag_attributes}
+%meter{ html_attributes }
   - if block_given?
     = yield