text-interpolator 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 69afab85f7ecdf511c5e7828735e5459f18d5952
-  data.tar.gz: 9e7bc13e251885eb519436d55bdf51a82559ebd9
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGFkYWMxNzI2N2U5MTBiM2MzMTZhNWFjNjQwMThlNzAzZTYwMDJmZA==
+  data.tar.gz: !binary |-
+    MmQ5NDgyNGE0ZDU4ZjEwZDExY2I0NzEwYzgzYTVmMDQ3OWY2MzAwZg==
 SHA512:
-  metadata.gz: 90bf17c599aaf88096747c4a7c9e6b25b938133e692a8d761db24a19da28b098ff9ee87d2a81c12134503c83eef6c9a6899fde96db9f6f8f726dc99334c4a76a
-  data.tar.gz: ddff6c17ee359aa77a5ede0b920cda0a3c96c023f131e9be06769794575863322b3c50fdae4d33f93808eb755b7644d16e3bd8dda37692de7977208e66c05510
+  metadata.gz: !binary |-
+    NTJmN2I5NDc3Y2MzYWQyNWM0MDFkNWNiMzA3YzA2YTI4YWM3OWZjOTUyNDY1
+    MjkwZTYxOTRhYjI0NmFiMGMyNWNhMTA2ZjlhNTRmOWQyOTYyNTE4ODkwNWQy
+    MjJmYWM5YzVhZjUxZDc3YTY2YTQ0ZTYzNGVmOTlmYWY0MDMyYTY=
+  data.tar.gz: !binary |-
+    YTc1ZWU5ZGU0ZmVjZWIxOGJiYmE1NmJlNDc3NzZkMTUzYTYxZjY2MDIxN2Y4
+    ZmZmMTM5YTBlZDRhYTk3Y2IwMWI4NzA5MDY4ZmY1NTk2NTQ3NTkwYzExMzI3
+    MWQ5ZDkyNzVkNThjNmMwMWM4MWJkMjliZjFiN2Q1YjMzNWU5ZGU=

data/CHANGES

@@ -46,4 +46,8 @@
 
 == Version 1.1.5
 
+* Bug fix.
+
+== Version 1.1.6
+
 * Bug fix.

data/lib/text_interpolator/text_interpolator.rb

@@ -107,6 +107,10 @@ class TextInterpolator
       build_variable(var_table, key, key, value)
     end
 
+    var_table.each do |key, value|
+      var_table[key] = interpolate_variable value.to_s, var_table
+    end
+
     var_table
   end
 
@@ -114,7 +118,7 @@ class TextInterpolator
     if value.kind_of? Hash
       build_hash var_table, compound_key, value
     else
-      var_table[key] = interpolate_variable value.to_s, var_table
+      var_table[key] = value
     end
   end
 

data/lib/text_interpolator/version.rb

@@ -1,3 +1,3 @@
 class TextInterpolator
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,2 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-

data/spec/text_interpolator_spec.rb

@@ -2,9 +2,9 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 require 'text_interpolator'
 
-describe TextInterpolator do
+RSpec.describe TextInterpolator do
 
-  describe "#interpolate_string" do
+  context "#interpolate_string" do
     it "interpolates string with %{} symbol tokens" do
       env = {name1: 'value1', name2: 'value2'}
 
@@ -63,7 +63,7 @@ describe TextInterpolator do
     end
   end
 
-  describe "#interpolate_io" do
+  context "#interpolate_io" do
     it "interpolates io stream"  do
       env = {name1: 'value1', name2: 'value2'}
       ENV['name3'] = 'value3'
@@ -74,7 +74,7 @@ describe TextInterpolator do
     end
   end
 
-  describe "#interpolate_hash" do
+  context "#interpolate_hash" do
     it "interpolates simple hash" do
       hash = {
         user: ENV['USER'],
@@ -116,7 +116,16 @@ describe TextInterpolator do
 
         mysql: {
           user: '#{credentials.settings.user}',
-        }
+        },
+
+        project: {
+          home: '/some_home'
+        },
+
+        instant_client: {
+          src_dir: '#{project.home}/downloads',
+          basic_zip: '#{instant_client.src_dir}/instantclient-basic-macos.x64-123.zip'
+        },
       }
 
       result = subject.interpolate hash
@@ -124,7 +133,9 @@ describe TextInterpolator do
       expect(result[:postgres][:user]).to eq hash[:credentials][:user]
       expect(result[:mysql][:user]).to eq hash[:credentials][:settings][:user]
 
+      expect(result[:instant_client][:basic_zip]).to eq "/some_home/downloads/instantclient-basic-macos.x64-123.zip"
+
       expect(subject.errors).to be_empty
     end
   end
-end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: text-interpolator
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Simple library for interpolation of variables inside the text.
@@ -44,10 +44,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".idea/codeStyleSettings.xml"
-- ".ruby-gemset"
-- ".ruby-version"
+- .gitignore
+- .idea/codeStyleSettings.xml
+- .ruby-gemset
+- .ruby-version
 - CHANGES
 - Gemfile
 - LICENSE
@@ -70,12 +70,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []