update data, datalist, dd, del, details, dfn, dialog, div, dl, dt, summary components and specs

Author: Nils Henning

lib/matestack/ui/core/components.rb

@@ -41,14 +41,24 @@ def self.require_core_component(name)
   require_core_component "caption"
   require_core_component "cite"
   require_core_component "code"
+  require_core_component "data"
+  require_core_component "datalist"
+  require_core_component "dd"
+  require_core_component "del"
+  require_core_component "details"
+  require_core_component "dfn"
+  require_core_component "dialog"
   require_core_component "div"
+  require_core_component "dl"
+  require_core_component "dt"
   require_core_component "heading"
   require_core_component "link"
   require_core_component "main"
   require_core_component "nav"
   require_core_component "paragraph"
   require_core_component "plain"
   require_core_component "span"
+  require_core_component "summary"
   require_core_component "table"
   require_core_component "tbody"
   require_core_component "td"
@@ -80,14 +90,24 @@ def self.require_core_component(name)
   caption: Matestack::Ui::Core::Caption::Caption,
   cite: Matestack::Ui::Core::Cite::Cite,
   code: Matestack::Ui::Core::Code::Code,
+  data: Matestack::Ui::Core::Data::Data,
+  datalist: Matestack::Ui::Core::Datalist::Datalist,
+  dd: Matestack::Ui::Core::Dd::Dd,
+  del: Matestack::Ui::Core::Del::Del,
+  details: Matestack::Ui::Core::Details::Details,
+  dfn: Matestack::Ui::Core::Dfn::Dfn,
+  dialog: Matestack::Ui::Core::Dialog::Dialog,
   div: Matestack::Ui::Core::Div::Div,
+  dl: Matestack::Ui::Core::Dl::Dl,
+  dt: Matestack::Ui::Core::Dt::Dt,
   heading: Matestack::Ui::Core::Heading::Heading,
   link: Matestack::Ui::Core::Link::Link,
   main: Matestack::Ui::Core::Main::Main,
   nav: Matestack::Ui::Core::Nav::Nav,
   paragraph: Matestack::Ui::Core::Paragraph::Paragraph,
   plain: Matestack::Ui::Core::Plain::Plain,
   span: Matestack::Ui::Core::Span::Span,
+  summary: Matestack::Ui::Core::Summary::Summary,
   transition: Matestack::Ui::Core::Transition::Transition,
   table: Matestack::Ui::Core::Table::Table,
   tbody: Matestack::Ui::Core::Tbody::Tbody,

spec/0.8/components/data_spec.rb

@@ -5,22 +5,17 @@
   it 'Renders a simple and enhanced data tag on a page' do
     class ExamplePage < Matestack::Ui::Page
       def response
-        components {
-          # Simple data
-          data id: 'foo', class: 'bar', value: '1301', text: 'Data example 1'
-
-          # Enhanced data
-          data id: 'foo', class: 'bar', value: '1300' do
-            plain 'Data example 2' # optional content
-          end
-        }
+        # Simple data
+        data id: 'foo', class: 'bar', value: '1301', text: 'Data example 1'
+        # Enhanced data
+        data id: 'foo', class: 'bar', value: '1300' do
+          plain 'Data example 2' # optional content
+        end
       end
     end
 
     visit '/example'
-
     static_output = page.html
-
     expected_static_output = <<~HTML
       <data id="foo" value="1301" class="bar">
         Data example 1
@@ -29,7 +24,6 @@ def response
         Data example 2
       </data>
     HTML
-
     expect(stripped(static_output)).to include(stripped(expected_static_output))
   end
 end

spec/0.8/components/datalist_spec.rb

@@ -6,25 +6,18 @@
   it 'Example 1 - yield' do
 
     class ExamplePage < Matestack::Ui::Page
-
       def response
-        components {
-          datalist id: 'foo', class: 'bar' do
-            plain 'Example Text'
-          end
-        }
+        datalist id: 'foo', class: 'bar' do
+          plain 'Example Text'
+        end
       end
-
     end
 
     visit '/example'
-
     static_output = page.html
-
     expected_static_output = <<~HTML
-    <datalist id="foo" class="bar">Example Text</datalist>
+      <datalist id="foo" class="bar">Example Text</datalist>
     HTML
-
     expect(stripped(static_output)).to include(stripped(expected_static_output))
   end
 

spec/0.8/components/dd_spec.rb

@@ -6,58 +6,44 @@
   it 'Example 1 - yield, no options[:text]' do
 
     class ExamplePage < Matestack::Ui::Page
-
       def response
-        components {
-          # simple dd tag
-          dd do
-            plain 'This is simple dd text'
-          end
-
-          # enhanced dd tag
-          dd id: 'my-id', class: 'my-class' do
-            plain 'This is a enhanced dd with text'
-          end
-        }
+        # simple dd tag
+        dd do
+          plain 'This is simple dd text'
+        end
+        # enhanced dd tag
+        dd id: 'my-id', class: 'my-class' do
+          plain 'This is a enhanced dd with text'
+        end
       end
-
     end
 
     visit '/example'
     static_output = page.html
-
     expected_static_output = <<~HTML
-    <dd>This is simple dd text</dd>
-    <dd id="my-id" class="my-class">This is a enhanced dd with text</dd>
+      <dd>This is simple dd text</dd>
+      <dd id="my-id" class="my-class">This is a enhanced dd with text</dd>
     HTML
     expect(stripped(static_output)).to include(stripped(expected_static_output))
   end
 
   it 'Example 2 - render options[:text]' do
 
     class ExamplePage < Matestack::Ui::Page
-
       def response
-        components {
-          # simple dd tag
-          dd text: 'This is simple dd text'
-
-          # enhanced dd tag
-          dd id: 'my-id', class: 'my-class', text: 'This is a enhanced dd with text'
-        }
+        # simple dd tag
+        dd text: 'This is simple dd text'
+        # enhanced dd tag
+        dd id: 'my-id', class: 'my-class', text: 'This is a enhanced dd with text'
       end
-
     end
 
     visit '/example'
-
     static_output = page.html
-
     expected_static_output = <<~HTML
-    <dd>This is simple dd text</dd>
-    <dd id="my-id" class="my-class">This is a enhanced dd with text</dd>
+      <dd>This is simple dd text</dd>
+      <dd id="my-id" class="my-class">This is a enhanced dd with text</dd>
     HTML
-
     expect(stripped(static_output)).to include(stripped(expected_static_output))
   end
 

spec/0.8/components/del_spec.rb

@@ -6,60 +6,44 @@
   it 'Example 1 - yield, no options[:text]' do
 
     class ExamplePage < Matestack::Ui::Page
-
       def response
-        components {
-          # simple del
-          del cite: 'http://citeurl.com', datetime: '2019-01-01T00:00:00Z' do
-            plain 'I am simple'
-          end
-
-          # enhanced del
-          del id: 'my-id', class: 'my-class', cite: 'http://citeurl.com', datetime: '2019-01-01T00:00:00Z' do
-            plain 'I am enhanced'
-          end
-        }
+        # simple del
+        del cite: 'http://citeurl.com', datetime: '2019-01-01T00:00:00Z' do
+          plain 'I am simple'
+        end
+        # enhanced del
+        del id: 'my-id', class: 'my-class', cite: 'http://citeurl.com', datetime: '2019-01-01T00:00:00Z' do
+          plain 'I am enhanced'
+        end
       end
-
     end
 
     visit '/example'
-
     static_output = page.html
-
     expected_static_output = <<~HTML
-    <del cite=\"http://citeurl.com\" datetime=\"2019-01-01T00:00:00Z\">I am simple</del>
-    <del cite=\"http://citeurl.com\" datetime=\"2019-01-01T00:00:00Z\" id=\"my-id\" class=\"my-class\">I am enhanced</del>
+      <del cite=\"http://citeurl.com\" datetime=\"2019-01-01T00:00:00Z\">I am simple</del>
+      <del cite=\"http://citeurl.com\" datetime=\"2019-01-01T00:00:00Z\" id=\"my-id\" class=\"my-class\">I am enhanced</del>
     HTML
-
     expect(stripped(static_output)).to include(stripped(expected_static_output))
   end
 
   it 'Example 2 - render options[:text]' do
 
     class ExamplePage < Matestack::Ui::Page
-
       def response
-        components {
-          # simple del
-          del cite: 'http://citeurl.com', datetime: '2019-01-01T00:00:00Z', text: 'I am simple'
-
-          # enhanced del
-          del id: 'my-id', class: 'my-class', cite: 'http://citeurl.com', datetime: '2019-01-01T00:00:00Z', text: 'I am enhanced'
-        }
+        # simple del
+        del cite: 'http://citeurl.com', datetime: '2019-01-01T00:00:00Z', text: 'I am simple'
+        # enhanced del
+        del id: 'my-id', class: 'my-class', cite: 'http://citeurl.com', datetime: '2019-01-01T00:00:00Z', text: 'I am enhanced'
       end
-
     end
 
     visit '/example'
-
     static_output = page.html
-
     expected_static_output = <<~HTML
-    <del cite=\"http://citeurl.com\" datetime=\"2019-01-01T00:00:00Z\">I am simple</del>
-    <del cite=\"http://citeurl.com\" datetime=\"2019-01-01T00:00:00Z\" id=\"my-id\" class=\"my-class\">I am enhanced</del>
+      <del cite=\"http://citeurl.com\" datetime=\"2019-01-01T00:00:00Z\">I am simple</del>
+      <del cite=\"http://citeurl.com\" datetime=\"2019-01-01T00:00:00Z\" id=\"my-id\" class=\"my-class\">I am enhanced</del>
     HTML
-
     expect(stripped(static_output)).to include(stripped(expected_static_output))
   end
 

spec/0.8/components/details_summary_spec.rb

@@ -5,47 +5,38 @@
   it 'Example 1' do
     class ExamplePage < Matestack::Ui::Page
       def response
-        components {
-          # basic
-          details do
-            summary text: 'Hello'
-            paragraph text: 'World!'
-          end
-
-          # without summary
-          details id: 'foo' do
-            plain "Hello World!"
-          end
- 
-          # enhanced
-          details id: 'detail_id', class: 'detail_class' do
-            summary id: 'summary_id', class: 'summary_class', text: 'Hello'
-            paragraph text: 'World!'
-          end
-        }
+        # basic
+        details do
+          summary text: 'Hello'
+          paragraph text: 'World!'
+        end
+        # without summary
+        details id: 'foo' do
+          plain "Hello World!"
+        end
+        # enhanced
+        details id: 'detail_id', class: 'detail_class' do
+          summary id: 'summary_id', class: 'summary_class', text: 'Hello'
+          paragraph text: 'World!'
+        end
       end
     end
-    visit '/example'
 
+    visit '/example'
     static_output = page.html
-
     expected_static_output = <<~HTML
-
-    <details>
-      <summary>Hello</summary>
-      <p>World!</p>
-    </details>
-
-    <details id="foo">
-      Hello World!
-    </details>
-
-    <details id="detail_id" class="detail_class">
-      <summary id="summary_id" class="summary_class">Hello</summary>
-      <p>World!</p>
-    </details>
+      <details>
+        <summary>Hello</summary>
+        <p>World!</p>
+      </details>
+      <details id="foo">
+        Hello World!
+      </details>
+      <details id="detail_id" class="detail_class">
+        <summary id="summary_id" class="summary_class">Hello</summary>
+        <p>World!</p>
+      </details>
     HTML
-
     expect(stripped(static_output)).to include(stripped(expected_static_output))
   end
 end