summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * fix minitest warningsAaron Patterson2015-02-062-2/+8
| |
| * * ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes whenAaron Patterson2015-02-063-3/+33
| | | | | | | | | | | | dumping objects with custom coders. [ruby-core:66215] [Bug #10496] * test/psych/test_coder.rb: test for fix
| * * ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regularAaron Patterson2015-02-063-2/+13
| | | | | | | | | | | | | | | | expressions with newlines. tenderlove/psych#222 * test/psych/test_yaml.rb: test for change. fixes #222
| * * ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes withv2.0.12Aaron Patterson2015-01-284-1/+17
| | | | | | | | | | | | | | instance variables when it is referenced multiple times. * ext/psych/lib/psych.rb: bump version * ext/psych/psych.gemspec: bump version * test/psych/test_hash.rb: test for fix
| * bump versionv2.0.11Aaron Patterson2015-01-201-1/+1
| |
| * Merge pull request #221 from nobu/fix-anchorAaron Patterson2015-01-172-9/+17
| |\ | | | | | | Fix anchor
| | * Fix anchorNobuyoshi Nakada2015-01-172-9/+17
| | | | | | | | | | | | | | | Anchors like `\Z` are not valid inside character class. Use negative-lookahead instead.
| | * Fix assertion regexpsNobuyoshi Nakada2015-01-171-2/+2
| |/ | | | | | | `|' is a meta character, so needs to be escaped.
| * bump versionv2.0.10Aaron Patterson2015-01-161-1/+1
| |
| * Merge pull request #218 from jemc/masterAaron Patterson2015-01-162-44/+48
| |\ | | | | | | Fix issue #217 and #216 - Only dump ivars for subclasses of Hash and String.
| | * Only dump ivars for subclasses of String, not for String.Joe Eli McIlvain2015-01-151-4/+5
| | | | | | | | | | | | With cf0dd2b93f1552a3c452a0bfa0e996f441d5e27e, fixes #217.
| | * Only dump ivars for subclasses of Hash, not for Hash.Joe Eli McIlvain2015-01-152-40/+43
| |/ | | | | | | | | Fixes #216. Fixes part of #217.
| * Merge pull request #215 from jirutka/patch-2Aaron Patterson2015-01-132-18/+64
| |\ | | | | | | Use appropriate style for serialized strings (replaces #195)
| | * Fix block chomping and add more testsJakub Jirutka2015-01-132-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no [chomping indicator][1] is specified for a folded or literal block, then YAML parser should preserve the final line break (i.e. the string should end with \n). This implies that when dumping a string *without* the trailing newline to YAML, we should specify the stripping indicator (-). [1]: http://yaml.org/spec/1.2/2009-07-21/spec.html#id2593651
| | * Preset @line_width in YAMLTree#initialize for better performanceJakub Jirutka2015-01-121-12/+9
| | |
| | * Use appropriate style for serialized stringsJakub Jirutka2015-01-122-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When psych parses YAML with string in the folded style as: a: > some inline content and serializes it back to YAML, then it renders the string in the literal style instead: a: | some inline content This patch fixes this behaviour. When a string doesn't contain newlines (blank line at the end is ignored) and it's not necessary to be quoted, then it will use plain style or folded style according to its length and the `line_width` option. # line_width = 100 a: some inline content # line_width = 11 a: > some inline content This change was originally proposed by @Iazel.
| | * Remove unnnecessary 'str' variable in YAMLTree#visit_StringJakub Jirutka2015-01-121-4/+3
| |/
* | setup java platform gemChristian Meier2015-02-268-12/+55
| | | | | | | | | | | | | | use maven to resolve jar dependencies for compilation. setup jar-dependencies to install the snakeyaml jar when installing the gem via rubygems or bundler. added java code to reflect the snakeyaml vesion which got finally loaded into the jruby-classloader.
* | Merge remote-tracking branch 'origin/master' into jrubyCharles Oliver Nutter2015-01-0996-518/+15063
|\ \ | |/ | | | | | | Conflicts: .gitignore
| * bumping version:v2.0.9Aaron Patterson2015-01-081-1/+1
| |
| * Merge branch 'master' into jirutka-patch-1Aaron Patterson2015-01-0821-47/+367
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (21 commits) * ext/psych/lib/psych/visitors/to_ruby.rb: call `allocate` on hash subclasses. Fixes github.com/tenderlove/psych/issues/196 * ext/psych/lib/psych/visitors/to_ruby.rb: revive hashes with ivars removed isolate task removed isolate plugin added minitest dependency into gemspec added install task into travis added ruby-head env bumping version to 2.0.8 fixed build error caused by trunk changes bumping version to 2.0.7 merging from ruby trunk backport r48512 from ruby/ruby trunk. Add changelog for 2a4d9568f7d5d19c00231cf48eb855cc45ec3394 backport r48214 from ruby/ruby trunk. Allow dumping any BasicObject that defines #marshal_dump or #marshal_load bumping version * ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping and loading. Fixes GH #85. Thanks @brentdax for the patch! * test/psych/test_exception.rb: test for fix * ext/psych/lib/psych/scalar_scanner.rb: fix loading strings that look like integers but have a newline. Fixes GH #189 * test/psych/test_string.rb: test for fix * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash should merge the hash in to the parent. * test/psych/test_merge_keys.rb: test for change. Fixes GH #202 * ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings should not be treated as merge keys. * ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys containing "<<" should roundtrip. * test/psych/test_merge_keys.rb: test for change. Fixes GH #203 ... Conflicts: lib/psych/visitors/yaml_tree.rb
| | * * ext/psych/lib/psych/visitors/to_ruby.rb: call `allocate` on hashAaron Patterson2015-01-083-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | subclasses. Fixes github.com/tenderlove/psych/issues/196 * test/psych/test_hash.rb: test for change fixes #196
| | * * ext/psych/lib/psych/visitors/to_ruby.rb: revive hashes with ivarsAaron Patterson2015-01-084-8/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | * ext/psych/lib/psych/visitors/yaml_tree.rb: dump hashes with ivars. Fixes github.com/psych/issues/43 * test/psych/test_hash.rb: test for change fixes #43
| | * Merge pull request #213 from hsbt/ruby-headAaron Patterson2014-12-062-3/+6
| | |\ | | | | | | | | Added ruby-head env into travis
| | | * removed isolate taskSHIBATA Hiroshi2014-12-061-1/+1
| | | |
| | | * removed isolate pluginSHIBATA Hiroshi2014-12-062-2/+1
| | | |
| | | * added minitest dependency into gemspecSHIBATA Hiroshi2014-12-061-0/+2
| | | |
| | | * added install task into travisSHIBATA Hiroshi2014-12-061-0/+1
| | | |
| | | * added ruby-head envSHIBATA Hiroshi2014-12-061-0/+1
| | |/
| | * bumping version to 2.0.8v2.0.8SHIBATA Hiroshi2014-12-051-1/+1
| | |
| | * Merge pull request #211 from tenderlove/fix-type-dataAaron Patterson2014-12-022-0/+4
| | |\ | | | | | | | | fixed build error caused by trunk changes
| | | * fixed build error caused by trunk changesfix-type-dataSHIBATA Hiroshi2014-12-022-0/+4
| | |/
| | * bumping version to 2.0.7v2.0.7Aaron Patterson2014-12-011-1/+1
| | |
| | * merging from ruby trunkAaron Patterson2014-12-015-26/+58
| | |
| | * Merge branch 'master' of github.com:tenderlove/psychAaron Patterson2014-12-017-4/+93
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:tenderlove/psych: backport r48512 from ruby/ruby trunk. Add changelog for 2a4d9568f7d5d19c00231cf48eb855cc45ec3394 backport r48214 from ruby/ruby trunk. Allow dumping any BasicObject that defines #marshal_dump or #marshal_load
| | | * backport r48512 from ruby/ruby trunk.SHIBATA Hiroshi2014-11-232-2/+2
| | | |
| | | * Add changelog for 2a4d9568f7d5d19c00231cf48eb855cc45ec3394Zachary Scott2014-11-221-0/+7
| | | |
| | | * backport r48214 from ruby/ruby trunk.SHIBATA Hiroshi2014-11-021-2/+1
| | | |
| | | * Merge pull request #205 from sgrif/sg-simple-delegatorAaron Patterson2014-09-173-0/+83
| | | |\ | | | | | | | | | | Allow dumping of Delegator subclasses
| | | | * Allow dumping any BasicObject that defines #marshal_dump or #marshal_loadSean Griffin2014-09-173-0/+83
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Additionally, it is assumed that these objects will have implemented `respond_to?` and `class`, (e.g. SimpleDelegator). These assumptions are reasonably inline with the assumptions of `Marshal` in regards to `BasicObject`s.
| | * | bumping versionv2.0.6Aaron Patterson2014-09-131-1/+1
| | |/
| | * * ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping andAaron Patterson2014-08-293-0/+31
| | | | | | | | | | | | | | | | | | | | | loading. Fixes GH #85. Thanks @brentdax for the patch! * test/psych/test_exception.rb: test for fix fixes #85
| | * * ext/psych/lib/psych/scalar_scanner.rb: fix loading strings thatAaron Patterson2014-08-293-1/+11
| | | | | | | | | | | | | | | | | | | | | look like integers but have a newline. Fixes GH #189 * test/psych/test_string.rb: test for fix Fixes #189
| | * * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hashAaron Patterson2014-08-293-1/+17
| | | | | | | | | | | | | | | | | | | | | should merge the hash in to the parent. * test/psych/test_merge_keys.rb: test for change. Fixes GH #202 Fixes #202
| | * * ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" stringsAaron Patterson2014-08-294-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | should not be treated as merge keys. * ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys containing "<<" should roundtrip. * test/psych/test_merge_keys.rb: test for change. Fixes GH #203 fixes #203
| | * Merge pull request #201 from lfzawacki/remove-test-engine-managerAaron Patterson2014-08-201-1/+0
| | |\ | | | | | | | | Remove test_engine_manager.rb from Manifest.txt
| | | * Remove test_engine_manager.rb from Manifest.txtLucas Zawacki2014-08-201-1/+0
| | |/ | | | | | | | | | This was removed by fa6aac2a but was still referenced by Manifest.txt and makes `rake gem` fail
| * | Don't quote scalar values beginning with non-ASCII characterJakub Jirutka2014-08-162-1/+7
| |/
| * Merge pull request #199 from mjtko/fix/yaml-registrar-mappingsAaron Patterson2014-08-061-0/+2
| |\ | | | | | | GC can break an ongoing serialization
| | * Retain reference to target in Registrar so a GC run can't confuse ongoing ↵Mark J. Titorenko2014-08-061-0/+2
| |/ | | | | | | serialization.
View Lorry Controller Status