RubyGems - matestack-ui-core - Versions diffs - 1.0.0.rc.1 → 1.0.0 - Mend

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

Files changed (216) hide show

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 module Matestack::Ui::Core::Td
   class Td < Matestack::Ui::Core::Component::Static
+    html_attributes :colspan, :headers, :rowspan
+    optional :text
   end
 end

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 module Matestack::Ui::Core::Th
   class Th < Matestack::Ui::Core::Component::Static
+    html_attributes :abbr, :colspan, :headers, :rowspan, :scope
+    optional :text
   end
 end

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

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

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

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

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

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

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

@@ -1,11 +1,5 @@
 module Matestack::Ui::Core::Time
   class Time < Matestack::Ui::Core::Component::Static
-    def setup
-      @tag_attributes.merge!({
-        "datetime": options[:datetime] ||= nil
-      })
-    end
+    html_attributes :datetime
   end
 end

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

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

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

@@ -1,12 +1,11 @@
 module Matestack::Ui::Core::Toggle
   class Toggle < Matestack::Ui::Core::Component::Dynamic
     vue_js_component_name "matestack-ui-core-toggle"
-    def initialize(*args)
-      super
-      @tag_attributes.merge!({
-        "v-if": "showing"
+    def toggle_attributes
+      html_attributes.merge({
+        "v-if": "showing",
+        class: "matestack-toggle-component-root #{options[:class]}".strip
       })
     end

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

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

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

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

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

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

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

@@ -2,29 +2,35 @@ module Matestack::Ui::Core::Transition
   class Transition < Matestack::Ui::Core::Component::Dynamic
     vue_js_component_name "matestack-ui-core-transition"
+    requires :path
+    optional :text, params: { as: :transition_params }
     def setup
       @component_config[:link_path] = link_path
-      @tag_attributes.merge!({
+    end
+    def transition_attributes
+      html_attributes.merge(
         "href": link_path,
         "@click.prevent": navigate_to(link_path),
         "v-bind:class": "{ active: isActive, 'active-child': isChildActive }"
-      })
+      )
     end
     def link_path
-      if options[:path].is_a?(Symbol)
+      if path.is_a?(Symbol)
         return resolve_path
       end
-      if options[:path].is_a?(String)
-        return options[:path]
+      if path.is_a?(String)
+        return path
       end
     end
     def resolve_path
       begin
-        return ::Rails.application.routes.url_helpers.send(options[:path], options[:params])
+        return ::Rails.application.routes.url_helpers.send(path, transition_params)
       rescue => e
-        raise "path '#{options[:path]}' not found, using params: #{options[:params]}"
+        raise "path '#{path}' not found, using params: #{transition_params}"
       end
     end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,6 +14,7 @@ module Matestack
         def self.included(base)
           base.extend(ClassMethods)
         end
         module ClassMethods
           def matestack_app _class
             @matestack_app_class = _class

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

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