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

Multiple small changes #509

Merged
merged 12 commits into from
Sep 9, 2016
Merged

Multiple small changes #509

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
322b70e
Ignore bin/ directory produced by Eclipse.
kduske-n4 Sep 5, 2016
b888ad0
Recursively convert nested maps to ruby hashes.
kduske-n4 Sep 5, 2016
da27101
Merge remote-tracking branch 'upstream/asciidoctorj-1.6.0' into ascii…
kduske-n4 Sep 5, 2016
5d5885a
Convert nested Java maps to Ruby hashes by assuming the keys are stri…
kduske-n4 Sep 5, 2016
4179176
Return null if the inner document of a table cell is nil.
kduske-n4 Sep 6, 2016
910d62d
Add getter for @content_model variable of AbstractBlock.
kduske-n4 Sep 6, 2016
fdec5df
Merge remote-tracking branch 'upstream/asciidoctorj-1.6.0' into ascii…
kduske-n4 Sep 6, 2016
36a6608
Add test for content_model getter on StructuralNode.
kduske-n4 Sep 8, 2016
aa97f3d
Add test case for accessing the inner document of table cells that do…
kduske-n4 Sep 8, 2016
e1bd9ed
Add test case for avoiding a ClassCastException when accessing the at…
kduske-n4 Sep 8, 2016
ec92620
Formatting.
kduske-n4 Sep 8, 2016
f29d27a
Fix a few code style problems.
kduske-n4 Sep 9, 2016
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
bin/
build/
target/
.classpath
Expand Down
9 changes: 9 additions & 0 deletions asciidoctorj-core/src/main/java/org/asciidoctor/ast/StructuralNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,15 @@ public interface StructuralNode extends ContentNode {
List<StructuralNode> findBy(Map<Object, Object> selector);
int getLevel();

/**
* Returns the content model.
*
* @see ContentModel
*
* @return the content model
*/
String getContentModel();

/**
* Returns the source location of this block.
* This information is only available if the {@code sourcemap} option is enabled when loading or rendering the document.
Expand Down
5 changes: 4 additions & 1 deletion asciidoctorj-core/src/main/java/org/asciidoctor/ast/impl/CellImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ public void setVerticalAlignment(Table.VerticalAlignment valign) {

@Override
public Document getInnerDocument() {
return (Document) NodeConverter.createASTNode(getRubyProperty("inner_document"));
IRubyObject innerDocument = getRubyProperty("inner_document");
if (innerDocument.isNil())
return null;
return (Document) NodeConverter.createASTNode(innerDocument);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested it, but I don't think this will compile.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does, though. Why shouldn't it?

Copy link
Member

@robertpanzer robertpanzer Sep 8, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha! :-)
Could you please add braces around the return null?

I probably automatically put them in there mentally around both returns that have the same indentation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

}

@Override
Expand Down
7 changes: 6 additions & 1 deletion asciidoctorj-core/src/main/java/org/asciidoctor/ast/impl/StructuralNodeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class StructuralNodeImpl extends ContentNodeImpl implements StructuralNod

private static final String BLOCK_CLASS = "Block";
private static final String SECTION_CLASS = "Section";

public StructuralNodeImpl(IRubyObject blockDelegate) {
super(blockDelegate);
}
Expand Down Expand Up @@ -91,6 +91,11 @@ public Cursor getSourceLocation() {
return new CursorImpl(object);
}

@Override
public String getContentModel() {
return getString("content_model");
}

@Override
public List<String> getSubstitutions() {
return getList("subs", String.class);
Expand Down
2 changes: 2 additions & 0 deletions asciidoctorj-core/src/main/java/org/asciidoctor/internal/RubyHashUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ private static IRubyObject toRubyObject(Ruby rubyRuntime, Object value) {

if (value instanceof List) {
return toRubyArray(rubyRuntime, (List<Object>) value);
} else if (value instanceof Map) {
return convertMapToRubyHashWithStrings(rubyRuntime, (Map<String, Object>) value);
} else {

if (isNotARubySymbol(value)) {
Expand Down