Skip to content

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed Aug 4, 2017
2 parents 7a45ee3 + 6944bb3 commit 4abcfa7
Show file tree
Hide file tree
Showing 5 changed files with 251 additions and 1 deletion.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,9 @@ Cactoos | Guava | Apache Commons | JDK 8
`SplitText` | - | - | `String#split()`
`EncodedUrl` | - | - | `URLEncoder.encode()`
`SubText` | - | - | `String#substring()`
`TrimmedText` | - | - | `String#trim()`
`TrimmedText` | - | `StringUtils.stripAll()` | `String#trim()`
`TrimmedLeftText` | - | `StringUtils.stripStart()` | -
`TrimmedRightText` | - | `StringUtils.stripEnd()` | -
`UpperText` | - | - | `String#toUpperCase()`
`DecodedUrl` | - | - | `URLDecoder.decode()`
`StickyList` | ? | ? | `Arrays.asList()`
Expand Down
69 changes: 69 additions & 0 deletions src/main/java/org/cactoos/text/TrimmedLeftText.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 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 java.io.IOException;
import org.cactoos.Text;

/**
* Text without control characters (char <= 32) only from left.
*
* <p>There is no thread-safety guarantee.
*
* @author Mehmet Yildirim ([email protected])
* @version $Id$
* @since 0.12
*/
public final class TrimmedLeftText implements Text {

/**
* The text.
*/
private final Text origin;

/**
* Ctor.
* @param text The text
*/
public TrimmedLeftText(final Text text) {
this.origin = text;
}

@Override
public String asString() throws IOException {
final String text = this.origin.asString();
int cursor = 0;
while (cursor < text.length() && Character.isWhitespace(
text.charAt(cursor)
)) {
cursor = cursor + 1;
}
return text.substring(cursor);
}

@Override
public int compareTo(final Text text) {
return new UncheckedText(this).compareTo(text);
}
}
67 changes: 67 additions & 0 deletions src/main/java/org/cactoos/text/TrimmedRightText.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 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 java.io.IOException;
import org.cactoos.Text;

/**
* Text without control characters (char &lt;= 32) only from right.
*
* <p>There is no thread-safety guarantee.
*
* @author Mehmet Yildirim ([email protected])
* @version $Id$
* @since 0.12
*/
public final class TrimmedRightText implements Text {

/**
* The text.
*/
private final Text origin;

/**
* Ctor.
* @param text The text
*/
public TrimmedRightText(final Text text) {
this.origin = text;
}

@Override
public String asString() throws IOException {
final String text = this.origin.asString();
int cursor = text.length() - 1;
while (cursor >= 0 && Character.isWhitespace(text.charAt(cursor))) {
cursor = cursor - 1;
}
return text.substring(0, cursor + 1);
}

@Override
public int compareTo(final Text text) {
return new UncheckedText(this).compareTo(text);
}
}
56 changes: 56 additions & 0 deletions src/test/java/org/cactoos/text/TrimmedLeftTextTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 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.TextHasString;
import org.hamcrest.MatcherAssert;
import org.junit.Test;

/**
* Test case for {@link TrimmedLeftText}.
* @author Mehmet Yildirim ([email protected])
* @version $Id$
* @since 0.12
* @checkstyle JavadocMethodCheck (500 lines)
*/
public final class TrimmedLeftTextTest {

@Test
public void convertsText() {
MatcherAssert.assertThat(
"Can't left trim a text",
new TrimmedLeftText(new TextOf(" Hello! \t ")),
new TextHasString("Hello! \t ")
);
}

@Test
public void trimmedBlankTextIsEmptyText() {
MatcherAssert.assertThat(
"Can't trim a blank text",
new TrimmedLeftText(new TextOf(" \t ")),
new TextHasString("")
);
}
}
56 changes: 56 additions & 0 deletions src/test/java/org/cactoos/text/TrimmedRightTextTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 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.TextHasString;
import org.hamcrest.MatcherAssert;
import org.junit.Test;

/**
* Test case for {@link TrimmedRightText}.
* @author Mehmet Yildirim ([email protected])
* @version $Id$
* @since 0.12
* @checkstyle JavadocMethodCheck (500 lines)
*/
public final class TrimmedRightTextTest {

@Test
public void convertsText() {
MatcherAssert.assertThat(
"Can't right trim a text",
new TrimmedRightText(new TextOf(" Hello! \t ")),
new TextHasString(" Hello!")
);
}

@Test
public void trimmedBlankTextIsEmptyText() {
MatcherAssert.assertThat(
"Can't trim a blank text",
new TrimmedRightText(new TextOf(" \t ")),
new TextHasString("")
);
}
}

0 comments on commit 4abcfa7

Please sign in to comment.