diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-07 12:12:41 -0400 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-07 12:12:41 -0400 |
commit | 24922dbf881adf72ad828b24eb616c92ce96fb17 (patch) | |
tree | ba2daaf200b7e40845764976c01d5f2545aa847c /lib | |
parent | 3d63d763184980f2423f11070c8b1b4001c2a495 (diff) | |
download | ffi-yajl-24922dbf881adf72ad828b24eb616c92ce96fb17.tar.gz |
change allow_comment default to true
this matches yajl-ruby's default and fixes a regression in Chef
where we stopped accepting comments.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ffi_yajl/parser.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ffi_yajl/parser.rb b/lib/ffi_yajl/parser.rb index d095011..b6c8ce2 100644 --- a/lib/ffi_yajl/parser.rb +++ b/lib/ffi_yajl/parser.rb @@ -41,7 +41,12 @@ module FFI_Yajl raise ArgumentError, "options check_utf8 and dont_validate_strings are both true which conflict" end - yajl_opts[:yajl_allow_comments] = @opts[:allow_comments] + yajl_opts[:yajl_allow_comments] = true + + if @opts.key?(:allow_comments) + yajl_opts[:yajl_allow_comments] = @opts[:allow_comments] + end + yajl_opts[:yajl_dont_validate_strings] = (@opts[:check_utf8] == false || @opts[:dont_validate_strings]) yajl_opts[:yajl_allow_trailing_garbage] = @opts[:allow_trailing_garbage] yajl_opts[:yajl_allow_multiple_values] = @opts[:allow_multiple_values] |