-
Notifications
You must be signed in to change notification settings - Fork 171
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
Added Capitalized #1465
Merged
Merged
Added Capitalized #1465
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e0d374b
Added Capitalized
kokodyn d9a55ab
add using Ternary and other fixes
kokodyn 06a1c65
#1465: changed Upper to Character.toTitleCase and other fixes
kokodyn 114a646
#1465: add using Joined and other simplifications
kokodyn 03c34da
simplify logic and use upper
kokodyn 33c1c2c
add TODO comment to replace using Character#toTitleCase(int) in future
kokodyn 09b9113
simplify logic
kokodyn 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 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,74 @@ | ||
/* | ||
* The MIT License (MIT) | ||
* | ||
* Copyright (c) 2017-2020 Yegor Bugayenko | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included | ||
* in all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
package org.cactoos.text; | ||
|
||
import org.cactoos.Text; | ||
import org.cactoos.scalar.Ternary; | ||
|
||
/** | ||
* Text in capitalized case, | ||
* changed the first character to title case as per {@link Character#toTitleCase(int)}, | ||
* no other characters are changed. | ||
* | ||
* @since 0.46 | ||
*/ | ||
public final class Capitalized extends TextEnvelope { | ||
|
||
/** | ||
* Ctor. | ||
* | ||
* @param text The text | ||
*/ | ||
public Capitalized(final String text) { | ||
this(new TextOf(text)); | ||
} | ||
|
||
/** | ||
* Ctor. | ||
* TODO replace {@link Character#toTitleCase(int)} by it's EO version | ||
|
||
* @param text The text | ||
*/ | ||
public Capitalized(final Text text) { | ||
super( | ||
new TextOf( | ||
() -> { | ||
return new Ternary<Text>( | ||
new IsBlank(text), | ||
() -> text, | ||
() -> new Joined( | ||
"", | ||
new TextOf( | ||
Character.toChars( | ||
Character.toTitleCase( | ||
new Sub(text, 0, 1).asString().codePointAt(0) | ||
) | ||
) | ||
), | ||
new Sub(text, 1) | ||
) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @kokodyn The indentation looks odd here. And at 70 as well. |
||
).value().asString(); | ||
})); | ||
} | ||
} |
This file contains 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,99 @@ | ||
/* | ||
* The MIT License (MIT) | ||
* | ||
* Copyright (c) 2017-2020 Yegor Bugayenko | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included | ||
* in all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
package org.cactoos.text; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.llorllale.cactoos.matchers.Assertion; | ||
import org.llorllale.cactoos.matchers.TextIs; | ||
|
||
/** | ||
* Test case for {@link Capitalized}. | ||
* @since 0.46 | ||
*/ | ||
@SuppressWarnings("PMD.AvoidDuplicateLiterals") | ||
final class CapitalizedTest { | ||
|
||
@Test | ||
void capitalizeEmptyText() { | ||
new Assertion<>( | ||
"Must capitalize an empty text", | ||
new Capitalized(new TextOf("")), | ||
new TextIs("") | ||
).affirm(); | ||
} | ||
|
||
@Test | ||
void capitalizeSingleLowerCaseText() { | ||
new Assertion<>( | ||
"Must capitalize single lower case text", | ||
new Capitalized(new TextOf("f")), | ||
new TextIs("F") | ||
).affirm(); | ||
} | ||
|
||
@Test | ||
void capitalizeSingleUpperCaseText() { | ||
new Assertion<>( | ||
"Must capitalize single upper case text", | ||
new Capitalized(new TextOf("F")), | ||
new TextIs("F") | ||
).affirm(); | ||
} | ||
|
||
@Test | ||
void capitalizeTextStartingWithUpperCaseCharacter() { | ||
new Assertion<>( | ||
"Must capitalize text starting with upper case character", | ||
new Capitalized("Bar"), | ||
new TextIs("Bar") | ||
).affirm(); | ||
} | ||
|
||
@Test | ||
void capitalizeTextStartingWithLowerCaseCharacter() { | ||
new Assertion<>( | ||
"Must capitalize text starting with lower case character", | ||
new Capitalized(new TextOf("xyz")), | ||
new TextIs("Xyz") | ||
).affirm(); | ||
} | ||
|
||
@Test | ||
void capitalizeTextWithUnicodeCharacter() { | ||
new Assertion<>( | ||
"Must capitalize unicode character dž", | ||
new Capitalized("dž"), | ||
new TextIs("Dž") | ||
).affirm(); | ||
} | ||
|
||
@Test | ||
void capitalizeString() { | ||
new Assertion<>( | ||
"Must capitalize string", | ||
new Capitalized("foo"), | ||
new TextIs("Foo") | ||
).affirm(); | ||
} | ||
} |
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.
@kokodyn I believe you can directly write
new TextOf(Character.toTitleCase(text.asString().codePointAt(0)))
no?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.
@victornoel
Good point!
new TextOf(Character.toChars(Character.toTitleCase(text.asString().codePointAt(0))))
I believe this is the easiest version