Merge pull request #74 from basemate/update_span_component

Update span component in 0.7.0

Author: jonasjabari

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (0.6.0)
+    matestack-ui-core (0.7.0)
       cells-haml
       cells-rails
       haml

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

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

docs/components/span.md

@@ -6,15 +6,15 @@ The HTML span tag implemented in ruby.
 
 ## Parameters
 
-This component can take 2 optional configuration params and optional content.
+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 span should have.
 
 #### # class (optional)
 Expects a string with all classes the span should have.
 
-## Example
+## Example 1: Yield a given block
 
 ```ruby
 span id: "foo", class: "bar" do
@@ -29,3 +29,16 @@ returns
   Hello World
 </span>
 ```
+
+## Example 2: Render options[:text] param
+
+```ruby
+span id: "foo", class: "bar", text: 'Hello World'
+```
+
+returns
+
+```html
+<span id="foo" class="bar">
+  Hello World
+</span>

spec/usage/components/span_spec.rb

@@ -3,7 +3,7 @@
 
 describe 'Span Component', type: :feature, js: true do
 
-  it 'Example 1' do
+  it 'Example 1 - yield, no options[:text]' do
 
     class ExamplePage < Matestack::Ui::Page
 
@@ -35,4 +35,32 @@ def response
     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 span
+          span text: 'I am simple'
+
+          # enhanced span
+          span id: 'my-id', class: 'my-class',text: 'I am enhanced'
+        }
+      end
+
+    end
+
+    visit '/example'
+
+    static_output = page.html
+
+    expected_static_output = <<~HTML
+    <span>I am simple</span>
+    <span id="my-id" class="my-class">I am enhanced</span>
+    HTML
+
+    expect(stripped(static_output)).to include(stripped(expected_static_output))
+  end
+
 end