Merge branch 'develop' of github.com:basemate/matestack-ui-core into issue-183

cameronnorman · cameronnorman · commit 5895efca3305 · 2019-10-09T16:01:12.000+02:00
diff --git a/app/concepts/matestack/ui/core/aside/aside.haml b/app/concepts/matestack/ui/core/aside/aside.haml
@@ -0,0 +1,3 @@
+%aside{@tag_attributes}
+  - if block_given?
+    = yield
diff --git a/app/concepts/matestack/ui/core/aside/aside.rb b/app/concepts/matestack/ui/core/aside/aside.rb
@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Aside
+  class Aside < Matestack::Ui::Core::Component::Static
+
+  end
+end
diff --git a/app/concepts/matestack/ui/core/cite/cite.haml b/app/concepts/matestack/ui/core/cite/cite.haml
@@ -0,0 +1,5 @@
+%cite{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]
diff --git a/app/concepts/matestack/ui/core/cite/cite.rb b/app/concepts/matestack/ui/core/cite/cite.rb
@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Cite
+  class Cite < Matestack::Ui::Core::Component::Static
+
+  end
+end
diff --git a/app/concepts/matestack/ui/core/dl/dl.haml b/app/concepts/matestack/ui/core/dl/dl.haml
@@ -0,0 +1,5 @@
+%dl{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]
diff --git a/app/concepts/matestack/ui/core/dl/dl.rb b/app/concepts/matestack/ui/core/dl/dl.rb
@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Dl
+  class Dl < Matestack::Ui::Core::Component::Static
+
+  end
+end
diff --git a/app/concepts/matestack/ui/core/noscript/noscript.haml b/app/concepts/matestack/ui/core/noscript/noscript.haml
@@ -0,0 +1,5 @@
+%noscript{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]
diff --git a/app/concepts/matestack/ui/core/noscript/noscript.rb b/app/concepts/matestack/ui/core/noscript/noscript.rb
@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Noscript
+  class Noscript < Matestack::Ui::Core::Component::Static
+
+  end
+end
diff --git a/app/concepts/matestack/ui/core/pre/pre.haml b/app/concepts/matestack/ui/core/pre/pre.haml
@@ -0,0 +1,5 @@
+%pre{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]
diff --git a/app/concepts/matestack/ui/core/pre/pre.rb b/app/concepts/matestack/ui/core/pre/pre.rb
@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Pre
+  class Pre < Matestack::Ui::Core::Component::Static
+
+  end
+end
diff --git a/docs/components/README.md b/docs/components/README.md
@@ -33,6 +33,7 @@ You can build your [own components](/docs/extend/custom_components.md) as well,
 - [link](/docs/components/link.md)
 - [label](/docs/components/label.md)
 - [progress](/docs/components/progress.md)
+- [noscript](/docs/components/noscript.md)
 
 ## Dynamic Core Components
 
diff --git a/docs/components/aside.md b/docs/components/aside.md
@@ -0,0 +1,31 @@
+# matestack core component: Aside
+
+Show [specs](/spec/usage/components/aside_spec.rb)
+
+The HTML `<aside>` tag implemented in ruby.
+
+## Parameters
+
+This component can take 2 optional configuration params and optional content.
+
+#### # id (optional)
+Expects a string with all ids the aside tag should have.
+
+#### # class (optional)
+Expects a string with all classes the aside tag should have.
+
+## Example 1
+
+```ruby
+aside id: "foo", class: "bar" do
+  paragraph text: "This is some text"
+end
+```
+
+returns
+
+```html
+<aside id="foo" class="bar">
+  <p>This is some text</p>
+</aside>
+```
diff --git a/docs/components/cite.md b/docs/components/cite.md
@@ -0,0 +1,44 @@
+# matestack core component: Cite
+
+Show [specs](/spec/usage/components/cite_spec.rb)
+
+The HTML cite tag implemented in ruby.
+
+## Parameters
+
+This component can take 2 optional configuration params and either yield content or display what gets passed to the `text` configuration param.
+
+#### # id (optional)
+Expects a string with all ids the cite tag should have.
+
+#### # class (optional)
+Expects a string with all classes the cite tag should have.
+
+## Example 1: Yield a given block
+
+```ruby
+cite id: "foo", class: "bar" do
+  plain 'Hello World' # optional content
+end
+```
+
+returns
+
+```html
+<cite id="foo" class="bar">
+  Hello World
+</cite>
+```
+
+## Example 2: Render options[:text] param
+
+```ruby
+cite id: "foo", class: "bar", text: 'Hello World'
+```
+
+returns
+
+```html
+<cite id="foo" class="bar">
+  Hello World
+</cite>
diff --git a/docs/components/dl.md b/docs/components/dl.md
@@ -0,0 +1,47 @@
+# matestack core component: Dl
+
+Show [specs](/spec/usage/components/dl_spec.rb)
+
+The HTML dl tag implemented in ruby.
+
+## Parameters
+
+This component can take 3 optional configuration params and either yield content or display what gets passed to the `text` configuration param.
+
+#### # id (optional)
+Expects a string with all ids the `dl` should have.
+
+#### # class (optional)
+Expects a string with all classes the `dl` should have.
+
+## Example 1: Yield a given block
+
+```ruby
+dl id: "foo", class: "bar" do
+  dt text: "dt component"
+  dd text: "dd component"
+end
+```
+
+returns
+
+```html
+<dl id="foo" class="bar">
+  <dt>dt component</dt>
+  <dd>dd component</dd>
+</dl>
+```
+
+## Example 2: Render options[:text] param
+
+```ruby
+dl id: "foo", class: "bar", text: 'Hello World'
+```
+
+returns
+
+```html
+<dl id="foo" class="bar">
+  Hello World
+</dl>
+```
diff --git a/docs/components/em.md b/docs/components/em.md
@@ -25,7 +25,7 @@ end
 returns
 
 ```html
-<em id="foo" class="bar">Emphasized text</small>
+<em id="foo" class="bar">Emphasized text</em>
 ```
 
 ## Example 2: Render options[:text] param
@@ -37,4 +37,4 @@ em id: "foo", class: "bar", text: 'Emphasized text'
 returns
 
 ```html
-<em id="foo" class="bar">Emphasized text</small>
+<em id="foo" class="bar">Emphasized text</em>
diff --git a/docs/components/noscript.md b/docs/components/noscript.md
@@ -0,0 +1,45 @@
+# matestack core component: Noscript
+
+Show [specs](/spec/usage/components/noscript_spec.rb)
+
+The HTML noscript tag implemented in ruby.
+
+## Parameters
+
+This component can take 2 optional configuration params and either yield content or display what gets passed to the `text` configuration param.
+
+#### # id (optional)
+Expects a string with all ids the noscript should have.
+
+#### # class (optional)
+Expects a string with all classes the noscript should have.
+
+## Example 1: Yield a given block
+
+```ruby
+noscript id: "foo", class: "bar" do
+  plain 'Hello World' # optional content
+end
+```
+
+returns
+
+```html
+<noscript id="foo" class="bar">
+  Hello World
+</noscript>
+```
+
+## Example 2: Render options[:text] param
+
+```ruby
+noscript id: "foo", class: "bar", text: 'Hello World'
+```
+
+returns
+
+```html
+<noscript id="foo" class="bar">
+  Hello World
+</noscript>
+
diff --git a/docs/components/pre.md b/docs/components/pre.md
@@ -0,0 +1,47 @@
+# matestack core component: Pre
+
+Show [specs](/spec/usage/components/pre_spec.rb)
+
+The HTML pre tag implemented in ruby.
+
+## Parameters
+
+This component can take 3 optional configuration params and either yield content or display what gets passed to the `text` configuration param.
+
+#### # id (optional)
+Expects a string with all ids the pre should have.
+
+#### # class (optional)
+Expects a string with all classes the pre should have.
+
+#### # text (optional)
+Expects a ruby string with the text the address tag should show.
+
+## Example 1: Yield a given block
+
+```ruby
+pre id: "foo", class: "bar" do
+  plain 'Hello World' # optional content
+end
+```
+
+returns
+
+```html
+<pre id="foo" class="bar">
+  Hello World
+</pre>
+```
+
+## Example 2: Render options[:text] param
+
+```ruby
+pre id: "foo", class: "bar", text: 'Hello World'
+```
+
+returns
+
+```html
+<pre id="foo" class="bar">
+  Hello World
+</pre>
diff --git a/spec/usage/components/aside_spec.rb b/spec/usage/components/aside_spec.rb
@@ -0,0 +1,44 @@
+require_relative "../../support/utils"
+include Utils
+
+describe "Aside Component", type: :feature, js: true do
+  it "Example 1" do
+    class ExamplePage < Matestack::Ui::Page
+
+      def response
+        components {
+          #simple aside
+          aside
+
+          #simple aside with attributes
+          aside id: "my-id", class: "my-class"
+
+          #nested aside
+          aside do
+            paragraph text: "This is some text"
+          end
+        }
+      end
+
+    end
+
+    visit "/example"
+
+    static_output = page.html
+
+    expected_static_output = <<~HTML
+    <aside></aside>
+
+    <aside id="my-id" class="my-class"></aside>
+
+    <aside>
+      <p>This is some text</p>
+    </aside>
+    HTML
+
+    expect(stripped(static_output)).to include(stripped(expected_static_output))
+  end
+
+end
+
+
diff --git a/spec/usage/components/cite_spec.rb b/spec/usage/components/cite_spec.rb
diff --git a/spec/usage/components/dl_spec.rb b/spec/usage/components/dl_spec.rb
diff --git a/spec/usage/components/noscript_spec.rb b/spec/usage/components/noscript_spec.rb
diff --git a/spec/usage/components/pre_spec.rb b/spec/usage/components/pre_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+%aside{@tag_attributes}`
	`2`	`+ - if block_given?`
	`3`	`+ = yield`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +module Matestack::Ui::Core::Aside
 +  class Aside < Matestack::Ui::Core::Component::Static
++
 +  end
 +end