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

cameronnorman · cameronnorman · commit 130ecd416b07 · 2019-11-19T05:42:30.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -11,10 +11,6 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
-# gem 'pry-byebug', group: [:development, :test]
-
 gem "trailblazer"
 gem "trailblazer-rails"
 gem "trailblazer-cells"
@@ -31,6 +27,7 @@ group :development, :test do
   gem 'puma'
   gem 'simplecov', require: false, group: :test
   gem 'byebug'
+  # gem 'pry-byebug'
   gem 'webmock'
   gem 'webdrivers', '~> 4.1'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (0.7.2.1)
+    matestack-ui-core (0.7.3)
       cells-haml
       cells-rails
       haml
@@ -84,7 +84,7 @@ GEM
     concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.4)
+    crass (1.0.5)
     declarative (0.0.10)
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
@@ -111,7 +111,7 @@ GEM
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
-    loofah (2.2.3)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -124,7 +124,7 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.5.2)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     pipetree (0.1.1)
     poltergeist (1.18.1)
@@ -191,7 +191,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubyzip (1.2.2)
+    rubyzip (1.3.0)
     safe_yaml (1.0.5)
     selenium-webdriver (3.14.1)
       childprocess (~> 0.5)
@@ -201,7 +201,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
diff --git a/app/concepts/matestack/ui/core/bdi/bdi.haml b/app/concepts/matestack/ui/core/bdi/bdi.haml
@@ -0,0 +1,5 @@
+%bdi{@tag_attributes}
+  - if options[:text].blank? && block_given?
+    = yield
+  - else
+    = options[:text]
diff --git a/app/concepts/matestack/ui/core/bdi/bdi.rb b/app/concepts/matestack/ui/core/bdi/bdi.rb
@@ -0,0 +1,4 @@
+module Matestack::Ui::Core::Bdi
+  class Bdi < Matestack::Ui::Core::Component::Static
+  end
+end
diff --git a/app/concepts/matestack/ui/core/data/data.haml b/app/concepts/matestack/ui/core/data/data.haml
@@ -0,0 +1,5 @@
+%data{@tag_attributes}
+  - if options[:text].blank? && block_given?
+    = yield
+  - else
+    = options[:text]
diff --git a/app/concepts/matestack/ui/core/data/data.rb b/app/concepts/matestack/ui/core/data/data.rb
@@ -0,0 +1,9 @@
+module Matestack::Ui::Core::Data
+  class Data < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        "value": options[:value] ||= nil
+      })
+    end
+  end
+end
diff --git a/app/concepts/matestack/ui/core/iframe/iframe.haml b/app/concepts/matestack/ui/core/iframe/iframe.haml
@@ -0,0 +1,5 @@
+%iframe{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]
diff --git a/app/concepts/matestack/ui/core/iframe/iframe.rb b/app/concepts/matestack/ui/core/iframe/iframe.rb
@@ -0,0 +1,14 @@
+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
+
+  end
+end
diff --git a/app/concepts/matestack/ui/core/samp/samp.haml b/app/concepts/matestack/ui/core/samp/samp.haml
@@ -0,0 +1,5 @@
+%samp{@tag_attributes}
+  - if options[:text].blank? && block_given?
+    = yield
+  - else
+    = options[:text]
diff --git a/app/concepts/matestack/ui/core/samp/samp.rb b/app/concepts/matestack/ui/core/samp/samp.rb
@@ -0,0 +1,4 @@
+module Matestack::Ui::Core::Samp
+  class Samp < Matestack::Ui::Core::Component::Static
+  end
+end
diff --git a/app/concepts/matestack/ui/core/wbr/wbr.haml b/app/concepts/matestack/ui/core/wbr/wbr.haml
@@ -0,0 +1 @@
+%wbr{@tag_attributes}
diff --git a/app/concepts/matestack/ui/core/wbr/wbr.rb b/app/concepts/matestack/ui/core/wbr/wbr.rb
@@ -0,0 +1,4 @@
+module Matestack::Ui::Core::Wbr
+  class Wbr < Matestack::Ui::Core::Component::Static
+  end
+end
diff --git a/docs/components/README.md b/docs/components/README.md
@@ -12,12 +12,14 @@ You can build your [own components](/docs/extend/README.md) as well, both static
 - [article](/docs/components/article.md)
 - [aside](/docs/components/aside.md)
 - [b](/docs/components/b.md)
+- [bdi](/docs/components/bdi.md)
 - [blockquote](/docs/components/blockquote.md)
 - [br](/docs/components/br.md)
 - [button](/docs/components/button.md)
 - [caption](/docs/components/caption.md)
 - [cite](/docs/components/cite.md)
 - [code](/docs/components/code.md)
+- [data](/docs/components/data.md)
 - [dl](/docs/components/dl.md)
   - dd
   - dt
@@ -59,6 +61,7 @@ You can build your [own components](/docs/extend/README.md) as well, both static
 - [rt](/docs/components/rb.md)
 - [ruby](/docs/components/ruby.md)
 - [s](/docs/components/s.md)
+- [samp](/docs/components/samp.md)
 - [section](/docs/components/section.md)
 - [small](/docs/components/small.md)
 - [span](/docs/components/span.md)
@@ -72,6 +75,7 @@ You can build your [own components](/docs/extend/README.md) as well, both static
 - [var](/docs/components/var.md)
 - [video](/docs/components/video.md)
 - [youtube](/docs/components/youtube.md)
+- [wbr](/docs/components/wbr.md)
 
 ## Dynamic Core Components
 
diff --git a/docs/components/bdi.md b/docs/components/bdi.md
@@ -0,0 +1,44 @@
+# matestack core component: Bdi
+
+Show [specs](/spec/usage/components/bdi_spec.rb)
+
+The HTML `<bdi>` 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 `<bdi>` should have.
+
+#### # class (optional)
+Expects a string with all classes the `<bdi>` should have.
+
+## Example 1: Yield a given block
+
+```ruby
+bdi id: 'foo', class: 'bar' do
+  plain 'Bdi example 1' # optional content
+end
+```
+
+returns
+
+```html
+<bdi id="foo" class="bar">
+  Bdi example 1
+</bdi>
+```
+
+## Example 2: Render `options[:text]` param
+
+```ruby
+bdi id: 'foo', class: 'bar', text: 'Bdi example 2'
+```
+
+returns
+
+```html
+<bdi id="foo" class="bar">
+  Bdi example 2
+</bdi>
diff --git a/docs/components/data.md b/docs/components/data.md
@@ -0,0 +1,47 @@
+# matestack core component: Data
+
+Show [specs](/spec/usage/components/data_spec.rb)
+
+The HTML `<data>` 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 `<data>` should have.
+
+#### # class (optional)
+Expects a string with all classes the `<data>` should have.
+
+#### # value (optional)
+Expects a string and specifies the machine-readable translation of the content of the `<data>` element.
+
+## Example 1: Yield a given block
+
+```ruby
+data id: 'foo', class: 'bar', value: '1300' do
+  plain 'Data example 1' # optional content
+end
+```
+
+returns
+
+```html
+<data id="foo" class="bar" value="1300">
+  Data example 1
+</data>
+```
+
+## Example 2: Render `options[:text]` param
+
+```ruby
+data id: 'foo', class: 'bar', value: '1301', text: 'Data example 2'
+```
+
+returns
+
+```html
+<data id="foo" class="bar" value="1301">
+  Data example 2
+</data>
diff --git a/docs/components/iframe.md b/docs/components/iframe.md
@@ -0,0 +1,58 @@
+# matestack core component: Iframe
+
+Show [specs](/spec/usage/components/iframe_spec.rb)
+
+The HTML iframe tag implemented in ruby.
+
+## Parameters
+
+This component can take 3 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 `iframe` should have.
+
+#### # class (optional)
+Expects a string with all classes the `iframe` should have for styling purpose.
+
+#### # height (optional)
+Specifies the height of an `iframe`.
+
+#### # width (optional)
+Specifies the width of an `iframe`.
+
+#### # src
+Specifies the address of the document to embed in the `iframe` tag.
+
+#### # srcdoc
+Specifies the HTML content of the page to show in the inline frame.
+
+## Example 1: Yield a given block
+
+```ruby
+iframe id: "foo", class: "bar", src="https://www.demopage.com" do
+  plain 'The browser does not support iframe.'
+end
+```
+
+returns
+
+```html
+<iframe id="foo" class="bar" src="https://www.demopage.com">
+  The browser does not support iframe.
+</iframe>
+```
+
+## Example 2: Render options[:text] param
+
+```ruby
+iframe id: "foo", class: "bar", src="https://www.demopage.com", text: 'The browser does not support iframe.'
+```
+
+returns
+
+```html
+<iframe id="foo" class="bar" src="https://www.demopage.com">
+  The browser does not support iframe.
+</iframe>
+```
+
diff --git a/docs/components/samp.md b/docs/components/samp.md
@@ -0,0 +1,44 @@
+# matestack core component: Samp
+
+Show [specs](/spec/usage/components/samp_spec.rb)
+
+The HTML `<samp>` 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 `<samp>` should have.
+
+#### # class (optional)
+Expects a string with all classes the `<samp>` should have.
+
+## Example 1: Yield a given block
+
+```ruby
+samp id: 'foo', class: 'bar' do
+  plain 'Samp example 1' # optional content
+end
+```
+
+returns
+
+```html
+<samp id="foo" class="bar">
+  Samp example 1
+</samp>
+```
+
+## Example 2: Render `options[:text]` param
+
+```ruby
+samp id: 'foo', class: 'bar', text: 'Samp example 2'
+```
+
+returns
+
+```html
+<samp id="foo" class="bar">
+  Samp example 2
+</samp>
diff --git a/docs/components/wbr.md b/docs/components/wbr.md
@@ -0,0 +1,31 @@
+# matestack core component: Wbr
+
+Show [specs](/spec/usage/components/wbr_spec.rb)
+
+The HTML `<wbr>` tag implemented in ruby.
+
+## Parameters
+
+This component can take 2 optional configuration params.
+
+#### # id (optional)
+Expects a string with all ids the `<wbr>` should have.
+
+#### # class (optional)
+Expects a string with all classes the `<wbr>` should have.
+
+## Example 1: Usage
+
+```ruby
+paragraph do
+  plain 'First part of text'
+  wbr id: 'foo', class: 'bar'
+  plain 'Second part of text'
+end
+```
+
+returns
+
+```html
+<p>First part of text<wbr id="foo" class="bar">Second part of text</p>
+```
diff --git a/lib/generators/matestack/page/templates/app/matestack/pages/%app_name%/%namespace%/%file_name%.rb.tt b/lib/generators/matestack/page/templates/app/matestack/pages/%app_name%/%namespace%/%file_name%.rb.tt
diff --git a/spec/usage/components/bdi_spec.rb b/spec/usage/components/bdi_spec.rb
diff --git a/spec/usage/components/data_spec.rb b/spec/usage/components/data_spec.rb
diff --git a/spec/usage/components/iframe_spec.rb b/spec/usage/components/iframe_spec.rb
diff --git a/spec/usage/components/samp_spec.rb b/spec/usage/components/samp_spec.rb
diff --git a/spec/usage/components/wbr_spec.rb b/spec/usage/components/wbr_spec.rb

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +module Matestack::Ui::Core::Bdi
 +  class Bdi < Matestack::Ui::Core::Component::Static
 +  end
 +end