Skip to content
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.

Sign up for GitHub

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

Replace unreleased ScriptExtractor with generic ElementExtractor #349

Merged
merged 2 commits into from
Dec 9, 2020
Merged

Replace unreleased ScriptExtractor with generic ElementExtractor #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
442f447
Add extract-element flux command based on CSS-style selector
fsteeg Nov 11, 2020
99bc941
Remove unreleased ScriptExtractor
fsteeg Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions ...org/metafacture/html/ScriptExtractor.java → ...rg/metafacture/html/ElementExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,30 @@
import org.metafacture.framework.helpers.DefaultObjectPipe;

/**
* Extracts the first script from an HTML document
* Extracts the the specified element from an HTML document
*
* @author Fabian Steeg
*/
@Description("Extracts the first script from an HTML document")
@Description("Extracts the specified element from an HTML document")
@In(Reader.class)
@Out(String.class)
@FluxCommand("extract-script")
public class ScriptExtractor extends DefaultObjectPipe<Reader, ObjectReceiver<String>> {
@FluxCommand("extract-element")
public class ElementExtractor extends DefaultObjectPipe<Reader, ObjectReceiver<String>> {
private String selector;

/**
* @param selector The CSS-style jsoup selector, see https://jsoup.org/cookbook/extracting-data/selector-syntax
*/
public ElementExtractor(final String selector) {
this.selector = selector;
}

@Override
public void process(final Reader reader) {
try {
Document document = Jsoup.parse(IOUtils.toString(reader));
Element firstScript = document.select("script").first();
getReceiver().process(firstScript.data());
Element firstElement = document.select(selector).first();
getReceiver().process(firstElement.data());
} catch (IOException e) {
e.printStackTrace();
}
Expand Down
2 changes: 1 addition & 1 deletion metafacture-html/src/main/resources/flux-commands.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# limitations under the License.
#
decode-html org.metafacture.html.HtmlDecoder
extract-script org.metafacture.html.ScriptExtractor
extract-element org.metafacture.html.ElementExtractor
19 changes: 11 additions & 8 deletions ...metafacture/html/ScriptExtractorTest.java → ...etafacture/html/ElementExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,37 +28,40 @@
import org.mockito.MockitoAnnotations;

/**
* Tests for {@link ScriptExtractor}.
* Tests for {@link ElementExtractor}.
*
* @author Fabian Steeg
*
*/
public final class ScriptExtractorTest {
public final class ElementExtractorTest {

private static final StringReader IN = new StringReader("<html><script>{\"code\":\"yo\"}");
private static final StringReader IN = new StringReader("<html>"
+ "<script data-test='site-head-data'>{\"code\":\"hey\"}</script>"
+ "<script data-test='model-linked-data'>{\"code\":\"yo\"}");

private static final String OUT = "{\"code\":\"yo\"}";

private ScriptExtractor scriptExtractor;
private ElementExtractor elementExtractor;

@Mock
private ObjectReceiver<String> receiver;

@Before
public void setup() {
MockitoAnnotations.initMocks(this);
scriptExtractor = new ScriptExtractor();
scriptExtractor.setReceiver(receiver);
elementExtractor = new ElementExtractor("script[data-test=model-linked-data]");
elementExtractor.setReceiver(receiver);
}

@Test
public void testShouldProcessRecordsFollowedbySeparator() {
scriptExtractor.process(IN);
elementExtractor.process(IN);
verify(receiver).process(OUT);
verifyNoMoreInteractions(receiver);
}

@After
public void cleanup() {
scriptExtractor.closeStream();
elementExtractor.closeStream();
}
}