Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: tenderlove/psych
...
head fork: tenderlove/psych
Commits on Aug 04, 2012
Carolyn Ann Carolyn-Ann Changed comment in psych.rb to update new home page for libyaml 916a81e
Aaron Patterson Merge pull request #74 from Carolyn-Ann/comment-change
Changed comment in psych.rb to update new home page for libyaml
2bced7c
Commits on Sep 07, 2012
Kelley Reynolds kreynolds Fix scalar_scanner to understand strings starting with an underscore …
…and containing only digits
7e7a7df
Aaron Patterson Merge pull request #80 from kreynolds/master
Fix scalar_scanner to understand strings starting with an underscore and containing only digits
06c8c7f
Commits on Sep 11, 2012
Rhett Sutphin rsutphin Ignore bad timestamps. #82.
If something looks like a timestamp but has an invalid component,
treat it as a string instead of throwing an ArgumentError.
0c478a1
Aaron Patterson Merge pull request #83 from rsutphin/82-bad_times
Ignore bad timestamps
08da2c2
Commits on Oct 01, 2012
Kevin Menard nirvdrum Handle nil tags specially to avoid slow method_missing calls.
Previously, the nil value would be compared to any RegExps, which causes method_missing to be invoked on nil, which is both slow and always guaranteed to fail matching against the RegExp.
85a1ae2
Aaron Patterson Merge pull request #88 from nirvdrum/reduce_method_missing
Handle nil tags specially to avoid slow method_missing calls.
465ae0a
Commits on Oct 02, 2012
Kevin Menard nirvdrum Updated the RegExp to catch Strings earlier in the tokenization process. 97bdb23
Aaron Patterson Merge pull request #90 from nirvdrum/short_circuit_string_tokenization
Updated the RegExp to catch Strings earlier in the tokenization process.
4be2aef
Commits on Oct 13, 2012
Kevin Menard nirvdrum Cache symbols while tokenizing. dd925d3
Kevin Menard nirvdrum Restructured node mapping so common cases are evaluated first, saving…
… unnecessary comparisons.
2ceb7b6
Aaron Patterson Merge pull request #92 from nirvdrum/cache_symbols
Cache symbols while tokenizing.
74ed8ae
Commits on Oct 20, 2012
Marcus Stollsteimer stomar * lib/psych/deprecated.rb (load_documents): document deprecation d525d9f
Zachary Scott zzak Install documentation, fixes #91 3e3935b
Commits on Oct 22, 2012
Eric Hodel drbrain Skip set_syck on Ruby 2.0 where syck has been removed 99f60a4
Eric Hodel drbrain Psych::SyntaxError now inherits from RuntimeError
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.
66e22be
Eric Hodel drbrain Ignore vim swap files and *.bundle 450f3b0
Aaron Patterson merging from ruby trunk 851de5c
Commits on Oct 28, 2012
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: YAML Tree object should
  be able to take an emitter object as it's output.

* test/psych/visitors/test_yaml_tree.rb: related test.
bbd51b9
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: `tree` should return the
  same thing on every call.

* test/psych/visitors/test_yaml_tree.rb: related test.
1f4812f
Commits on Oct 29, 2012
Alex Tambellini atambo Use literal style when emitting multiline strings, fixes #64 066e600
Aaron Patterson * ext/psych/lib/psych/handlers/recorder.rb: added a class for
  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.
c37649b
Commits on Nov 05, 2012
Aaron Patterson Merge pull request #96 from zzak/master
Install documentation, fixes #91
454f7f0
Commits on Nov 16, 2012
Aaron Patterson * ruby.c (load_file_internal): set default source encoding as
  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
920cb81
Aaron Patterson embedding libyaml de14843
Commits on Nov 17, 2012
Masaya TARUI tarui for compiling on mswin
I checked only mswin environment.
Maybe it is required for mingw?
ad92372
Aaron Patterson Merge pull request #101 from tarui/embed
for compiling on mswin
b8e9d7e
Aaron Patterson * ext/psych/lib/psych/core_ext.rb: move Kernel#y so that it can
  manually be required as 'psych/y'.

* ext/psych/lib/psych/y.rb: ditto

r37694
4c72454
Aaron Patterson * 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
9d7be25
Aaron Patterson Merge pull request #97 from atambo/master
Use literal style when emitting multiline strings, fixes #64
eb029f0
Aaron Patterson only embed libyaml if the system does not have it 3b066cf
Aaron Patterson fix build on windows 7475a24
Aaron Patterson mkmf has a global for this test a9d1ae7
Aaron Patterson only do have_header checks if we are embedding libyaml a38ea94
Aaron Patterson fix c file name 4cd1c16
Aaron Patterson Merge branch 'master' into embed
* 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
249f908
Commits on Nov 20, 2012
Oliver Nightingale olivernn Update README.rdoc
Tiny typo. Psych is the default YAML parser not the fault YAML parser.
1561554
Zachary Scott zzak Merge pull request #104 from olivernn/patch-1
Typo in README.rdoc
7e88269
Commits on Nov 25, 2012
Zachary Scott zzak Merge pull request #95 from stomar/doc_deprecated
Document deprecation of Psych.load_documents
b3609ae
Commits on Nov 28, 2012
Aaron Patterson Merge branch 'master' into embed
* master:
  Update README.rdoc
  * lib/psych/deprecated.rb (load_documents): document deprecation
e6bdf6f
Aaron Patterson add the license for libyaml 60c6777
Aaron Patterson updating the version to 2.0 12b17f1
Aaron Patterson make some header file adjustments for ruby compile 4921e36
Aaron Patterson fixing rsync 978138b
Commits on Dec 09, 2012
Alex Tambellini atambo Strings that start with non-word characters should double quote witho…
…ut exclamation mark

Before this commit:

--- ! '@123''abc'

After this commit:

--- "@123'abc"
086fe08
Aaron Patterson Merge pull request #106 from atambo/master
Strings that start with non-word characters should double quote without exclamation mark
d5757ea
Commits on Dec 13, 2012
Aaron Patterson Merge branch 'embed'
* 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
c2e0c98
Aaron Patterson merge changes from ruby trunk 9ab3a70
Commits on Dec 17, 2012
Aaron Patterson Merge branch 'master' into nirvdrum-speed_up_node_mapping
* 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.
  ...
f22f976
Commits on Jan 03, 2013
Zachary Scott zzak * lib/psych.rb (Psych.load): Return value of Psych::SyntaxError.message
  should be same as example. Patch by Ippei Obayashi [ruby-core:51193]
6a3ac11
Commits on Jan 06, 2013
Paul Kunysch pck Testing custom character-based class. dc9190e
Paul Kunysch pck Testing 8bit ascii_only strings. bdd8e9d
Paul Kunysch pck Changed Psych::Visitors::YAMLTree.binary?(string).
* A human-readable representation can be used for ascii_only 8bit-encoded strings.
* String subclasses are binary, even if they are character-encoded.
ef4f041
Aaron Patterson Merge pull request #113 from pck/improve-string-encoding
Improve string encoding
4f403bc
Commits on Jan 09, 2013
Aaron Patterson * ext/psych/lib/psych/scalar_scanner.rb: strip trailing dots from
  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
cf82e48
Commits on Jan 12, 2013
Aaron Patterson * ext/psych/lib/psych/visitors/to_ruby.rb: merge key values that
  contain something besides a hash should be left in tact.

* test/psych/test_merge_keys.rb: test for change

fixes #114
2025502
Commits on Jan 13, 2013
Zachary Scott zzak * ext/psych/yaml/scanner.c: Typos by James Dabbs [Github Fixes #118] e3a7fce
Commits on Jan 17, 2013
Aaron Patterson * ext/psych/lib/psych/scalar_scanner.rb: use constants rather than
  calculating Inf and NaN.
2e8f824
Commits on Jan 30, 2013
Jeff Wallace tjwallace Fix case when map includes a symbol key in #emit_coder
Mimic what is done in #visit_Hash. Fixes #107.
d289285
Commits on Feb 06, 2013
Aaron Patterson sync with ruby trunk 030cfe9
Commits on Feb 07, 2013
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: change output reference
  ids to be sequential numbers.
4ed9ce4
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: fixing string quotation
  when dumping Ruby strings. Thanks Ingy

* test/psych/test_psych.rb: appropriate tests.

* test/psych/test_yaml.rb: ditto
69a1aea
Commits on Feb 16, 2013
Zachary Scott zzak * lib/psych/y.rb: Document Kernel#y [Github Fixes #127] 706545c
Zachary Scott zzak Missed author from 706545c 0b72234
Commits on Feb 27, 2013
Adam Stankiewicz sheerun Do not use one-letter variables ed72520
Commits on Feb 28, 2013
Zachary Scott zzak * lib/psych.rb: rdoc for Psych overview by Adam Stankiewicz
  [Github Fixes #134]
03659ce
Commits on Mar 01, 2013
Zachary Scott zzak * lib/psych.rb: specify in rdoc what object is returned in parser
  By Adam Stankiewicz [Github Fixes #133]
edf05c9
Commits on Apr 05, 2013
Aaron Patterson sync with ruby trunk b453745
Aaron Patterson * ext/psych/lib/psych/visitors/to_ruby.rb: correctly register
  self-referential strings. Fixes tenderlove/psych #135

* test/psych/test_string.rb: appropriate test.
0c82d6d
Aaron Patterson * ext/psych/lib/psych/exception.rb: there should be only one exception
  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
803653a
Aaron Patterson change test name to be more helpful. fixes #124 5497249
Aaron Patterson Merge pull request #122 from tjwallace/fix_coder_emit_hash
Fix case when map includes a symbol key in #emit_coder
40df3b1
Commits on Apr 26, 2013
Kevin Remove remaining .swp file 9738cc4
Commits on Apr 27, 2013
Zachary Scott zzak Update rbx install docs 1f40f63
Commits on May 14, 2013
Aaron Patterson Merge pull request #131 from sheerun/fix/naming
Do not use one-letter variables
aa4a9b4
Aaron Patterson Merge pull request #141 from kdisneur/fix/remove_swp_files
Remove remaining .swp file
f49cd99
Aaron Patterson merging from Ruby 53cda3d
Aaron Patterson merge from Ruby d73609e
Aaron Patterson * ext/psych/lib/psych.rb: Adding Psych.safe_load for loading a user
  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
2c644e1
Commits on Jun 27, 2013
Aaron Patterson updating manifest e04307d
Commits on Jun 28, 2013
Eric Hodel drbrain Replace outdated ruby-head with 2.0.0 on travis 6baddf1
Commits on Jul 05, 2013
Aaron Patterson merging from ruby trunk fdb594d
Aaron Patterson * 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.

Fixes #146
5258fab
Commits on Jul 19, 2013
Zachary Scott zzak merge ruby/ruby@826df7f upstream 2cd98a2
Commits on Aug 28, 2013
Aaron Patterson * ext/psych/lib/psych/scalar_scanner.rb: invalid floats should be
  treated as strings.
  [Fixes GH-156] #156

* test/psych/test_string.rb: test for change

fixes #156
5cc9127
Aaron Patterson backport Tempfile.create so psych tests will run outside ruby trunk 02f0498
Commits on Sep 05, 2013
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: use double quotes when
  strings start with special characters.
  [Fixes GH-157] #157

* test/psych/test_string.rb: test for change.

Fixes #157
684612c
Commits on Sep 18, 2013
Aaron Patterson bumping to 2.0.1 7b76cdd
Commits on Sep 20, 2013
Zachary Scott zzak * ext/psych/yaml/yaml.h: [DOC] fix typo by @GreenGeorge [Fixes GH-161] aaa9299
Commits on Oct 09, 2013
Benjamin Fleischer bf4 [#163] Add license to gemspec, is MIT 9486a2f
Commits on Oct 16, 2013
Aaron Patterson Merge pull request #164 from bf4/add_license_to_gemspec
[#163] Add license to gemspec, is Ruby
bf7f086
Commits on Oct 29, 2013
Aaron Patterson Merge branch 'master' of github.com:tenderlove/psych
* 'master' of github.com:tenderlove/psych:
  [#163] Add license to gemspec, is MIT
  * ext/psych/yaml/yaml.h: [DOC] fix typo by @GreenGeorge [Fixes GH-161]   #161
24b0860
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: string subclasses should
  not be considered to be binary.  Fixes Psych / GH 166
  #166

* test/psych/test_string.rb: test for fix

Fixes #166
2ffd057
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: make less garbage when
  testing if a string is binary.
41152b9
Commits on Nov 05, 2013
Aaron Patterson * ext/psych/lib/psych/visitors/to_ruby.rb: process merge keys before
  reviving objects. Fixes GH psych #168
* test/psych/test_merge_keys.rb: test for change
  #168

Fixes #169
1003a03
Commits on Nov 26, 2013
Aaron Patterson fix regexp for matching TIME.
fixes #171
6066fcc
Aaron Patterson fix support for negative years.
Fixes #168
1029c92
Aaron Patterson bumping version b36cd3a
Commits on Dec 05, 2013
Peter Suschlik splattael Add failing test for Struct references
The tests fails with

    Psych::BadAlias: Unknown alias: 1
3844304
Peter Suschlik splattael Fix references for anonymous structs 52097f8
Commits on Dec 10, 2013
Akira Matsuda amatsuda fix typo
s/preceeded/preceded/
f05d354
Commits on Dec 13, 2013
Aaron Patterson Merge pull request #173 from amatsuda/preceeded
fix typo in the code
00aa57e
Aaron Patterson Merge pull request #172 from splattael/struct-ref
Referencing anonymous structs fails with Psych::BadAlias Unknown alias
28b5212
Commits on Dec 19, 2013
Ben Langfeld benlangfeld Psych.safe_load relies on ClassLoader without explicit dependency
I'm seeing the following when invoking `safe_load` in certain places:

NameError: uninitialized constant Psych::ClassLoader
# /Users/ben/.rvm/gems/ruby-1.9.3-p448/gems/psych-2.0.2/lib/psych.rb:286:in `safe_load'
95097bd
Aaron Patterson Merge pull request #175 from benlangfeld/patch-1
Psych.safe_load relies on ClassLoader without explicit dependency
239aa1a
Commits on Jan 09, 2014
Aaron Patterson merging ruby trunk bfd62dc
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings with
  quotes should not have changed.  [ruby-core:59316] [Bug #9300]

* ext/psych/lib/psych.rb: fixed missing require.

* test/psych/test_string.rb: test
a479e14
Commits on Jan 19, 2014
SHIBATA Hiroshi hsbt fix typo at ruby/ruby#500 and ruby/ruby#506 a7be452
Zachary Scott zzak Merge pull request #180 from hsbt/fix-typo 0990494
Commits on Feb 04, 2014
Aaron Patterson * ext/psych/yaml/emitter.c: merge libyaml 0.1.5
* 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
5860bd7
Aaron Patterson bumping to 2.0.3 7745062
Commits on Feb 05, 2014
Zachary Scott zzak * ext/psych/yaml/config.h: bump libyaml to 0.1.5 3fac88a
Aaron Patterson merge from ruby trunk 4a86bfe
Aaron Patterson bumping version d5972dc
Commits on Feb 18, 2014
SHIBATA Hiroshi hsbt remove unused variables f798c28
Aaron Patterson Merge pull request #186 from hsbt/backport-rubycore
remove unused variables
692aff5
Commits on Feb 21, 2014
SHIBATA Hiroshi hsbt backport from ruby trunk f4e90d8
SHIBATA Hiroshi hsbt Merge branch 'backport-ruby-trunk' f10477a
SHIBATA Hiroshi hsbt added 2.1.0 for travis 5e6a486
Commits on Mar 01, 2014
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding
	  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
960d30e
Commits on Mar 27, 2014
SHIBATA Hiroshi hsbt backport from libyaml-1.1.6 52acb80
Aaron Patterson Merge pull request #187 from tenderlove/libyaml-0.1.6
backport from libyaml-1.1.6
f21cb67
Aaron Patterson bumping up version 1a3eb2a
Commits on Apr 13, 2014
SHIBATA Hiroshi hsbt merge from ruby trunk b6e8b10
Commits on May 25, 2014
Zachary Scott zzak YAML::ENGINE was removed in [Bug #8344] fa6aac2
SHIBATA Hiroshi hsbt Revert "YAML::ENGINE was removed in [Bug #8344]"
This reverts commit fa6aac2.
90ce47f
Commits on Jun 05, 2014
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: dump empty symbols with a
  tag so that they can be parsed on input. [Bug #9873] [ruby-core:62825]
* test/psych/test_symbol.rb: test for change
1695b6c
Commits on Jun 26, 2014
SHIBATA Hiroshi hsbt Manually reverted fa6aac2 7e7ccf6
Commits on Jul 25, 2014
SHIBATA Hiroshi hsbt backport r46948 from ruby/ruby trunk. 41c0ad6
Commits on Aug 05, 2014
Aaron Patterson * ext/psych/lib/psych/visitors/to_ruby.rb: backwards compatibility for
  hashes emitted by Syck. Github #198
* test/psych/test_hash.rb: test for change.

fixes #198
75ac07f
Commits on Aug 06, 2014
Mark J. Titorenko mjtko Retain reference to target in Registrar so a GC run can't confuse ong…
…oing serialization.
5234688
Aaron Patterson Merge pull request #199 from mjtko/fix/yaml-registrar-mappings
GC can break an ongoing serialization
0c4ee55
Commits on Aug 16, 2014
Jakub Jirutka jirutka Don't quote scalar values beginning with non-ASCII character 010d0c3
Commits on Aug 20, 2014
Lucas lfzawacki Remove test_engine_manager.rb from Manifest.txt
This was removed by fa6aac2 but was still referenced by Manifest.txt and makes `rake gem` fail
09c6922
Aaron Patterson Merge pull request #201 from lfzawacki/remove-test-engine-manager
Remove test_engine_manager.rb from Manifest.txt
de39177
Commits on Aug 29, 2014
Aaron Patterson * 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

fixes #203
08092b0
Aaron Patterson * 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

Fixes #202
854c567
Aaron Patterson * 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

Fixes #189
ad86a74
Aaron Patterson * 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

fixes #85
29d4544
Commits on Sep 14, 2014
Aaron Patterson bumping version fc31992
Commits on Sep 17, 2014
Sean Griffin sgrif Allow dumping any BasicObject that defines #marshal_dump or #marshal_…
…load

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.
2a4d956
Aaron Patterson Merge pull request #205 from sgrif/sg-simple-delegator
Allow dumping of Delegator subclasses
c34f7f7
Commits on Nov 02, 2014
SHIBATA Hiroshi hsbt backport r48214 from ruby/ruby trunk. a673196
Commits on Nov 23, 2014
Zachary Scott zzak Add changelog for 2a4d956 0a19c20
SHIBATA Hiroshi hsbt backport r48512 from ruby/ruby trunk. dbbd9e1
Commits on Dec 01, 2014
Aaron Patterson Merge branch 'master' of github.com:tenderlove/psych
* 'master' of github.com:tenderlove/psych:
  backport r48512 from ruby/ruby trunk.
  Add changelog for 2a4d956
  backport r48214 from ruby/ruby trunk.
  Allow dumping any BasicObject that defines #marshal_dump or #marshal_load
002cc29
Aaron Patterson merging from ruby trunk 5239d4b
Aaron Patterson bumping version to 2.0.7 f8c1608
Commits on Dec 02, 2014
SHIBATA Hiroshi hsbt fixed build error caused by trunk changes e1f43b3
Aaron Patterson Merge pull request #211 from tenderlove/fix-type-data
fixed build error caused by trunk changes
55beab1
Commits on Dec 05, 2014
SHIBATA Hiroshi hsbt bumping version to 2.0.8 5ade7c6
Commits on Dec 06, 2014
SHIBATA Hiroshi hsbt added ruby-head env 5edfc9a
SHIBATA Hiroshi hsbt added install task into travis 436265e
SHIBATA Hiroshi hsbt added minitest dependency into gemspec 54a11d8
SHIBATA Hiroshi hsbt removed isolate plugin 9332c7c
SHIBATA Hiroshi hsbt removed isolate task 681ad3e
Aaron Patterson Merge pull request #213 from hsbt/ruby-head
Added ruby-head env into travis
1109112
Commits on Jan 08, 2015
Aaron Patterson * ext/psych/lib/psych/visitors/to_ruby.rb: revive hashes with ivars
* 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
8f84ad0
Aaron Patterson * ext/psych/lib/psych/visitors/to_ruby.rb: call `allocate` on hash
subclasses.  Fixes github.com/tenderlove/psych/issues/196

* test/psych/test_hash.rb: test for change

fixes #196
af308f8
Aaron Patterson Merge branch 'master' into jirutka-patch-1
* 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 2a4d956
  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
e3b2c1c
Aaron Patterson bumping version: 24055a1
Commits on Jan 12, 2015
Jakub Jirutka jirutka Remove unnnecessary 'str' variable in YAMLTree#visit_String 3c27c08
Jakub Jirutka jirutka Use appropriate style for serialized strings
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.
2edf642
Jakub Jirutka jirutka Preset @line_width in YAMLTree#initialize for better performance 9a811d6
Commits on Jan 13, 2015
Jakub Jirutka jirutka Fix block chomping and add more tests
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
af668b4
Aaron Patterson Merge pull request #215 from jirutka/patch-2
Use appropriate style for serialized strings (replaces #195)
47adf87
Commits on Jan 16, 2015
Joe Eli McIlvain jemc Only dump ivars for subclasses of Hash, not for Hash.
Fixes #216.
Fixes part of #217.
a165612
Joe Eli McIlvain jemc Only dump ivars for subclasses of String, not for String.
With cf0dd2b93f1552a3c452a0bfa0e996f441d5e27e, fixes #217.
461a56d
Aaron Patterson Merge pull request #218 from jemc/master
Fix issue #217 and #216 - Only dump ivars for subclasses of Hash and String.
5616a13
Aaron Patterson bump version cb75738
Commits on Jan 17, 2015
Nobuyoshi Nakada nobu Fix assertion regexps
`|' is a meta character, so needs to be escaped.
48e65f5
Nobuyoshi Nakada nobu Fix anchor
Anchors like `\Z` are not valid inside character class.
Use negative-lookahead instead.
372449c
Aaron Patterson Merge pull request #221 from nobu/fix-anchor
Fix anchor
d48f645
Commits on Jan 20, 2015
Aaron Patterson bump version a3f506c
Commits on Jan 28, 2015
Aaron Patterson * ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes with
  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
8cacb47
Commits on Feb 06, 2015
Aaron Patterson * ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regular
  expressions with newlines. tenderlove/psych#222

* test/psych/test_yaml.rb: test for change.

fixes #222
6a191f4
Aaron Patterson * ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes when
  dumping objects with custom coders. [ruby-core:66215] [Bug #10496]

* test/psych/test_coder.rb: test for fix
43fa4aa
Aaron Patterson fix minitest warnings 6b689e4
Commits on Feb 14, 2015
Brandon Fish bjfish Adding RVM listing for Rubinius
Hello, I would like to add Rubinius to your RVM list in your travis build to test this gem for compatibility.  Thank you.
6c110d7
Commits on Feb 17, 2015
Florian Frank flori Fix CVE-2014-9130 7217fc9
Aaron Patterson Merge pull request #225 from flori/fix-cve-2014-9130
Fix CVE-2014-9130
40f8e29
Aaron Patterson bump version 907879c
Commits on Feb 22, 2015
Brandon Fish bjfish Adding Rubinius as an Allowed Failure f458984
Commits on Feb 23, 2015
Aaron Patterson Merge pull request #224 from bjfish/patch-1
Adding RVM listing for Rubinius
24ff785