-
-
Notifications
You must be signed in to change notification settings - Fork 43
ISSUE #183 Adds del component #225
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
89d4975
Adds the del component
cameronnorman 5895efc
Merge branch 'develop' of github.com:basemate/matestack-ui-core into …
cameronnorman 337b28d
Required changes for del
cameronnorman 2ab910c
Merge branch 'master' of github.com:basemate/matestack-ui-core into i…
cameronnorman 130ecd4
Merge branch 'develop' of github.com:basemate/matestack-ui-core into …
cameronnorman 895094f
pulled develop and made small changes
cameronnorman 395bd17
fixes spec
cameronnorman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
%del{@tag_attributes.merge({:cite => options[:cite], :datetime => options[:datetime]})} | ||
- if options[:text].nil? && block_given? | ||
= yield | ||
- else | ||
= options[:text] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
module Matestack::Ui::Core::Del | ||
class Del < Matestack::Ui::Core::Component::Static | ||
end | ||
end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
# matestack core component: Del | ||
|
||
Show [specs](/spec/usage/components/del_spec.rb) | ||
|
||
The HTML del 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 del should have. | ||
|
||
#### # class (optional) | ||
Expects a string with all classes the del should have. | ||
|
||
#### # cite (optional) | ||
Expects a string with a URL to a document that explains the reason why the text was deleted. | ||
|
||
#### # datetime (optional) | ||
Expects a string which specifies the date and time of when the text was deleted. | ||
|
||
## Example 1: Yield a given block | ||
|
||
```ruby | ||
del id: "foo", class: "bar" do | ||
plain 'Hello World' # optional content | ||
end | ||
``` | ||
|
||
returns | ||
|
||
```html | ||
<del id="foo" class="bar"> | ||
Hello World | ||
</del> | ||
``` | ||
|
||
## Example 2: Render options[:text] param | ||
|
||
```ruby | ||
del id: "foo", class: "bar", text: 'Hello World' | ||
``` | ||
|
||
returns | ||
|
||
```html | ||
<del id="foo" class="bar"> | ||
Hello World | ||
</del> | ||
pascalwengerter marked this conversation as resolved.
Show resolved
Hide resolved
|
||
``` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
require_relative "../../support/utils" | ||
include Utils | ||
RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 10_000 | ||
describe 'Del Component', type: :feature, js: true do | ||
|
||
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 | ||
} | ||
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> | ||
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' | ||
} | ||
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> | ||
HTML | ||
|
||
expect(stripped(static_output)).to include(stripped(expected_static_output)) | ||
end | ||
|
||
end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd prefer the
@tag_attributes.merge([...])
stuff to be within a setup method in the del.rb, but that's a personal preference. Should be fine like this for now.