Merge pull request bkeepers#194 from flyfy1/master

supporting carriage return

lib/dotenv/parser.rb

@@ -41,7 +41,7 @@ def initialize(string)
     end
 
     def call
-      @string.split("\n").each do |line|
+      @string.split(/[\n\r]+/).each do |line|
         parse_line(line)
       end
       @hash
@@ -83,7 +83,7 @@ def unescape_characters(value)
     end
 
     def expand_newlines(value)
-      value.gsub('\n', "\n")
+      value.gsub('\n', "\n").gsub('\r', "\r")
     end
 
     def variable_not_set?(line)

spec/dotenv/parser_spec.rb

@@ -144,6 +144,18 @@ def env(string)
         .to eql("Quotes won't be a problem")
     end
 
+    it "supports carriage return" do
+      expect(env("FOO=bar\rbaz=fbb")).to eql("FOO" => "bar", "baz" => "fbb")
+    end
+
+    it "supports carriage return combine with new line" do
+      expect(env("FOO=bar\r\nbaz=fbb")).to eql("FOO" => "bar", "baz" => "fbb")
+    end
+
+    it "expands carriage return in quoted strings" do
+      expect(env('FOO="bar\rbaz"')).to eql("FOO" => "bar\rbaz")
+    end
+
     # This functionality is not supported on JRuby or Rubinius
     if (!defined?(RUBY_ENGINE) || RUBY_ENGINE != "jruby") &&
        !defined?(Rubinius)