erb_asterisk 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a6778b40d23d7041aba395f23ba8f43dbebfec9
-  data.tar.gz: b36f903921fba2bec91860612bec8caae9c3bfe9
+  metadata.gz: bcf4a610f1430f15b08437cc1e1bb8b09f31bcbc
+  data.tar.gz: f1f6ee972dfb99dd839b51bc1016e692ab1c3eb3
 SHA512:
-  metadata.gz: 7bb2a7800da7b7945397bdb3c06895ac6c7af75f5c67ab76ee17dd0c7f03af4bec8bcfbf114fa82b61fad0a9a342936140169d4cfc06bb48e3891d7a8dd1a4d4
-  data.tar.gz: 452ee0b49ba80154632295e4ec6d10ee9ed1aa00bac205907f8a643f6053fc568b32a70f45a7646446d93da0abf899f254c417acfe0c70cece3259cd3843fbf0
+  metadata.gz: b5fe4467d64751959d1951d01a62cc897e61b81f0f51bc1fda1cf379299e07b39ab89bc594a31cf17712046cfdedbce49caa42b665c05429cc7ca5fbb349b3a8
+  data.tar.gz: e75e9c4e19cd4ac6e792b4d5ade0ee0f337e235c6aadc0bb25225fda637cb9bd6b83d35ef761fd4ae8a42ad9a92af843dc15c45f9224458439d47b8cd1872918

data/lib/erb_asterisk/arg_parser.rb

@@ -7,8 +7,9 @@ module ErbAsterisk
       Slop.parse do |o|
         o.string '-t', '--templates',
                  'set templates path (e.g.: ~/.erb_asterisk)'
+        o.bool '-v', '--verbose', 'enable verbose mode'
 
-        o.on '-v', '--version', 'print the version' do
+        o.on '--version', 'print the version' do
           puts "#{VERSION}"
           exit
         end

data/lib/erb_asterisk/file_cache.rb

@@ -0,0 +1,27 @@
+module ErbAsterisk
+  module FileCache
+    def file_read(file_name)
+      content = @file_cache[file_name]
+      if content
+        log_debug('cache', 3)
+        return content
+      end
+
+      content = File.read(file_name)
+      @file_cache[file_name] = content
+
+      log_debug('disk', 3)
+
+      content
+    end
+
+    def file_exist?(file_name)
+      return true if @file_cache.key?(file_name)
+      File.exist?(file_name)
+    end
+
+    def file_cache_init
+      @file_cache = {}
+    end
+  end
+end

data/lib/erb_asterisk/inclusion.rb

@@ -11,10 +11,13 @@ module ErbAsterisk
 
       current_conf_file = TOPLEVEL_BINDING.local_variable_get(:current_conf_file)
       unless arr.index { |i| i[:file] == current_conf_file }.nil?
-        puts "Skip #{current_conf_file} duplicate inclusion to #{file_name}"
+        log_warn(
+          "Skip #{current_conf_file} duplicate inclusion to #{file_name}")
         return
       end
 
+      log_debug("include_to: #{current_conf_file}, #{file_name}, #{args}", 2)
+
       arr << { file: current_conf_file, priority: args[:priority] }
       "; Included to \"#{file_name}\""
     end

data/lib/erb_asterisk/log.rb

@@ -0,0 +1,20 @@
+require 'logger'
+
+module ErbAsterisk
+  module Log
+    private
+
+    def log_init(verbose)
+      @log = Logger.new(STDOUT)
+      @log.level = verbose ? Logger::DEBUG : Logger::WARN
+    end
+
+    def log_debug(msg, level = 0)
+      @log.debug { "#{'  ' * level}#{msg}" }
+    end
+
+    def log_warn(msg)
+      @log.warn { msg }
+    end
+  end
+end

data/lib/erb_asterisk/render.rb

@@ -2,6 +2,8 @@ module ErbAsterisk
   module Render
     # Render template
     def render(template, vars = {})
+      log_debug("render: #{template}", 2)
+
       old_erb_output = @erb_output
       @erb_output = ''
 

data/lib/erb_asterisk/utils.rb

@@ -6,9 +6,12 @@ module ErbAsterisk
     # LongExtension1234! -> Lo[n]gE[x]te[n]sio[n]1234[!]
     #
     def escape_exten(exten)
-      exten.each_char.reduce('') do |s, c|
+      result = exten.each_char.reduce('') do |s, c|
         s << (%w(x z n . !).include?(c.downcase) ? "[#{c}]" : c)
       end
+
+      log_debug("escape_exten: '#{exten}' => '#{result}'", 2)
+      result
     end
   end
 end

data/lib/erb_asterisk/version.rb

@@ -1,3 +1,3 @@
 module ErbAsterisk
-  VERSION = '0.0.13'.freeze
+  VERSION = '0.0.14'.freeze
 end

data/lib/erb_asterisk/yields.rb

@@ -4,6 +4,8 @@ module ErbAsterisk
     def apply_line_to(tag, line, args = {})
       default_args!(args)
       apply_to_yields(:line, tag, line, args[:priority])
+
+      log_debug("apply_line_to: :#{tag}, #{line}, #{args}", 2)
       "; Applied \"#{line}\" to :#{tag}"
     end
 
@@ -12,12 +14,16 @@ module ErbAsterisk
       default_args!(args)
       old_output = @erb_output
       @erb_output = ''
+
       apply_to_yields(:block, tag, yield, args[:priority])
+
+      log_debug("content_for: :#{tag}, #{args}", 2)
       @erb_output = old_output
     end
 
     # Define place where put apply_line_to
     def yield_here(tag)
+      @yield_here_occured = true
       "<%= yield_actual :#{tag} %>"
     end
 
@@ -34,6 +40,9 @@ module ErbAsterisk
 
     def output_yield(tag)
       a = @yields[tag]
+
+      log_debug("yield_here: :#{tag}, size=#{a.size}", 2)
+
       a = a.sort_by { |i| -i[:priority] }
       result = a.reduce('') do |s, i|
         s << "; priority: #{i[:priority]}\n" if i[:priority] != 0

data/lib/erb_asterisk.rb

@@ -6,12 +6,16 @@ require 'erb_asterisk/render'
 require 'erb_asterisk/inclusion'
 require 'erb_asterisk/yields'
 require 'erb_asterisk/utils'
+require 'erb_asterisk/log'
+require 'erb_asterisk/file_cache'
 
 module ErbAsterisk
   include Render
   include Inclusion
   include Yields
   include Utils
+  include Log
+  include FileCache
 
   def execute(opts)
     init_instance(opts)
@@ -21,7 +25,6 @@ module ErbAsterisk
     @templates_path = "#{root}templates".freeze
 
     render_files(root)
-    export_includes(root)
   end
 
   private
@@ -35,6 +38,9 @@ module ErbAsterisk
     @templates_path = ''
     @yields = {}
 
+    log_init(opts[:verbose])
+    file_cache_init
+
     user_path = opts[:templates].nil? ? '~/.erb_asterisk' : opts[:templates]
     @user_templates = File.expand_path("#{user_path}/templates")
   end
@@ -55,9 +61,14 @@ module ErbAsterisk
     # It does two round of rendering because of apply_line_to and yield_here.
     # First round accumulates apply_line_to declarations and converts
     # yield_here to yield_actual.
+    log_debug('FIRST ROUND:')
     render_erbs(erbs)
+    log_debug('')
+
     # Second round replaces yield_actual with accumulated apply_line_to.
+    log_debug('SECOND ROUND:')
     render_erbs(erbs)
+    log_debug('')
 
     save_erbs(erbs)
     export_includes(root)
@@ -80,9 +91,16 @@ module ErbAsterisk
 
   def render_erbs(erbs)
     erbs.each do |file, value|
+      # Skip on second round all erbs without yield_here method
+      next if value[:skip]
+
       # Declare global variable with current erb file name for include_to method:
       TOPLEVEL_BINDING.local_variable_set(:current_conf_file, value[:config])
-      erbs[file][:content] = new_erb(value[:content]).result
+      log_debug("ERB: #{file}", 1)
+
+      @yield_here_occured = false
+      value[:content] = new_erb(value[:content]).result
+      value[:skip] = true unless @yield_here_occured
     end
   end
 
@@ -99,16 +117,23 @@ module ErbAsterisk
       end
 
       File.write("#{root}#{include_file}", result)
+      log_debug("export_includes: #{include_file}")
     end
   end
 
   def read_template(template)
     file_name = "#{template}.erb"
     project_template = "#{@templates_path}/#{file_name}"
-    return File.read(project_template) if File.exist?(project_template)
+    if file_exist?(project_template)
+      log_debug("read_template: #{project_template}", 2)
+      return file_read(project_template)
+    end
 
     user_template = "#{@user_templates}/#{file_name}"
-    return File.read(user_template) if File.exist?(user_template)
+    if file_exist?(user_template)
+      log_debug("read_template: #{user_template}", 2)
+      return file_read(user_template)
+    end
 
     raise "Template not found: #{template}"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb_asterisk
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Artem Baikuzin
@@ -113,7 +113,9 @@ files:
 - exe/erb_asterisk
 - lib/erb_asterisk.rb
 - lib/erb_asterisk/arg_parser.rb
+- lib/erb_asterisk/file_cache.rb
 - lib/erb_asterisk/inclusion.rb
+- lib/erb_asterisk/log.rb
 - lib/erb_asterisk/render.rb
 - lib/erb_asterisk/utils.rb
 - lib/erb_asterisk/version.rb