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.

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

Bugfix/non ascii in xml (reorganized) #807

Merged
merged 9 commits into from Feb 14, 2014

Conversation

shino
Copy link
Contributor

@shino shino commented Feb 12, 2014

Yet another PR for non-ASCII and XML related issues #787 and #628 (reorganized version of #796 ).

The previous PR #796 is some shortcut approach to the bugs, so
this PR reorganizes the diffs into smaller/step-by-step pieces.
(The total diffs of these PRs are identical.)

The reviewer(s) can choose from some options:

Additional comments (which is not proper for commit messages), in chronological order:

  • 449d099 * Unicode-aware handling of non-ASCII object keys in multipart uploads

    Direct/honest/strait fix of Failed to upload in the case I use multipart upload #787

  • c7eed7c * Add tests of multipart upload with non-ASCII objet key and listing uploads

    Boto tests for the previous commit 449d099

  • 48be327 * Add Unicode handling of lists in the same manner as binaries

    As commit message says. :)

  • 84a821c * Generarize riak_cs_xml:to_xml/1 to convert xmerl's simple form

    To utilize riak_cs_xml's automatic conversion logic, extends riak_cs_xml:to_xml/1
    to accept xmerl's simple forms and generate XMLs.

  • d35d74a * Use XML export of simple forms of riak_cs_xml:to_xml in multipart uploads

    Use the to_xml in previous commit 84a821c. For multipart related logic.
    This commit overwrites the changes in the first commit 449d099.

  • d215335 * Use XML export of simple forms of riak_cs_xml:to_xml instead of export_xml/1

    Same as previous one, but other than multipart related ones.

  • 9f1d2cd * Fix bug of accept content type

    Not related to non-ASCII bug. Just a bug fix of test case.

  • 863a87a * Add test case of listing users which has non-ASCII UTF-8 characters

    As commit message says.

  • d78cb66 * origin/bugfix/non-ascii-in-xml-reorganized bugfix/non-ascii-in-xml-reorganized Add test case of access stats with xml format

    As commit message says.

The change of riak_cs_xml:format_value/1 affects only the calls of
riak_cs_xml:to_xml/1. All lists, binaries and integers of XML elements
are created in the module riak_cs_xml privately.

On the other hand, this change does not affect calls of
riak_cs_xml:export_xml/1.
Add function clause to treat xmerl's simple forms.
http://www.erlang.org/doc/man/xmerl.html#export_simple-2

This function internally uses riak_cs_xml:format_value/1 so
atoms, intergers, lists and binaries are automatically converted
to lists (of Unicode codepoits, which xmerl accepts).
This is the case of #628.
Fix has already been made by the commit d215335
@shino shino added the Bug label Feb 12, 2014
@shino shino added this to the 1.4.5 milestone Feb 12, 2014
@shino shino mentioned this pull request Feb 12, 2014
@reiddraper
Copy link
Contributor

+1 to merge. Great work!

shino added a commit that referenced this pull request Feb 14, 2014
@shino shino merged commit d7a6b6c into release/1.4 Feb 14, 2014
@shino shino deleted the bugfix/non-ascii-in-xml-reorganized branch February 14, 2014 00:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants