text-interpolator 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjdmMGU5OTNkMDYwZGFkN2JkYzdhNWVkZDY2MjIyZTRlYmMyNDAzMg==
+    YzM4N2Q0MmFiMWM0YjVmM2U1ODAxYWRmZGRkNzA0ZTQ2NmMzMGIwNA==
   data.tar.gz: !binary |-
-    NTViZDRiMTQ0NzkxMDhkM2Y5ZGIwNWM3YjM5ODM3NTZlNzY3ZDIxNQ==
+    YmFiYzM1YTViMzgzOGE1ZjEzZTdkZDkwZjQxY2ZhYjM5MjE1YzgyOA==
 SHA512:
   metadata.gz: !binary |-
-    NDRhZTVmYzNkYWY2OGQzNTg4ZTgzYjNmOWQwZmEyMWRkZWNjYzc2NmRhMDlm
-    YjAwYzYyYmRjY2EyMDQwNDE5M2YxMjFhYTIxNDkxYzE4ZjYyOTgzNDY2ZjBi
-    MDk4ZWE4NDMyZGJkNmY0Y2QwYzNjNmM2M2ZjZmExNjM3ZDg1MmI=
+    OTc4YWYyMzNmMmJjY2E4YTZiOGQyZDE4ODllYjA1NGU5ZjlhYjYzMzczOWYx
+    OWM5YWFiNGRjMzE5ZDhlYjE0ZmY2Mzc1YzU2ZjEwZGM2NjkyZjVhNDhjYWUy
+    MTJhMzM1NWU4NjFkZDYyNDRhNzg4MTMwNGNhM2M3YjY3N2Y0YWI=
   data.tar.gz: !binary |-
-    ZWQ5NDM2M2UxZTcyMmQ5YjcxMDdiZTZkOGUwNjY4NTRjMDYzODE5ZjJiNWI0
-    Njg2N2JlNDBkMTEzZjg4MzZiNGE4NTE3MjBmNTM1ZDZmZGI4MTkxNTU5MmZk
-    ZGExOTg3MDEwMWIyMGFmMWNkYjUyOTEyMWIxMjkzZDU5NGQ3MzU=
+    NzdhOTJiMTBkOTljZmM2MGRmNGRkZGZmOTM4N2RkMGNkNjc3MWY0ODZjMWE5
+    MWQxN2RhNGUyMjU3ZGQwMzE2MTBhN2U1YzU1MWZlNDY2YWE5ZThjNTNiZGVj
+    MjM2ZTA4NzdmNzBlNWI5YjJjODg2N2VlN2NiYzEzMDQ3Nzg2NmQ=

data/CHANGES

@@ -38,4 +38,8 @@
 
 == Version 1.1.3
 
-* Bug fix.
+* Bug fix.
+
+== Version 1.1.4
+
+* Bug fixes.

data/lib/text_interpolator/text_interpolator.rb

@@ -25,10 +25,14 @@ class TextInterpolator
   def interpolate_string string, env={}
     clear_errors
 
+    env = symbolize_keys env
+
     value = interpolate_system_variable string
 
+    var_table = build_variables_table(env)  # one-dimensional collection of variables
+
     begin
-      new_value = interpolate_variable value, env
+      new_value = interpolate_variable value, var_table
     rescue KeyError => e
       new_value = string
       errors << e.message
@@ -169,4 +173,22 @@ class TextInterpolator
     StringIO.new(new_value).read % env
   end
 
+  def symbolize_keys hash
+    new_hash = {}
+
+    hash.each do |key, value|
+      new_value = if value.kind_of? String
+        value
+      elsif value.kind_of? Hash
+        symbolize_keys value
+      else
+        value
+      end
+
+      new_hash[key.to_sym] = new_value
+    end
+
+    new_hash
+  end
+
 end

data/lib/text_interpolator/version.rb

@@ -1,3 +1,3 @@
 class TextInterpolator
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/spec/text_interpolator_spec.rb

@@ -5,16 +5,22 @@ require 'text_interpolator'
 describe TextInterpolator do
 
   describe "#interpolate_string" do
-    it "interpolates string with %{} tokens" do
-      env = {name1: 'name1', name2: 'name2'}
+    it "interpolates string with %{} symbol tokens" do
+      env = {name1: 'value1', name2: 'value2'}
 
-      expect(subject.interpolate_string "%{name1}, %{name2}", env).to eq "name1, name2"
+      expect(subject.interpolate_string "%{name1}, %{name2}", env).to eq "value1, value2"
+    end
+
+    it "interpolates string with %{} string tokens" do
+      env = {'name1' => 'value1', 'name2' => 'value2'}
+
+      expect(subject.interpolate_string "%{name1}, %{name2}", env).to eq "value1, value2"
     end
 
     it "interpolates string with '#{}' token" do
-      env = {name1: 'name1', name2: 'name2'}
+      env = {name1: 'value1', name2: 'value2'}
 
-      expect(subject.interpolate_string '#{name1}, #{name2}', env).to eq "name1, name2"
+      expect(subject.interpolate_string '#{name1}, #{name2}', env).to eq "value1, value2"
     end
 
     it "interpolates string with ENV token" do
@@ -25,28 +31,46 @@ describe TextInterpolator do
     end
 
     it "interpolates string with ENV token and white space" do
-      ENV['name1'] = 'name1'
-      ENV['name2'] = 'name2'
+      ENV['name1'] = 'value1'
+      ENV['name2'] = 'value2'
 
-      expect(subject.interpolate_string " ENV['name1'], ENV['name2']").to eq " name1, name2"
+      expect(subject.interpolate_string " ENV['name1'], ENV['name2']").to eq " value1, value2"
     end
 
     it "interpolates string with mixed tokens" do
-      env = {name1: 'name1', name2: 'name2'}
-      ENV['name3'] = 'name3'
+      env = {name1: 'value1', name2: 'value2'}
+      ENV['name3'] = 'value3'
+
+      expect(subject.interpolate_string '#{name1}, #{name2}, ENV[\'name3\']', env).to eq "value1, value2, value3"
+    end
+
+    it "interpolates string with multi-level tokens" do
+      env = {"name1" => 'value1', 'level2.name2' => 'value2'}
 
-      expect(subject.interpolate_string '#{name1}, #{name2}, ENV[\'name3\']', env).to eq "name1, name2, name3"
+      result = subject.interpolate_string '#{name1}, #{level2.name2}', env
+
+      expect(subject.errors).to be_empty
+      expect(result).to eq "value1, value2"
+    end
+
+    it "interpolates string with multi-level tokens (part 2)" do
+      env = {name1: 'value1', level2: {name2: 'value2'}}
+
+      result = subject.interpolate_string '#{name1}, #{level2.name2}', env
+
+      expect(subject.errors).to be_empty
+      expect(result).to eq "value1, value2"
     end
   end
 
   describe "#interpolate_io" do
     it "interpolates io stream"  do
-      env = {name1: 'name1', name2: 'name2'}
-      ENV['name3'] = 'name3'
+      env = {name1: 'value1', name2: 'value2'}
+      ENV['name3'] = 'value3'
 
       io = StringIO.new '#{name1}, #{name2}, ENV[\'name3\']'
 
-      expect(subject.interpolate_io io, env).to eq "name1, name2, name3"
+      expect(subject.interpolate_io io, env).to eq "value1, value2, value3"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text-interpolator
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen