aboutsummaryrefslogtreecommitdiffstats
path: root/ext/psych
Commit message (Collapse)AuthorAgeFilesLines
* * ext/psych/lib/psych.rb: [DOC] Fix a dead link in Psych by @rochefort [ci ↵hsbt2014-04-131-1/+1
| | | | | | skip][fix GH-593] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/psych.gemspec: update gemspec for psych-2.0.5hsbt2014-03-281-3/+3
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych.rb: Merge psych-2.0.5. bump version tohsbt2014-03-284-8/+13
| | | | | | | | | libyaml-0.1.6 for CVE-2014-2525. * ext/psych/yaml/config.h: ditto. * ext/psych/yaml/scanner.c: ditto. * ext/psych/yaml/yaml_private.h: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encodingtenderlove2014-03-013-1/+8
| | | | | | | | | | | | | objects. * ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding objects. * test/psych/test_encoding.rb: add test * ext/psych/lib/psych.rb: add version git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/psych/yaml: suppress warningsnobu2014-02-164-13/+8
| | | | | | | | | | | | * ext/psych/yaml/emitter.c (WRITE_BREAK, PUT_BREAK): suppress unused-value warnings. * ext/psych/yaml/parser.c, ext/psych/yaml/scanner.c: suppress unused-but-set-variable warnings. * ext/psych/yaml/yaml_private.h (STACK_EMPTY): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* yaml/api.c: fix typonobu2014-02-121-1/+1
| | | | | | | * ext/psych/yaml/api.c (yaml_emitter_delete): fix typo 'empty' with 'emitter'. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/yaml/config.h (PACKAGE_VERSION): update.nobu2014-02-051-4/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* yaml/yaml_private.h: include ruby/extconf.hnobu2014-02-051-0/+3
| | | | | | | * ext/psych/yaml/yaml_private.h: need ruby/extconf.h for HAVE_CONFIG_H. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* yaml/api.c, yaml/loader.c: integer overflownobu2014-02-053-19/+59
| | | | | | | | | | | | | | | | | * ext/psych/yaml/api.c (yaml_scalar_event_initialize): fix possible integer overflow. (yaml_document_add_scalar): ditto. (yaml_document_add_sequence): ditto. (yaml_document_add_mapping): ditto. * ext/psych/yaml/loader.c (yaml_parser_load_scalar): ditto. (yaml_parser_load_sequence): ditto. (yaml_parser_load_mapping): ditto. * ext/psych/yaml/scanner.c (yaml_parser_roll_indent): suppress warnigs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* yaml/emitter.c: constify, r37936nobu2014-02-051-3/+3
| | | | | | | | | * ext/psych/yaml/emitter.c (yaml_emitter_write_indicator): constify. * ext/psych/yaml/emitter.c (yaml_emitter_write_block_scalar_hints): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * remove trailing spaces.nobu2014-02-056-16/+16
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych.rb: New release of psych.tenderlove2014-02-042-6/+5
| | | | | | * ext/psych/psych.gemspec: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/yaml/emitter.c: merge libyaml 0.1.5tenderlove2014-02-047-51/+91
| | | | | | | | | | | * ext/psych/yaml/loader.c: ditto * ext/psych/yaml/parser.c: ditto * ext/psych/yaml/reader.c: ditto * ext/psych/yaml/scanner.c: ditto * ext/psych/yaml/writer.c: ditto * ext/psych/yaml/yaml_private.h: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych.rb: fix typo by @jwworth [fix GH-500]hsbt2014-01-191-1/+1
| | | | | | * lib/rake/file_list.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/nkf/nkf-utf8/nkf.c: fix typo by @windwiny [fix GH-506]hsbt2014-01-191-1/+1
| | | | | | | | | | | * ext/openssl/ossl_ssl.c: ditto * ext/psych/yaml/scanner.c: ditto * ext/socket/init.c: ditto * ext/socket/socket.c: ditto * ext/tk/tcltklib.c: ditto * ext/win32ole/win32ole.c: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings withtenderlove2014-01-092-1/+2
| | | | | | | | | | quotes should not have changed. [ruby-core:59316] [Bug #9300] * ext/psych/lib/psych.rb: fixed missing require. * test/psych/test_string.rb: test git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/to_ruby.rb: anonymous structstenderlove2014-01-091-1/+3
| | | | | | | | should be able to roundtrip. Thanks @splattael! * test/psych/test_object_references.rb: test for change git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * benchmark/bm_so_meteor_contest.rb: [DOC] Fix a few typoscharliesome2013-12-282-2/+2
| | | | | | | | | | | | * ext/fiddle/lib/fiddle/import.rb: ditto * ext/psych/lib/psych.rb: ditto * ext/psych/lib/psych/nodes/sequence.rb: ditto * ext/tk/lib/multi-tk.rb: ditto * ext/tk/lib/tcltk.rb: ditto Closes GH-490 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/yaml/emitter.c: Fix typo in the variable namea_matsuda2013-12-141-4/+4
| | | | | | s/preceeded/preceded/ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych.rb: psych version 2.0.2tenderlove2013-11-262-3/+4
| | | | | | * ext/psych/psych.gemspec: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/scalar_scanner.rb: fix support for negativetenderlove2013-11-262-3/+7
| | | | | | | | | years. * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto * test/psych/test_date_time.rb: test for change. Fixes: https://github.com/tenderlove/psych/issues/168 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/scalar_scanner.rb: fix regexp for matching TIMEtenderlove2013-11-261-1/+1
| | | | | | | | strings. * test/psych/test_date_time.rb: test for change. Fixes: https://github.com/tenderlove/psych/issues/171 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/to_ruby.rb: process merge keys beforetenderlove2013-11-051-9/+5
| | | | | | | | reviving objects. Fixes GH psych #168 * test/psych/test_merge_keys.rb: test for change https://github.com/tenderlove/psych/issues/168 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: make less garbage whentenderlove2013-10-291-7/+11
| | | | | | testing if a string is binary. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: string subclasses shouldtenderlove2013-10-291-2/+3
| | | | | | | | | not be considered to be binary. Fixes Psych / GH 166 https://github.com/tenderlove/psych/issues/166 * test/psych/test_string.rb: test for fix git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/yaml/yaml.h: [DOC] merge upstream typo fix by @GreenGeorgezzak2013-09-201-1/+1
| | | | | | | https://github.com/tenderlove/psych/pull/161 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* updating psych versiontenderlove2013-09-182-7/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: use double quotes whentenderlove2013-09-051-0/+2
| | | | | | | | | strings start with special characters. [Fixes GH-157] https://github.com/tenderlove/psych/issues/157 * test/psych/test_string.rb: test for change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/scalar_scanner.rb: invalid floats should betenderlove2013-08-281-1/+1
| | | | | | | | | treated as strings. [Fixes GH-156] https://github.com/tenderlove/psych/issues/156 * test/psych/test_string.rb: test for change git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych*: [DOC] Capitalize "Ruby" in documentationzzak2013-07-194-8/+8
| | | | | | | Patch by Dave Worth https://github.com/ruby/ruby/pull/341 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: register time objects sotenderlove2013-07-051-1/+1
| | | | | | | they are referenced as ids during output. * test/psych/test_date_time.rb: corresponding test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* fix typos. Patch by k_takata.ktsj2013-05-191-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: fix syntax error.tenderlove2013-05-151-1/+1
| | | | | | Thanks @spastorino! [ruby-core:55011] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* yaml_tree.rb: fix warning messagenobu2013-05-151-1/+1
| | | | | | | * ext/psych/lib/psych/visitors/yaml_tree.rb: fix warning message. Class.create does not exist. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: only emit warnings whentenderlove2013-05-151-1/+3
| | | | | | -w is enabled. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: adding backwardstenderlove2013-05-141-0/+7
| | | | | | compatible YAMLTree.new method git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40753 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych.rb: Adding Psych.safe_load for loading a usertenderlove2013-05-1413-54/+256
| | | | | | | | | | | | | | | | | | | | | | | | | defined, restricted subset of Ruby object types. * ext/psych/lib/psych/class_loader.rb: A class loader for encapsulating the logic for which objects are allowed to be deserialized. * ext/psych/lib/psych/deprecated.rb: Changes to use the class loader * ext/psych/lib/psych/exception.rb: ditto * ext/psych/lib/psych/json/stream.rb: ditto * ext/psych/lib/psych/nodes/node.rb: ditto * ext/psych/lib/psych/scalar_scanner.rb: ditto * ext/psych/lib/psych/stream.rb: ditto * ext/psych/lib/psych/streaming.rb: ditto * ext/psych/lib/psych/visitors/json_tree.rb: ditto * ext/psych/lib/psych/visitors/to_ruby.rb: ditto * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto * ext/psych/psych_to_ruby.c: ditto * test/psych/helper.rb: ditto * test/psych/test_safe_load.rb: tests for restricted subset. * test/psych/test_scalar_scanner.rb: ditto * test/psych/visitors/test_to_ruby.rb: ditto * test/psych/visitors/test_yaml_tree.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* changing variable nametenderlove2013-05-141-3/+3
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/-test-/debug/depend: New file.akr2013-04-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * ext/-test-/exception/depend: Ditto. * ext/-test-/printf/depend: Ditto. * ext/-test-/string/depend: Ditto. * ext/coverage/depend: Ditto. * ext/io/console/depend: Ditto. * ext/io/nonblock/depend: Ditto. * ext/io/wait/depend: Ditto. * ext/openssl/depend: Ditto. * ext/pathname/depend: Ditto. * ext/psych/depend: Ditto. * ext/zlib/depend: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: fix symbol keys in codertenderlove2013-04-051-1/+1
| | | | | | | emission. Thanks @tjwallace * test/psych/test_coder.rb: test for change git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/exception.rb: there should be only one exceptiontenderlove2013-04-054-10/+11
| | | | | | | | | base class. Fixes tenderlove/psych #125 * ext/psych/lib/psych.rb: require the correct exception class * ext/psych/lib/psych/syntax_error.rb: ditto * ext/psych/lib/psych/visitors/to_ruby.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/to_ruby.rb: correctly registertenderlove2013-04-051-7/+17
| | | | | | | | self-referential strings. Fixes tenderlove/psych #135 * test/psych/test_string.rb: appropriate test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/psych.rb: specify in rdoc what object is returned in parserzzak2013-03-011-4/+4
| | | | | | | By Adam Stankiewicz [Github tenderlove/psych#133] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych.rb: rdoc for Psych overview by Adam Stankiewiczzzak2013-02-281-26/+147
| | | | | | | [Github tenderlove/psych#134] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewiczzzak2013-02-161-0/+2
| | | | | | | [Github tenderlove/psych#118] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: fixing string quotationtenderlove2013-02-071-9/+8
| | | | | | | | | | when dumping Ruby strings. Thanks Ingy * test/psych/test_psych.rb: appropriate tests. * test/psych/test_yaml.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/yaml_tree.rb: change output referencetenderlove2013-02-071-5/+29
| | | | | | ids to be sequential numbers. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/scalar_scanner.rb: use constants rather thantenderlove2013-01-171-3/+3
| | | | | | calculating Inf and NaN. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/yaml/scanner.c: Fix typos, patch by James Dabbszzak2013-01-131-17/+17
| | | | | | | [Github tenderlove/psych#118] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/to_ruby.rb: merge key values thattenderlove2013-01-121-6/+20
| | | | | | | | contain something besides a hash should be left in tact. * test/psych/test_merge_keys.rb: test for change git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e