erb_asterisk 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b5ad39db47217328f8679052c4177f1f5c0ba51
-  data.tar.gz: b89dc017508b2d331afef84b5551cbe4dd7321e4
+  metadata.gz: 49aa96fce97ae70a2a1b9b9c753d26de3742f204
+  data.tar.gz: 334f8b7138abff5373fb23fac0a505dbbe9bdd14
 SHA512:
-  metadata.gz: 157b37e9e653f5f0652834c4353c329879ea89f207a95319ae3f76228d6ee145ddf373312e45ae1e2ab1ef26591bbd12488b33bbe62f87bf5b395483195f5468
-  data.tar.gz: 1cb3c9e95ca2d2c5e6aa4b39568a164bf03a3132032459844d59c790a100b0a0e325722269bea26a208fb4ce2fe9646e97469755ff32fb3caee8858ff5750789
+  metadata.gz: 349e46939692e862bbaa4a73d0a6a8791d71eceba20b035fb2f24f0a97eee3514def575d233f40c91fb223b6f79b4445e9abafb73e6ab65e57ef554133e27d5b
+  data.tar.gz: da0a68f914b49c0e13139099fd0da49c9475b9ddabc3f641d3b09d9c1fb44825fe4e63d8f8423c6ceaae0b6430c5c8bd4d85758e8c8351878f8e04bcb0ca3877

data/README.md

@@ -66,14 +66,14 @@ announce-holdtime = no
 retry = 0
 ```
 
-### ERB configuration
+### ERB extensions
 
-Rendering template:
+#### Render template
 ```
 <%= render 'template_file_name_without_ext', variable_name: variable_value %>
 ```
 
-Define inclusion (asterisk `#include` command) to external configuration file:
+#### Define inclusion to external configuration file
 ```
 <%= include_to 'pjsip_endpoints.conf.includes' %>
 ```
@@ -88,25 +88,42 @@ pjsip_endpoints.conf.includes:
 
 You can include this file to your actual pjsip_endpoints.conf.
 
-entities/office/pjsip_endpoints.conf.erb:
+Also, you can define priority for inclusion:
 ```
 <%= include_to 'pjsip_endpoints.conf.includes' %>
-<%= 15.times.each do |i| %>
-<%= render 'pjsip_operators', op: 100 + i %>
-<% end %>
+<%= include_to 'pjsip_endpoints.conf.includes', priority: 999 %>
+```
+This will render to:
 ```
+; priority: 999
+#include "entities/taxi/pjsip_endpoints.conf"
+#include "entities/office/pjsip_endpoints.conf"
+```
+
+#### Apply line to a tag
 
-entities/taxi/pjsip_endpoints.conf.erb:
+office/extensions.conf.erb:
 ```
-<%= include_to 'pjsip_endpoints.conf.includes' %>
-<%= 5.times.each do |i| %>
-<%= render 'pjsip_operators', op: 200 + i %>
-<% end %>
+[office-inbound]
+<%= apply_line_to :global_inbound_context, 'include => office-inbound' %>
+```
+
+extensions.conf.erb:
+```
+[inbound]
+<% yield_here :global_inbound_context %>
+```
+This will render to:
+
+extensions.conf:
+```
+[inbound]
+include => office-inbound
 ```
 
-Global variables:
+#### Global variables
 
-Project avaliable global variables can be defined inside file `erb_asterisk_project.rb`, e.g.:
+Project available global variables can be defined inside file `erb_asterisk_project.rb`, e.g.:
 ```
 OPERATORS_SIZE = 31
 ```

data/exe/erb_asterisk

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
+require 'pathname'
+$LOAD_PATH.unshift(
+  File.expand_path('../../lib', Pathname.new(__FILE__).realpath))
+
 require 'erb_asterisk'
 
 include ErbAsterisk

data/lib/erb_asterisk/version.rb

@@ -1,3 +1,3 @@
 module ErbAsterisk
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

data/lib/erb_asterisk.rb

@@ -4,8 +4,9 @@ require 'pathname'
 
 module ErbAsterisk
   # Render template
+  # TODO: render user defined templates
   def render(template, vars = {})
-    tpl = File.read("#{@templates}/#{template}.erb")
+    tpl = File.read("#{@templates_path}/#{template}.erb")
     e = ERB.new(tpl)
 
     b = TOPLEVEL_BINDING
@@ -17,27 +18,50 @@ module ErbAsterisk
   end
 
   # Declare current config file inclusion to file_name
-  def include_to(file_name)
+  # args can has :priority key (larger the number - higher the priority)
+  def include_to(file_name, args = {})
     return unless TOPLEVEL_BINDING.local_variable_defined?(:current_conf_file)
+    args = { priority: 0 }.merge(args)
     @exports[file_name] = [] if @exports[file_name].nil?
+
     arr = @exports[file_name]
 
     current_conf_file = TOPLEVEL_BINDING.local_variable_get(:current_conf_file)
-    if arr.include?(current_conf_file)
+    unless arr.index { |i| i[:file] == current_conf_file }.nil?
       puts "Skip #{current_conf_file} duplicate inclusion to #{file_name}"
       return
     end
 
-    arr << current_conf_file
+    arr << { file: current_conf_file, priority: args[:priority] }
     "; Included to \"#{file_name}\""
   end
 
+  # Apply line to place where yield_here :tag defined
+  def apply_line_to(tag, line)
+    if @yields[tag].nil?
+      @yields[tag] = line
+    else
+      @yields[tag] << "\n#{line}"
+    end
+
+    nil
+  end
+
+  # Define place where put apply_line_to
+  def yield_here(tag)
+    "<%= yield_actual :#{tag} %>"
+  end
+
+  def yield_actual(tag)
+    @yields[tag]
+  end
+
   def execute
     init_instance
     load_project_file
 
     root = asterisk_root
-    @templates = "#{root}templates".freeze
+    @templates_path = "#{root}templates".freeze
 
     render_files(root)
     export_includes(root)
@@ -51,7 +75,8 @@ module ErbAsterisk
 
   def init_instance
     @exports = {}
-    @templates = ''
+    @templates_path = ''
+    @yields = {}
   end
 
   def asterisk_root
@@ -65,28 +90,55 @@ module ErbAsterisk
   end
 
   def render_files(root)
+    erbs = load_erbs(root)
+
+    # 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.
+    render_erbs(erbs)
+    # Second round replaces yield_actual with accumulated apply_line_to.
+    render_erbs(erbs)
+
+    save_erbs(erbs)
+    export_includes(root)
+  end
+
+  def load_erbs(root)
+    erbs = {}
+
     Find.find(root) do |f|
       next if File.directory?(f)
-      next if f.start_with?(@templates)
+      next if f.start_with?(@templates_path)
       next unless f.end_with?('.erb')
 
-      output_config = f.chomp('.erb')
+      erbs[f] = { config: f.chomp('.erb'),
+                  content: File.read(f) }
+    end
 
-      TOPLEVEL_BINDING.local_variable_set(:current_conf_file,
-                                          output_config.sub(root, ''))
+    erbs
+  end
 
-      File.write(output_config, ERB.new(File.read(f)).result)
+  def render_erbs(erbs)
+    erbs.each do |file, value|
+      # 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] = ERB.new(value[:content]).result
     end
   end
 
+  def save_erbs(erbs)
+    erbs.each { |_, value| File.write(value[:config], value[:content]) }
+  end
+
   def export_includes(root)
     @exports.each do |include_file, content|
-      s = ''
-      content.each do |file|
-        s << "#include \"#{file}\"\n"
+      content = content.sort_by { |i| -i[:priority] }
+      result = content.reduce('') do |s, i|
+        s << "; priority: #{i[:priority]}\n" if i[:priority] != 0
+        s << "#include \"#{i[:file].sub(root, '')}\"\n"
       end
 
-      File.write("#{root}#{include_file}", s)
+      File.write("#{root}#{include_file}", result)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb_asterisk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Artem Baikuzin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler