-
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
Added Capitalized #1465
Changes from 3 commits
e0d374b
d9a55ab
06a1c65
114a646
03c34da
33c1c2c
09b9113
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
* 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.Func; | ||
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. | ||
* | ||
* @param text The text | ||
*/ | ||
public Capitalized(final Text text) { | ||
super( | ||
new TextOf( | ||
() -> { | ||
final Func<Text, Text> capitalize = cap -> { | ||
final Text titled = new TextOf( | ||
Character.toChars( | ||
Character.toTitleCase( | ||
cap.asString().codePointAt(0) | ||
) | ||
) | ||
); | ||
return | ||
new Ternary<Text>( | ||
() -> new StartsWith(cap, titled).value(), | ||
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 I believe you can use directly 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. @victornoel done |
||
() -> cap, | ||
() -> new TextOf(new StringBuilder() | ||
.append(titled.asString()) | ||
.append(new Sub(text, 1)) | ||
.toString() | ||
) | ||
kokodyn marked this conversation as resolved.
Show resolved
Hide resolved
|
||
) | ||
.value(); | ||
}; | ||
return new Ternary<Text>( | ||
text, | ||
t -> new IsBlank(t).value(), | ||
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 here too you can directly pass 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. @victornoel done |
||
t -> t, | ||
t -> capitalize.apply(t) | ||
).value().asString(); | ||
})); | ||
} | ||
} |
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(); | ||
} | ||
} |
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 there is something strange with indentation here
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 I hope now it looks better.