text-interpolator 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGI1Y2YyNjFlYzEwZDEzNTJiMDhjNDNiNGJjNzBkYjI5N2M3OGVjYQ==
+    ODFiMjU4MGFiYTgyMTJjMDg1ODAwODZkODk0OTU1YjkyMzBhMTI4NA==
   data.tar.gz: !binary |-
-    YzgyYzU5Zjc4MDQzZWFkZjBkYTUxZGNmZTExZmM5YjU2MjJjOGE3Mw==
+    ZjZkNzBiYmYxNThmNDU3ZGFjNjg5MTA1NjIzMTA4N2FkYjM5MTI0NQ==
 SHA512:
   metadata.gz: !binary |-
-    MzU2YjQ5MGQ2YWY4MWU2NTY3ZDg4ZWM4OTQ3MjUwZGRhMDc4ODE2ZGQwZGQ0
-    YzY0Y2ZmNTc0ZmU4YTg1MjI2NzhmOTMyMDFkM2QyZDE5YTYyZGI2YWE5ZmQz
-    NmQ2ZmVhOTQwMGU4NjE3NzIxZmIzYTNjYzc1MTE2N2E3ODY1N2Q=
+    YTM4OTRmYjMwMDE5ODc5NTIyZDA2Y2UzOTdiM2RhY2EzNzExZDg2OWJjYzkz
+    YmY3YjlmMGRhODM3MGEyYmJlODAxMWJiMmEyMjE2YjMzMDRkYzMyZTljMDk5
+    OGFkMGU2ZmE3NWQwNzRmZWZjNmEyMDM2ZTUxZmUzYzYwODMzYWQ=
   data.tar.gz: !binary |-
-    ZGU0YzEyNTFhNmJmMzQxYWI0NTUzZmI1MzA0ZWJlOGZhMjBjNGMxOWE3MTBm
-    ODA1MDE0ZDI1ZTU0MGVkMTM2OGU3YmE4ZjE1NmEwOGFkYjkxMmI3NzQ0NDMy
-    YjQ0N2U2MjIzYzM2ZmI1ZGQ2ZjZkOGViOTFlOTQyMzNkNjdiOWQ=
+    Nzk5Yzc1Y2IyZTYwMzRlMjVmYzNhOWUxMTdkMTMwNjcyNmRiM2U1NDdiNjNh
+    NDQxYmM1YmJmNDkwN2RjZTMzNjAxYWQ4ODIzNTZmYTAxYjk2MDUyZTIxYWFl
+    OTg2NmM0ZTNmOTZiOTdiZGExYWE5MTU2MDcxMTE1ZTQ3ZGZkZDc=

data/CHANGES

@@ -26,4 +26,8 @@
 
 == Version 1.1.0
 
-* Adding qualified variable names.
+* Adding qualified variable names.
+
+== Version 1.1.1
+
+* Bug fix.

data/lib/text_interpolator/text_interpolator.rb

@@ -1,5 +1,4 @@
 require 'stringio'
-require 'text_interpolator/hash_processor'
 
 class TextInterpolator
 
@@ -8,20 +7,37 @@ class TextInterpolator
   def interpolate object, env={}
     if object.kind_of? String
       interpolate_string object, env
-    elsif object.kind_of? IO
-      interpolate_io object, env
     elsif object.kind_of? Hash
       interpolate_hash object
+    elsif object.kind_of? IO
+      interpolate_io object, env
     else
       object
     end
   end
 
   def interpolate_string string, env={}
-    string = interpolate_env_vars string
-    string = string.gsub(/\#{/, '%{') if string.index(/\#\{/)
+    @errors = {}
+
+    value = interpolate_system_variable string
+
+    begin
+      new_value = interpolate_variable value, env
+    rescue KeyError => e
+      errors << e.message
+    end
+
+    new_value
+  end
+
+  def interpolate_hash hash
+    @errors = {}
+
+    content = interpolate_system_variables(hash)
+
+    var_table = build_variables_table(content)  # one-dimensional collection of variables
 
-    StringIO.new(string).read % env
+    interpolate_variables(content, var_table)
   end
 
   def interpolate_io io, env={}
@@ -35,10 +51,115 @@ class TextInterpolator
     result
   end
 
-  def interpolate_hash hash
-    result, @errors = *HashProcessor.instance.process(hash)
+  private
 
-    result
+  def interpolate_system_variables hash
+    content = {}
+
+    hash.each do |key, value|
+      if value.kind_of? String
+        new_value = interpolate_system_variable value
+
+        content[key] = new_value if new_value
+      elsif value.kind_of? Hash
+        content[key] = interpolate_system_variables value
+      else
+        content[key] = value
+      end
+    end
+
+    content
+  end
+
+  def interpolate_system_variable value
+    new_value = value
+
+    while new_value.index('ENV[')
+      index1 = new_value.index("ENV[")
+      index2 = new_value.index("]")
+
+      name = new_value[index1+5..index2-2]
+
+      left = (index1 == 0) ? '' : new_value[0..index1-1]
+      right = new_value[index2+1..-1]
+
+      new_value = left + ENV[name] + right
+    end
+
+    new_value
+  end
+
+  def build_variables_table content
+    var_table = {}
+
+    content.each do |key, value|
+      build_variable(var_table, key, key, value)
+    end
+
+    var_table
+  end
+
+  def build_variable(var_table, compound_key, key, value)
+    if value.kind_of? String
+      var_table[key] = interpolate_variable value, var_table
+    elsif value.kind_of? Hash
+      build_hash var_table, compound_key, value
+    end
+  end
+
+  def build_hash var_table, compound_key, hash
+    hash.each do |key, value|
+      new_compound_key = "#{compound_key}.#{key}"
+
+      if value.kind_of? Hash
+        build_variable(var_table, new_compound_key, key, value)
+      else
+        var_table[new_compound_key.to_sym] = value
+      end
+    end
+  end
+
+  def interpolate_variables content, env
+    hash = {}
+
+    begin
+      substitutions = false
+
+      content.each do |key, value|
+        new_value = value
+        substitutions = false
+
+        if value.kind_of? String
+          if value.index(/\#\{/)
+            substitutions = true
+
+            begin
+              new_value = interpolate_variable value, env
+            rescue KeyError => e
+              substitutions = false
+
+              errors << e.message
+            end
+          end
+        elsif value.kind_of? Hash
+          new_value = interpolate_variables value, env
+        end
+
+        if hash[key] == new_value
+          substitutions = false
+        else
+          hash[key] = new_value
+        end
+      end
+    end while substitutions
+
+    hash
+  end
+
+  def interpolate_variable value, env
+    new_value = value.index(/\#\{/) ? value.gsub(/\#{/, '%{') : value
+
+    StringIO.new(new_value).read % env
   end
 
 end

data/lib/text_interpolator/version.rb

@@ -1,3 +1,3 @@
 class TextInterpolator
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text-interpolator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alexander Shvets
@@ -54,7 +54,6 @@ files:
 - README.md
 - Rakefile
 - lib/text_interpolator.rb
-- lib/text_interpolator/hash_processor.rb
 - lib/text_interpolator/text_interpolator.rb
 - lib/text_interpolator/version.rb
 - spec/spec_helper.rb

data/lib/text_interpolator/hash_processor.rb

@@ -1,125 +0,0 @@
-require 'singleton'
-
-class HashProcessor
-  include Singleton
-
-  def process hash
-    errors = {}
-
-    content = interpolate_system_variables(hash)
-
-    var_table = build_variables_table(content)  # one-dimensional collection of variables
-
-    result = interpolate_variables(content, var_table, errors)
-
-    [result, errors]
-  end
-
-  private
-
-  def interpolate_system_variables hash
-    content = {}
-
-    hash.each do |key, value|
-      if value.kind_of? String
-        new_value = interpolate_system_variable value
-
-        content[key] = new_value if new_value
-      elsif value.kind_of? Hash
-        content[key] = interpolate_system_variables value
-      else
-        content[key] = value
-      end
-    end
-
-    content
-  end
-
-  def interpolate_system_variable value
-    new_value = value
-
-    while new_value.index('ENV[')
-      index1 = new_value.index("ENV[")
-      index2 = new_value.index("]")
-
-      name = new_value[index1+5..index2-2]
-
-      left = (index1 == 0) ? '' : new_value[0..index1-1]
-      right = new_value[index2+1..-1]
-
-      new_value = left + ENV[name] + right
-    end
-
-    new_value
-  end
-
-  def build_variables_table content
-    var_table = {}
-
-    content.each do |key, value|
-      build_variable(var_table, key, key, value)
-    end
-
-    var_table
-  end
-
-  def build_variable(var_table, compound_key, key, value)
-    if value.kind_of? String
-      var_table[key] = value
-    elsif value.kind_of? Hash
-      build_hash var_table, compound_key, value
-    end
-  end
-
-  def build_hash var_table, compound_key, hash
-    hash.each do |key, value|
-      new_compound_key = "#{compound_key}.#{key}"
-
-      if value.kind_of? Hash
-        build_variable(var_table, new_compound_key, key, value)
-      else
-        var_table[new_compound_key.to_sym] = value
-      end
-    end
-  end
-
-  def interpolate_variables content, env, errors
-    hash = {}
-
-    begin
-      substitutions = false
-
-      content.each do |key, value|
-        new_value = value
-        substitutions = false
-
-        if value.kind_of? String
-          if value.index(/\#\{/)
-            substitutions = true
-
-            new_value = value.gsub(/\#{/, '%{')
-
-            begin
-              new_value = StringIO.new(new_value).read % env
-            rescue KeyError => e
-              substitutions = false
-
-              errors << e.message
-            end
-          end
-        elsif value.kind_of? Hash
-          new_value = interpolate_variables value, env, errors
-        end
-
-        if hash[key] == new_value
-          substitutions = false
-        else
-          hash[key] = new_value
-        end
-      end
-    end while substitutions
-
-    hash
-  end
-
-end