dotenv 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ccf9d3a79db7a52a63cb5aeca87cec81e21e3ec
-  data.tar.gz: abb6bc7fad7f6b2e2c300ff6b6141f30ccb0bc37
+  metadata.gz: e9e86533dc0be0761ac61ea33755fc7a717790e4
+  data.tar.gz: bb416f9f7c9bd513aeef7e7ec10c08fe3605bc0a
 SHA512:
-  metadata.gz: d48b1e23d0ddfac1d8342f97fe4ae862aa43316617561a0d1f702663af6d9ee21716cdef113570a263301422a2e474a572b24992b9fba2114ca3615af6768ab6
-  data.tar.gz: b2c31269eb2977d37b0707759ad1e03ba428a7ed8a46927ec4b2fa2e23a3f8ba8302c5bc03d46a590f5489b413f24d506c2381b76e6c594364f2eb86199b27dd
+  metadata.gz: ad361abae6d86e24262cab7cc5a2ab7a18e3bf43dbd2a923eecf39f56a1bcd3d7292cb6e2be336486106ea7497c044d1ebed155350c0220e2a794db8e404a408
+  data.tar.gz: 04068ddc413f631ec3daa24b8e8185bdce861b1d1c49e7507ccb6ee598ebc04df86c59fcc400ac90141df8b60c406dfabbede72252424f8e5a33cec49463bf11

data/lib/dotenv/substitutions/variable.rb

@@ -1,3 +1,5 @@
+require "English"
+
 module Dotenv
   module Substitutions
     # Substitute variables in a value.
@@ -8,30 +10,23 @@ module Dotenv
     module Variable
       class << self
         VARIABLE = /
-          (\\)?          # is it escaped with a backslash?
-          (\$)           # literal $
-          (              # collect braces with var for sub
-            \{?          # allow brace wrapping
-            ([A-Z0-9_]+) # match the variable
-            \}?          # closing brace
-          )
+          (\\)?        # is it escaped with a backslash?
+          (\$)         # literal $
+          \{?          # allow brace wrapping
+          ([A-Z0-9_]+) # match the variable
+          \}?          # closing brace
         /xi
 
         def call(value, env)
-          # Process embedded variables
-          value.scan(VARIABLE).each do |parts|
-            if parts.first == '\\'
-              # Variable is escaped, don't replace it.
-              replace = parts[1...-1].join("")
+          value.gsub(VARIABLE) do |variable|
+            match = $LAST_MATCH_INFO
+
+            if match[1] == '\\'
+              variable[1..-1]
             else
-              # Replace it with the value from the environment
-              replace = env.fetch(parts.last) { ENV[parts.last] }
+              env.fetch(match[3]) { ENV[match[3]] }
             end
-
-            value = value.sub(parts[0...-1].join(""), replace || "")
           end
-
-          value
         end
       end
     end

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake