safe_yaml 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbb2ac04a98ae5516c34c7dc2baf6348304c6e17
-  data.tar.gz: 097dd3a02c37a63f7a899b8897839b3c60a82117
+  metadata.gz: b7f3a4c3a01072ac60acedf5e31aeaeb2bdd2351
+  data.tar.gz: 42d514af94d97f883fc45ac685cd763ee479a2a3
 SHA512:
-  metadata.gz: 93c0fd49c34c71dfcb0cb76d127aa52e9178a6cf6d9b8a6a94728b1ea336c956c228cc71bbefa4790fe31d35229b0e9783e930f7a97ec69053dcfdd4441571cb
-  data.tar.gz: 5d068fabdc5b89a544958e0a139a82bcc40c38828840f6a9d02baca82e3b574868397fa45b74042320ea403f13388ebd2db32164eef4df97f261475049f4f86f
+  metadata.gz: f96d1730de67f843d1f45ee0806007b9041351e739b6af14596b0e8df7387f6e74d8f6912162fc83cc5b959ac53ed02afd88c115c64d743274948dfcdbfa4550
+  data.tar.gz: 13db92095eee835579880064ee7c986f369a9a9b66225ff0e8d1054d5e2a35e04bb237a9c0f82e8406fe5a66a761af14e2ed61b214381559c1397d87e59fedc8

data/.gitignore

@@ -1 +1,3 @@
+*.gem
 Gemfile.lock
+spec/store.yaml

data/CHANGES.md

@@ -1,3 +1,8 @@
+1.0.5
+-----
+
+- fixed [#80](https://github.com/dtao/safe_yaml/issues/80): uninitialized constant DateTime
+
 1.0.2
 -----
 

data/lib/safe_yaml/parse/date.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module SafeYAML
   class Parse
     class Date

data/lib/safe_yaml/store.rb

@@ -0,0 +1,39 @@
+require 'safe_yaml/load'
+require 'yaml/store'
+
+module SafeYAML
+
+  class Store < YAML::Store
+
+    # Override YAML::Store#initialize to accept additional option
+    # +safe_yaml_opts+.
+    def initialize(file_name, yaml_opts = {}, safe_yaml_opts = {})
+      @safe_yaml_opts = safe_yaml_opts
+      super(file_name, yaml_opts)
+    end
+
+    # Override YAML::Store#load to use SafeYAML.load instead of
+    # YAML.load (via #safe_yaml_load).
+    #--
+    # PStore#load is private, while YAML::Store#load is public.
+    #++
+    def load(content)
+      table = safe_yaml_load(content)
+      table == false ? {} : table
+    end
+
+    private
+
+    if SafeYAML::YAML_ENGINE == 'psych'
+      def safe_yaml_load(content)
+        SafeYAML.load(content, nil, @safe_yaml_opts)
+      end
+    else
+      def safe_yaml_load(content)
+        SafeYAML.load(content, @safe_yaml_opts)
+      end
+    end
+
+  end
+
+end

data/lib/safe_yaml/version.rb

@@ -1,3 +1,3 @@
 module SafeYAML
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/store_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+require 'safe_yaml/store'
+
+describe SafeYAML::Store do
+
+  let(:file)    { 'spec/store.yaml' }
+  let(:content) { "--- \nfoo: 42\n:bar: \"party\"\n" }
+
+  before do
+    # Rewrite file on every test, as its contents are potentially modified by
+    # SafeYAML::Store#transaction
+    File.open(file, 'w') { |f| f.write(content) }
+  end
+
+  def expect_safe_load(options = {})
+    load_args = [content, options]
+    load_args.insert(1, nil) if SafeYAML::YAML_ENGINE == 'psych'
+
+    expect(SafeYAML).to receive(:load).with(*load_args).and_call_original
+    expect(YAML).not_to receive(:load)
+  end
+
+  let(:init_args) { [file] }
+  subject { described_class.new(*init_args) }
+
+  it 'should be a YAML::Store' do
+    expect(subject).to be_a(YAML::Store)
+  end
+
+  it 'should be a SafeYAML::Store' do
+    expect(subject).to be_a(SafeYAML::Store)
+  end
+
+  it 'should use SafeYAML.load instead of YAML.load' do
+    expect_safe_load
+    expect(subject.transaction { subject['foo'] }).to eq(42)
+  end
+
+  it 'preserves default SafeYAML behavior' do
+    expect(subject.transaction { subject[:bar] }).to eq(nil)
+    expect(subject.transaction { subject[':bar'] }).to eq('party')
+  end
+
+
+  describe 'with options' do
+
+    let(:init_args) { super().insert(2, :deserialize_symbols => true) }
+
+    it 'should accept options for SafeYAML.load' do
+      expect_safe_load(:deserialize_symbols => true)
+      expect(subject.transaction { subject[:bar] }).to eq('party')
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safe_yaml
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Dan Tao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies: []
 description: Parse YAML safely
 email: daniel.tao@gmail.com
@@ -17,8 +17,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -37,6 +37,7 @@ files:
 - lib/safe_yaml/psych_resolver.rb
 - lib/safe_yaml/resolver.rb
 - lib/safe_yaml/safe_to_ruby_visitor.rb
+- lib/safe_yaml/store.rb
 - lib/safe_yaml/syck_hack.rb
 - lib/safe_yaml/syck_node_monkeypatch.rb
 - lib/safe_yaml/syck_resolver.rb
@@ -60,6 +61,7 @@ files:
 - spec/resolver_specs.rb
 - spec/safe_yaml_spec.rb
 - spec/spec_helper.rb
+- spec/store_spec.rb
 - spec/support/exploitable_back_door.rb
 - spec/syck_resolver_spec.rb
 - spec/transform/base64_spec.rb
@@ -78,17 +80,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: SameYAML provides an alternative implementation of YAML.load suitable for
@@ -103,6 +105,7 @@ test_files:
 - spec/resolver_specs.rb
 - spec/safe_yaml_spec.rb
 - spec/spec_helper.rb
+- spec/store_spec.rb
 - spec/support/exploitable_back_door.rb
 - spec/syck_resolver_spec.rb
 - spec/transform/base64_spec.rb