summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix exception heirarchysafeloadAaron Patterson2013-02-051-1/+1
|
* specific symbols can be whitelistedAaron Patterson2013-02-015-17/+41
|
* adding safe_load for whitelistingAaron Patterson2013-02-0117-55/+330
|
* * ext/psych/lib/psych/scalar_scanner.rb: use constants rather thanAaron Patterson2013-01-162-3/+8
| | | | calculating Inf and NaN.
* * ext/psych/yaml/scanner.c: Typos by James Dabbs [Github Fixes #118]Zachary Scott2013-01-132-17/+21
|
* * ext/psych/lib/psych/visitors/to_ruby.rb: merge key values thatAaron Patterson2013-01-113-6/+78
| | | | | | | | contain something besides a hash should be left in tact. * test/psych/test_merge_keys.rb: test for change fixes #114
* * ext/psych/lib/psych/scalar_scanner.rb: strip trailing dots fromAaron Patterson2013-01-094-1/+18
| | | | | | | | | | floats so that Float() will not raise an exception. * test/psych/test_numeric.rb: test to ensure "1." can be loaded * test/psych/test_string.rb: make sure "1." can round trip fixes #109
* Merge pull request #113 from pck/improve-string-encodingAaron Patterson2013-01-062-4/+24
|\ | | | | Improve string encoding
| * Changed Psych::Visitors::YAMLTree.binary?(string).Paul Kunysch2013-01-061-2/+3
| | | | | | | | | | * A human-readable representation can be used for ascii_only 8bit-encoded strings. * String subclasses are binary, even if they are character-encoded.
| * Testing 8bit ascii_only strings.Paul Kunysch2013-01-061-2/+9
| |
| * Testing custom character-based class.Paul Kunysch2013-01-061-0/+12
|/
* * lib/psych.rb (Psych.load): Return value of Psych::SyntaxError.messageZachary Scott2013-01-031-3/+3
| | | | should be same as example. Patch by Ippei Obayashi [ruby-core:51193]
* Merge branch 'master' into nirvdrum-speed_up_node_mappingAaron Patterson2012-12-1745-73/+13077
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (28 commits) merge changes from ruby trunk Strings that start with non-word characters should double quote without exclamation mark fixing rsync make some header file adjustments for ruby compile updating the version to 2.0 add the license for libyaml Update README.rdoc fix c file name only do have_header checks if we are embedding libyaml mkmf has a global for this test fix build on windows only embed libyaml if the system does not have it * ext/psych/lib/psych/scalar_scanner.rb: avoid raising exceptions when parsing Floats and Integers. Thanks riffraff [ruby-core:44426] * test/psych/test_numeric.rb: associated test * ext/psych/lib/psych/core_ext.rb: move Kernel#y so that it can manually be required as 'psych/y'. for compiling on mswin embedding libyaml * ruby.c (load_file_internal): set default source encoding as UTF-8 instead of US-ASCII. [ruby-core:46021] [Feature #6679] * ext/psych/lib/psych/handlers/recorder.rb: added a class for recording YAML parse and emit events. Use literal style when emitting multiline strings, fixes #64 * ext/psych/lib/psych/visitors/yaml_tree.rb: `tree` should return the same thing on every call. ...
| * merge changes from ruby trunkAaron Patterson2012-12-1310-36/+33
| |
| * Merge branch 'embed'Aaron Patterson2012-12-1326-25/+12811
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * embed: fixing rsync make some header file adjustments for ruby compile updating the version to 2.0 add the license for libyaml fix c file name only do have_header checks if we are embedding libyaml mkmf has a global for this test fix build on windows only embed libyaml if the system does not have it for compiling on mswin embedding libyaml
| | * fixing rsyncAaron Patterson2012-11-271-1/+1
| | |
| | * make some header file adjustments for ruby compileAaron Patterson2012-11-273-1/+15
| | |
| | * updating the version to 2.0Aaron Patterson2012-11-272-9/+24
| | |
| | * add the license for libyamlAaron Patterson2012-11-271-0/+19
| | |
| | * Merge branch 'master' into embedAaron Patterson2012-11-272-1/+2
| | |\ | | | | | | | | | | | | | | | | | | | | * master: Update README.rdoc * lib/psych/deprecated.rb (load_documents): document deprecation
| | * \ Merge branch 'master' into embedembedAaron Patterson2012-11-177-23/+68
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: * ext/psych/lib/psych/scalar_scanner.rb: avoid raising exceptions when parsing Floats and Integers. Thanks riffraff [ruby-core:44426] * test/psych/test_numeric.rb: associated test * ext/psych/lib/psych/core_ext.rb: move Kernel#y so that it can manually be required as 'psych/y'. Use literal style when emitting multiline strings, fixes #64
| | * | | fix c file nameAaron Patterson2012-11-171-0/+0
| | | | |
| | * | | only do have_header checks if we are embedding libyamlAaron Patterson2012-11-171-14/+16
| | | | |
| | * | | mkmf has a global for this testAaron Patterson2012-11-171-2/+1
| | | | |
| | * | | fix build on windowsAaron Patterson2012-11-171-5/+5
| | | | |
| | * | | only embed libyaml if the system does not have itAaron Patterson2012-11-1712-1/+17
| | | | |
| | * | | Merge pull request #101 from tarui/embedAaron Patterson2012-11-161-0/+5
| | |\ \ \ | | | | | | | | | | | | for compiling on mswin
| | | * | | for compiling on mswinMasaya TARUI2012-11-171-0/+5
| | |/ / / | | | | | | | | | | | | | | | I checked only mswin environment. Maybe it is required for mingw?
| | * | | embedding libyamlAaron Patterson2012-11-1622-878/+13594
| | | | |
| * | | | Merge pull request #106 from atambo/masterAaron Patterson2012-12-082-0/+9
| |\ \ \ \ | | |_|_|/ | |/| | | Strings that start with non-word characters should double quote without exclamation mark
| | * | | Strings that start with non-word characters should double quote without ↵Alex Tambellini2012-12-082-0/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exclamation mark Before this commit: --- ! '@123''abc' After this commit: --- "@123'abc"
| * | | Merge pull request #95 from stomar/doc_deprecatedZachary Scott2012-11-241-0/+1
| |\ \ \ | | | | | | | | | | Document deprecation of Psych.load_documents
| | * | | * lib/psych/deprecated.rb (load_documents): document deprecationMarcus Stollsteimer2012-10-201-0/+1
| | | | |
| * | | | Merge pull request #104 from olivernn/patch-1Zachary Scott2012-11-201-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | Typo in README.rdoc
| | * | | Update README.rdocOliver Nightingale2012-11-201-1/+1
| |/ / / | | | | | | | | Tiny typo. Psych is the default YAML parser not the fault YAML parser.
| * | | Merge pull request #97 from atambo/masterAaron Patterson2012-11-162-2/+10
| |\ \ \ | | | | | | | | | | Use literal style when emitting multiline strings, fixes #64
| | * | | Use literal style when emitting multiline strings, fixes #64Alex Tambellini2012-10-282-2/+10
| | | | |
| * | | | * ext/psych/lib/psych/scalar_scanner.rb: avoid raising exceptions whenAaron Patterson2012-11-163-13/+43
| | | | | | | | | | | | | | | | | | | | | | | | | parsing Floats and Integers. Thanks riffraff [ruby-core:44426] * test/psych/test_numeric.rb: associated test
| * | | | * ext/psych/lib/psych/core_ext.rb: move Kernel#y so that it canAaron Patterson2012-11-163-8/+15
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | manually be required as 'psych/y'. * ext/psych/lib/psych/y.rb: ditto r37694
| * | | * ruby.c (load_file_internal): set default source encoding asAaron Patterson2012-11-163-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UTF-8 instead of US-ASCII. [ruby-core:46021] [Feature #6679] * parse.y (parser_initialize): set default parser encoding as UTF-8 instead of US-ASCII. r37485
| * | | Merge pull request #96 from zzak/masterAaron Patterson2012-11-051-2/+22
| |\ \ \ | | | | | | | | | | Install documentation, fixes #91
| | * | | Install documentation, fixes #91Zachary Scott2012-10-201-2/+22
| | | | |
| * | | | * ext/psych/lib/psych/handlers/recorder.rb: added a class forAaron Patterson2012-10-284-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recording YAML parse and emit events. * ext/psych/lib/psych/handler.rb: adding a list of events so that handler classes can more easily be meta-programmed. * test/psych/handlers/test_recorder.rb: tests for the change.
| * | | | * ext/psych/lib/psych/visitors/yaml_tree.rb: `tree` should return theAaron Patterson2012-10-273-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same thing on every call. * test/psych/visitors/test_yaml_tree.rb: related test.
| * | | | * ext/psych/lib/psych/visitors/yaml_tree.rb: YAML Tree object shouldAaron Patterson2012-10-273-1/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | be able to take an emitter object as it's output. * test/psych/visitors/test_yaml_tree.rb: related test.
| * | | merging from ruby trunkAaron Patterson2012-10-221-16/+0
| | | |
| * | | Ignore vim swap files and *.bundleEric Hodel2012-10-221-3/+4
| | | |
| * | | Psych::SyntaxError now inherits from RuntimeErrorEric Hodel2012-10-223-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously Psych::SyntaxError inherited from SyntaxError. Since SyntaxError does not inherit from StandardError a plain rescue could not capture a YAML parse error. This made code that needed to handle psych errors slightly more complex. Psych::SyntaxError now inherits from Psych::Error (allowing room for future expansion of psych errors that can be caught under the same umbrella) and inherits from RuntimeError.
| * | | Skip set_syck on Ruby 2.0 where syck has been removedEric Hodel2012-10-221-0/+6
| | |/ | |/|
| * | Merge pull request #92 from nirvdrum/cache_symbolsAaron Patterson2012-10-131-2/+4
| |\ \ | | |/ | |/| Cache symbols while tokenizing.
View Lorry Controller Status