lib/ykutils/erubyx.rb in ykutils-0.1.7 vs lib/ykutils/erubyx.rb in ykutils-0.1.8

- old
+ new

@@ -1,16 +1,14 @@ -require 'tilt' -require 'yaml' +require "tilt" +require "yaml" module Ykutils module Erubyx module_function def erubi_render(template_hash, scope, value_hash = {}) - unless template_hash[:OBJ] - template_hash[:OBJ] = Tilt::ErubiTemplate.new { template_hash[:TEMPLATE] } - end + template_hash[:OBJ] = Tilt::ErubiTemplate.new { template_hash[:TEMPLATE] } unless template_hash[:OBJ] template_hash[:OBJ].render(scope, value_hash) end ## # `erubi_render_with_file` takes a template file path, a scope, and a value file path, reads the @@ -23,17 +21,17 @@ # value_file_path: The path to the YAML file that contains the values to be used in the template. def erubi_render_with_file(template_file_path, scope, value_file_path_array) template_text = File.read(template_file_path) template_hash = { TEMPLATE: template_text, OBJ: nil } - value_hash = value_file_path_array.reduce({}) { |hash, path| + value_hash = value_file_path_array.reduce({}) do |hash, path| # p path hash0 = YAML.load_file(path) # p hash0 hash = hash.merge(hash0) # p hash hash - } + end # puts value_hash erubi_render(template_hash, scope, value_hash) end def erubi_render_with_template_file(template_file_path, scope, value_hash = {})