Merge branch 'develop' into document_link_param_option

Author: pascalwengerter

Gemfile

@@ -13,6 +13,7 @@ gemspec
 
 # To use a debugger
 # gem 'byebug', group: [:development, :test]
+# gem 'pry-byebug', group: [:development, :test]
 
 gem "trailblazer"
 gem "trailblazer-rails"

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

@@ -17,7 +17,6 @@ class App < Trailblazer::Cell
     include ActionView::Helpers::JavaScriptHelper
     include ActionView::Helpers::NumberHelper
     include ActionView::Helpers::OutputSafetyHelper
-    include ActionView::Helpers::RecordTagHelper
     # include ActionView::Helpers::RenderingHelper
     include ActionView::Helpers::SanitizeHelper
     include ActionView::Helpers::TagHelper

app/concepts/matestack/ui/core/component/dynamic.rb

@@ -18,7 +18,6 @@ class Dynamic < Trailblazer::Cell
     include ActionView::Helpers::JavaScriptHelper
     include ActionView::Helpers::NumberHelper
     include ActionView::Helpers::OutputSafetyHelper
-    include ActionView::Helpers::RecordTagHelper
     # include ActionView::Helpers::RenderingHelper
     include ActionView::Helpers::SanitizeHelper
     include ActionView::Helpers::TagHelper

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

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

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

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

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

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

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

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

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

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

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

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

app/concepts/matestack/ui/core/js/core.js

@@ -10,7 +10,6 @@ import html from 'html/html'
 import transition from 'transition/transition'
 import action from 'action/action'
 import form from 'form/form'
-import view from 'view/view'
 import onclick from 'onclick/onclick'
 import collectionContent from 'collection/content/content'
 import collectionFilter from 'collection/filter/filter'

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

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

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

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

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

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

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

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

app/concepts/matestack/ui/core/meter/meter.rb

@@ -0,0 +1,14 @@
+module Matestack::Ui::Core::Meter
+  class Meter < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        value: options[:value],
+        min: options[:min],
+        max: options[:max],
+        low: options[:low],
+        high: options[:high],
+        optimum: options[:optimum]
+      })
+    end
+  end
+end

app/concepts/matestack/ui/core/var/var.haml

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

app/concepts/matestack/ui/core/var/var.rb

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

app/concepts/matestack/ui/core/view/view.haml

@@ -1,3 +1,2 @@
 Matestack::Ui::Core::Engine.routes.draw do
-  get '/div', to: 'docs#div'
 end

app/concepts/matestack/ui/core/view/view.js

@@ -4,7 +4,7 @@ In this section, we take a deep dive into how Matestack is implemented.
 
 **The Matestack core was developed while iterating concepts following the main goal of `just making it work`. Therefore, the core is not yet well engineered in some places. After we were happy with it working, we've spent quite some time writing tests to save the status quo, and now we're about to refactor the core.**
 
-Please refer to the [detailed architectural drawing](/docs/architecture/matestack_rendering.png) while reading the following documentation.
+Please refer to the [detailed architectural drawing](https://raw.githubusercontent.com/basemate/matestack-ui-core/master/docs/architecture/matestack_rendering.png) while reading the following documentation.
 
 ## Example
 

app/concepts/matestack/ui/core/view/view.rb

@@ -5,20 +5,23 @@ You can build your [own components](/docs/extend/custom_components.md) as well,
 
 ## Static Core Components
 
+- [b](/docs/components/b.md)
+- [br](/docs/components/br.md)
 - [div](/docs/components/div.md)
-- [header](/docs/components/header.md)
+- [figure](/docs/components/figure.md)
 - [footer](/docs/components/footer.md)
+- [header](/docs/components/header.md)
+- [heading](/docs/components/heading.md)
+- [kbd](/docs/components/kbd.md)
+- [hr](/docs/components/hr.md)
+- [icon](/docs/components/icon.md)
+- [ins](/docs/components/ins.md)
 - [main](/docs/components/main.md)
 - [nav](/docs/components/nav.md)
-- [section](/docs/components/section.md)
-- [br](/docs/components/br.md)
-- [hr](/docs/components/hr.md)
-- [heading](/docs/components/heading.md)
 - [plain](/docs/components/plain.md)
 - [pg](/docs/components/pg.md)
+- [section](/docs/components/section.md)
 - [span](/docs/components/span.md)
-- [b](/docs/components/b.md)
-- [icon](/docs/components/icon.md)
 - [list](/docs/components/list.md)
   - ul
   - ol
@@ -28,7 +31,6 @@ You can build your [own components](/docs/extend/custom_components.md) as well,
   - tr
   - td
 - [img](/docs/components/img.md)
-- [video](/docs/components/video.md)
 - [button](/docs/components/button.md)
 - [link](/docs/components/link.md)
 - [label](/docs/components/label.md)
@@ -37,10 +39,12 @@ You can build your [own components](/docs/extend/custom_components.md) as well,
 - [rt](/docs/components/rb.md)
 - [rp](/docs/components/rt.md)
 - [legend](/docs/components/legend.md)
+- [mark](/docs/components/mark.md)
 - [noscript](/docs/components/noscript.md)
 - [sup](/docs/components/sup.md)
 - [sub](/docs/components/sub.md)
-- [kbd](/docs/components/kbd.md)
+- [var](/docs/components/var.md)
+- [video](/docs/components/video.md)
 
 ## Dynamic Core Components
 

config/routes.rb

@@ -0,0 +1,81 @@
+# matestack core component: Fieldset
+
+Show [specs](/spec/usage/components/fieldset_spec.rb)
+
+Use Fieldset to group several `<input>` and `<label>` tags.
+
+
+## Parameters
+
+`<fieldset>` can take two optional configuration params and optional content.
+
+
+### Optional configuration
+
+#### id (optional)
+
+Expects a string with all ids the details tag should have.
+
+#### class (optional)
+
+Expects a string with all classes the details tag should have.
+
+#### Disabled (optional)
+
+Set `disabled` attribute on `<fieldset>` to disable all controls inside the `<fieldset>`
+
+## Example 1
+
+```ruby
+ fieldset do
+    legend text: 'Your Inputs for Personal details'
+    label text: 'Personal Detail'
+    input
+  end
+```
+
+```html
+<fieldset>
+  <legend>Your Inputs for Personal details</legend>
+  <label>Personal Detail</label>
+  <input>
+</fieldset>
+```
+
+## Example 2
+
+```ruby
+fieldset id: 'foo', class: 'bar' do
+  legend id: 'baz', text: 'Your Inputs for Personal details'
+  label text: 'Personal Detail'
+  input 
+end
+```
+
+```html
+<fieldset id="foo" class="bar">
+  <legend id="baz">Your Inputs for Personal details</legend>
+  <label>Personal Detail</label>
+  <input>
+</fieldset>
+```
+
+
+### Example 3
+
+**With Disabled Attribute**
+
+```ruby 
+fieldset disabled: true do
+  legend text: 'input legend'
+  input
+end
+```
+
+```html 
+<fieldset disabled="disabled">
+  <legend>input legend</legend>
+  <input>
+</fieldset>
+```
+

docs/architecture/README.md

@@ -0,0 +1,31 @@
+# matestack core component: Figure
+
+Show [specs](/spec/usage/components/figure_spec.rb)
+
+The HTML `<figure>` 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 figure tag should have.
+
+#### # class (optional)
+Expects a string with all classes the figure tag should have.
+
+## Example 1
+
+```ruby
+figure id: "foo", class: "bar" do
+  img path: 'matestack-logo.png', width: 500, height: 300, alt: "logo"
+end
+```
+
+returns
+
+```html
+<figure id="foo" class="bar">
+  <img src="your-asset-path/matestack-logo.png" width="500" height="300" alt="logo"/>
+</figure>
+```