diff --git a/README.md b/README.md index a7b7bdc..c7608c9 100644 --- a/README.md +++ b/README.md @@ -174,14 +174,14 @@ Also be aware that some Ruby libraries, particularly those requiring inter-proce 3. both - [**delayed_job**](https://github.com/collectiveidea/delayed_job): Uses YAML to serialize the objects on which delayed methods are invoked (with `delay`). The safest solution in this case is to use `SafeYAML.whitelist!` to whitelist the types you need to serialize. - [**Guard**](https://github.com/guard/guard): Uses YAML as a serialization format for notifications. The data serialized uses symbolic keys, so setting `SafeYAML::OPTIONS[:deserialize_symbols] = true` is necessary to allow Guard to work. -- [**sidekiq**](https://github.com/mperham/sidekiq): Uses a YAML configiuration file with symbolic keys, so setting `SafeYAML::OPTIONS[:deserialize_symbols] = true` should allow it to work. +- [**sidekiq**](https://github.com/mperham/sidekiq): Uses a YAML configuration file with symbolic keys, so setting `SafeYAML::OPTIONS[:deserialize_symbols] = true` should allow it to work. The above list will grow over time, as more issues are discovered. Versioning ---------- -SafeYAML will follow [semantic versioning](http://semver.org/) so any updates to the first major version will maintain backwards compatability. So expect primarily bug fixes and feature enhancements (if anything!) from here on out... unless it makes sense to break the interface at some point and introduce a version 2.0, which I honestly think is unlikely. +SafeYAML will follow [semantic versioning](http://semver.org/) so any updates to the first major version will maintain backwards compatibility. So expect primarily bug fixes and feature enhancements (if anything!) from here on out... unless it makes sense to break the interface at some point and introduce a version 2.0, which I honestly think is unlikely. Requirements ------------ diff --git a/lib/safe_yaml/syck_node_monkeypatch.rb b/lib/safe_yaml/syck_node_monkeypatch.rb index c026376..656ad95 100644 --- a/lib/safe_yaml/syck_node_monkeypatch.rb +++ b/lib/safe_yaml/syck_node_monkeypatch.rb @@ -1,7 +1,7 @@ # This is, admittedly, pretty insane. Fundamentally the challenge here is this: if we want to allow # whitelisting of tags (while still leveraging Syck's internal functionality), then we have to # change how Syck::Node#transform works. But since we (SafeYAML) do not control instantiation of -# Syck::Node objects, we cannot, for example, subclass Syck::Node and override #tranform the "easy" +# Syck::Node objects, we cannot, for example, subclass Syck::Node and override #transform the "easy" # way. So the only choice is to monkeypatch, like this. And the only way to make this work # recursively with potentially call-specific options (that my feeble brain can think of) is to set # pseudo-global options on the first call and unset them once the recursive stack has fully unwound. diff --git a/spec/safe_yaml_spec.rb b/spec/safe_yaml_spec.rb index aa701a4..387b0dc 100644 --- a/spec/safe_yaml_spec.rb +++ b/spec/safe_yaml_spec.rb @@ -421,7 +421,7 @@ class SomeClass end end - context "when options are passed direclty to #load which differ from the defaults" do + context "when options are passed directly to #load which differ from the defaults" do let(:default_options) { {} } before :each do