summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Properly negotiate encoding from string or IO.atambo-native_jrubyCharles Oliver Nutter2013-08-281-20/+97
|
* Use read encoding from IO to set up parser's reader.Charles Oliver Nutter2013-08-281-0/+7
|
* Use UnsafeHolder, since UnsafeFactory is gone in 1.7.5+.Charles Oliver Nutter2013-08-281-2/+2
|
* the space is not requiredAaron Patterson2013-08-281-2/+2
|
* Merge branch 'master' into atambo-native_jrubyAaron Patterson2013-08-2811-11/+81
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * master: backport Tempfile.create so psych tests will run outside ruby trunk * ext/psych/lib/psych/scalar_scanner.rb: invalid floats should be treated as strings. [Fixes GH-156] https://github.com/tenderlove/psych/issues/156 merge ruby/ruby@826df7f upstream * ext/psych/lib/psych/visitors/yaml_tree.rb: register time objects so they are referenced as ids during output. * test/psych/test_date_time.rb: corresponding test. merging from ruby trunk Replace outdated ruby-head with 2.0.0 on travis updating manifest Conflicts: .travis.yml
| * backport Tempfile.create so psych tests will run outside ruby trunkAaron Patterson2013-08-281-0/+29
| |
| * * ext/psych/lib/psych/scalar_scanner.rb: invalid floats should beAaron Patterson2013-08-283-1/+14
| | | | | | | | | | | | | | | | | | treated as strings. [Fixes GH-156] https://github.com/tenderlove/psych/issues/156 * test/psych/test_string.rb: test for change fixes #156
| * merge ruby/ruby@826df7f upstreamZachary Scott2013-07-184-8/+8
| |
| * * ext/psych/lib/psych/visitors/yaml_tree.rb: register time objects soAaron Patterson2013-07-053-1/+15
| | | | | | | | | | | | | | they are referenced as ids during output. * test/psych/test_date_time.rb: corresponding test. Fixes #146
| * merging from ruby trunkAaron Patterson2013-07-052-1/+10
| |
| * Replace outdated ruby-head with 2.0.0 on travisEric Hodel2013-06-281-1/+1
| |
| * updating manifestv2.0.0Aaron Patterson2013-06-271-0/+4
| |
* | Add native jruby support to psych. Fixes #145Alex Tambellini2013-06-2310-9/+996
|/
* * ext/psych/lib/psych.rb: Adding Psych.safe_load for loading a userAaron Patterson2013-05-1419-60/+383
| | | | | | | | | | | | | | | | | | | | | | | 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
* merge from RubyAaron Patterson2013-05-144-5/+36
|
* merging from RubyAaron Patterson2013-05-144-80/+74
|
* Merge pull request #141 from kdisneur/fix/remove_swp_filesAaron Patterson2013-05-141-0/+0
|\ | | | | Remove remaining .swp file
| * Remove remaining .swp fileKevin2013-04-261-0/+0
| |
* | Merge pull request #131 from sheerun/fix/namingAaron Patterson2013-05-141-3/+3
|\ \ | | | | | | Do not use one-letter variables
| * | Do not use one-letter variablesAdam Stankiewicz2013-02-271-3/+3
| | |
* | | Update rbx install docsZachary Scott2013-04-271-2/+3
| |/ |/|
* | Merge pull request #122 from tjwallace/fix_coder_emit_hashAaron Patterson2013-04-052-3/+3
|\ \ | | | | | | Fix case when map includes a symbol key in #emit_coder
| * | Fix case when map includes a symbol key in #emit_coderJeff Wallace2013-01-302-3/+3
| | | | | | | | | | | | Mimic what is done in #visit_Hash. Fixes #107.
* | | change test name to be more helpful. fixes #124Aaron Patterson2013-04-051-2/+2
| | |
* | | * ext/psych/lib/psych/exception.rb: there should be only one exceptionAaron Patterson2013-04-055-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 fixes #125
* | | * ext/psych/lib/psych/visitors/to_ruby.rb: correctly registerAaron Patterson2013-04-053-7/+49
| | | | | | | | | | | | | | | | | | self-referential strings. Fixes tenderlove/psych #135 * test/psych/test_string.rb: appropriate test.
* | | sync with ruby trunkAaron Patterson2013-04-0538-63/+59
| | |
* | | * lib/psych.rb: specify in rdoc what object is returned in parserZachary Scott2013-02-282-4/+9
| | | | | | | | | | | | By Adam Stankiewicz [Github Fixes #133]
* | | * lib/psych.rb: rdoc for Psych overview by Adam StankiewiczZachary Scott2013-02-282-26/+152
| |/ |/| | | | | [Github Fixes #134]
* | Missed author from 706545cZachary Scott2013-02-161-1/+2
| |
* | * lib/psych/y.rb: Document Kernel#y [Github Fixes #127]Zachary Scott2013-02-162-0/+6
| |
* | * ext/psych/lib/psych/visitors/yaml_tree.rb: fixing string quotationAaron Patterson2013-02-074-11/+28
| | | | | | | | | | | | | | | | when dumping Ruby strings. Thanks Ingy * test/psych/test_psych.rb: appropriate tests. * test/psych/test_yaml.rb: ditto
* | * ext/psych/lib/psych/visitors/yaml_tree.rb: change output referenceAaron Patterson2013-02-072-5/+34
| | | | | | | | ids to be sequential numbers.
* | sync with ruby trunkAaron Patterson2013-02-061-0/+1
|/
* * 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
| | |
View Lorry Controller Status