safe_yaml 0.4 → 0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    safe_yaml (0.3)
+    safe_yaml (0.4)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -71,6 +71,7 @@ The way that SafeYAML works is by restricting the kinds of objects that can be d
 - Arrays
 - Strings
 - Numbers
+- Dates
 - Booleans
 - Nils
 

data/lib/safe_yaml/transform.rb

@@ -22,6 +22,8 @@ module SafeYAML
 
     FLOAT_MATCHER = /^(?:\d+(?:\.\d*)?$)|(?:^\.\d+$)/.freeze
 
+    DATE_MATCHER = /^\d{4}\-\d{2}\-\d{2}$/.freeze
+
     def self.to_proper_type(value)
       if value.is_a?(String)
         if PREDEFINED_VALUES.include?(value.downcase)
@@ -35,6 +37,10 @@ module SafeYAML
 
         elsif value.match(FLOAT_MATCHER)
           return value.to_f
+
+        elsif value.match(DATE_MATCHER)
+          date = Date.parse(value) rescue nil
+          return date if date
         end
       end
 

data/lib/safe_yaml/version.rb

@@ -1,3 +1,3 @@
 module SafeYAML
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

data/lib/safe_yaml.rb

@@ -12,7 +12,7 @@ module YAML
     end
 
     def self.orig_load_file(filename)
-      # https://github.com/tenderlove/psych/blob/master/lib/psych.rb#L298-300
+      # https://github.com/tenderlove/psych/blob/v1.3.2/lib/psych.rb#L296-298
       File.open(filename, 'r:bom|utf-8') { |f| self.orig_load f, filename }
     end
 
@@ -25,7 +25,7 @@ module YAML
     end
 
     def self.orig_load_file(filename)
-      # https://github.com/tenderlove/psych/blob/master/lib/psych.rb#L298-300
+      # https://github.com/tenderlove/psych/blob/v1.2.0/lib/psych.rb#L228-230
       File.open(filename, 'r:bom|utf-8') { |f| self.orig_load f }
     end
 

data/safe_yaml.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.version       = SafeYAML::VERSION
   gem.authors       = "Dan Tao"
   gem.email         = "daniel.tao@gmail.com"
-  gem.description   = %q{Parse YAML safely, without that pesky arbitrary code execution vulnerability.}
+  gem.description   = %q{Parse YAML safely, without that pesky arbitrary code execution vulnerability}
   gem.summary       = %q{SameYAML provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.}
   gem.homepage      = "http://github.com/dtao/safe_yaml"
 

data/spec/shared_specs.rb

@@ -18,6 +18,16 @@ module SharedSpecs
           }
         end
 
+        it "translates sequences to arrays" do
+          parse <<-YAML
+            - foo
+            - bar
+            - baz
+          YAML
+
+          result.should == ["foo", "bar", "baz"]
+        end
+
         it "translates most values to strings" do
           parse "string: value"
           result.should == { "string" => "value" }
@@ -38,14 +48,9 @@ module SharedSpecs
           result.should == { "float" => 3.14 }
         end
 
-        it "translates sequences to arrays" do
-          parse <<-YAML
-            - foo
-            - bar
-            - baz
-          YAML
-
-          result.should == ["foo", "bar", "baz"]
+        it "translates valid dates" do
+          parse "date: 2013-01-24"
+          result.should == { "date" => Date.parse("2013-01-24") }
         end
 
         it "translates valid true/false values to booleans" do
@@ -75,13 +80,15 @@ module SharedSpecs
             :bar: symbol
             1: integer
             3.14: float
+            2013-01-24: date
           YAML
 
           result.should == {
             "foo"  => "string",
             ":bar" => "symbol",
             1      => "integer",
-            3.14   => "float"
+            3.14   => "float",
+            Date.parse("2013-01-24") => "date"
           }
         end
 
@@ -91,9 +98,10 @@ module SharedSpecs
             - :bar
             - 1
             - 3.14
+            - 2013-01-24
           YAML
 
-          result.should == ["foo", ":bar", 1, 3.14]
+          result.should == ["foo", ":bar", 1, 3.14, Date.parse("2013-01-24")]
         end
 
         it "deals just fine with nested maps" do
@@ -137,13 +145,15 @@ module SharedSpecs
             :bar: symbol
             1: integer
             3.14: float
+            2013-01-24: date
           YAML
 
           result.should == {
             "foo" => "string",
             :bar  => "symbol",
             1     => "integer",
-            3.14  => "float"
+            3.14  => "float",
+            Date.parse("2013-01-24") => "date"
           }
         end
 
@@ -153,9 +163,10 @@ module SharedSpecs
             - :bar
             - 1
             - 3.14
+            - 2013-01-24
           YAML
 
-          result.should == ["foo", :bar, 1, 3.14]
+          result.should == ["foo", :bar, 1, 3.14, Date.parse("2013-01-24")]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safe_yaml
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies: []
-description: Parse YAML safely, without that pesky arbitrary code execution vulnerability.
+description: Parse YAML safely, without that pesky arbitrary code execution vulnerability
 email: daniel.tao@gmail.com
 executables: []
 extensions: []