erb_asterisk 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124bb817f6e9799290a789694e9be27b777d6530
-  data.tar.gz: af58874559e1b969d11bdfe3e41ba6512cc04978
+  metadata.gz: 3a6778b40d23d7041aba395f23ba8f43dbebfec9
+  data.tar.gz: b36f903921fba2bec91860612bec8caae9c3bfe9
 SHA512:
-  metadata.gz: 31ec76833416111df756969553f613e36dcdd64dca87fe6b0dfe3e1ecbb95cb025b105780c6137b6d99b8274b0f9992f713193527fe950bdaf595dda62e2fe4b
-  data.tar.gz: c2c040017c0bb3977507e2f767e111056629fb3b38dc9b3f1f11e1258b0b14ef42a5a367dc15d94549d102b904b1185a65492857ebc4e30e29dc480bb5bae36c
+  metadata.gz: 7bb2a7800da7b7945397bdb3c06895ac6c7af75f5c67ab76ee17dd0c7f03af4bec8bcfbf114fa82b61fad0a9a342936140169d4cfc06bb48e3891d7a8dd1a4d4
+  data.tar.gz: 452ee0b49ba80154632295e4ec6d10ee9ed1aa00bac205907f8a643f6053fc568b32a70f45a7646446d93da0abf899f254c417acfe0c70cece3259cd3843fbf0

data/README.md

@@ -68,12 +68,12 @@ retry = 0
 
 ### ERB extensions
 
-#### Render template
+#### render: render template
 ```
 <%= render 'template_file_name_without_ext', variable_name: variable_value %>
 ```
 
-#### Define inclusion to external configuration file
+#### include_to: define inclusion to external configuration file
 ```
 <%= include_to 'pjsip_endpoints.conf.includes' %>
 ```
@@ -88,7 +88,7 @@ pjsip_endpoints.conf.includes:
 
 You can include this file to your actual pjsip_endpoints.conf.
 
-Also, you can define priority for inclusion:
+Also, you can define `priority` argument for inclusion:
 ```
 <%= include_to 'pjsip_endpoints.conf.includes' %>
 <%= include_to 'pjsip_endpoints.conf.includes', priority: 999 %>
@@ -100,7 +100,7 @@ This will render to:
 #include "entities/office/pjsip_endpoints.conf"
 ```
 
-#### Apply line to a tag
+#### apply_line_to: apply line to a tag
 
 office/extensions.conf.erb:
 ```
@@ -122,7 +122,38 @@ extensions.conf:
 include => office-inbound
 ```
 
-#### Escape special symbols in extension name
+#### content_for: apply block to a tag
+office/extensions.conf.erb:
+```
+<% content_for :global_outbound_context do %>
+<% exten = 'super_extension-' -%>
+exten => _<%= escape_exten exten %>X.,1,NoOp
+same => n,Goto(another-extension,${EXTEN:<%= exten.size %>},1)
+<% end %>
+```
+
+extensions.conf.erb:
+```
+[outbound]
+<%= yield_here :global_outbound_context %>
+```
+
+extensions.conf:
+```
+[outbound]
+; Yield for :outbound
+exten => _super_e[x]te[n]sio[n]-X.,1,NoOp
+same => n,Goto(another-extension,${EXTEN:16},1)
+```
+
+`apply_line_to` and `content_for` can has `priority` argument, just like `include_to` method:
+```
+<% content_for :global_outbound_context, priority: 999 do %>
+...
+<% apply_line_to :outbound_glob, 'include => outbound', priority: -10 %>
+```
+
+#### escape_exten: escape special symbols in extension name
 ```
 exten => _<%= escape_exten 'LongExtension1234!' %>-X.,1,NoOp
 ```
@@ -137,6 +168,9 @@ exten => _Lo[n]gE[x]te[n]sio[n]1234[!]-X.,1,NoOp
 Project available global variables can be defined inside file `erb_asterisk_project.rb`, e.g.:
 ```
 OPERATORS_SIZE = 31
+
+LAN = '192.168.1.0/255.255.255.0'
+EXTERNAL_HOST = 'no-ip.some.host.eg'
 ```
 
 ### Command line arguments

data/lib/erb_asterisk/inclusion.rb

@@ -0,0 +1,22 @@
+module ErbAsterisk
+  module Inclusion
+    # Declare current config file inclusion 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)
+      default_args!(args)
+      @exports[file_name] = [] if @exports[file_name].nil?
+
+      arr = @exports[file_name]
+
+      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}"
+        return
+      end
+
+      arr << { file: current_conf_file, priority: args[:priority] }
+      "; Included to \"#{file_name}\""
+    end
+  end
+end

data/lib/erb_asterisk/render.rb

@@ -0,0 +1,20 @@
+module ErbAsterisk
+  module Render
+    # Render template
+    def render(template, vars = {})
+      old_erb_output = @erb_output
+      @erb_output = ''
+
+      erb = new_erb(read_template(template))
+
+      b = binding
+      vars.each do |name, value|
+        b.local_variable_set(name, value)
+      end
+
+      r = erb.result(b)
+      @erb_output = old_erb_output
+      r
+    end
+  end
+end

data/lib/erb_asterisk/utils.rb

@@ -0,0 +1,14 @@
+module ErbAsterisk
+  module Utils
+    # Escape special symbols in extension name
+    #
+    # vnov -> v[n]on
+    # LongExtension1234! -> Lo[n]gE[x]te[n]sio[n]1234[!]
+    #
+    def escape_exten(exten)
+      exten.each_char.reduce('') do |s, c|
+        s << (%w(x z n . !).include?(c.downcase) ? "[#{c}]" : c)
+      end
+    end
+  end
+end

data/lib/erb_asterisk/version.rb

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

data/lib/erb_asterisk/yields.rb

@@ -0,0 +1,46 @@
+module ErbAsterisk
+  module Yields
+    # Apply line to place where yield_here :tag defined
+    def apply_line_to(tag, line, args = {})
+      default_args!(args)
+      apply_to_yields(:line, tag, line, args[:priority])
+      "; Applied \"#{line}\" to :#{tag}"
+    end
+
+    # Apply block to yield_here
+    def content_for(tag, args = {})
+      default_args!(args)
+      old_output = @erb_output
+      @erb_output = ''
+      apply_to_yields(:block, tag, yield, args[:priority])
+      @erb_output = old_output
+    end
+
+    # Define place where put apply_line_to
+    def yield_here(tag)
+      "<%= yield_actual :#{tag} %>"
+    end
+
+    def yield_actual(tag)
+      "; Yield for :#{tag}\n" << output_yield(tag)
+    end
+
+    private
+
+    def apply_to_yields(type, tag, content, priority)
+      @yields[tag] = [] if @yields[tag].nil?
+      @yields[tag] << { content: content, priority: priority, type: type }
+    end
+
+    def output_yield(tag)
+      a = @yields[tag]
+      a = a.sort_by { |i| -i[:priority] }
+      result = a.reduce('') do |s, i|
+        s << "; priority: #{i[:priority]}\n" if i[:priority] != 0
+        s << "#{i[:content]}\n"
+      end
+
+      result
+    end
+  end
+end

data/lib/erb_asterisk.rb

@@ -2,69 +2,16 @@ require 'erb'
 require 'find'
 require 'pathname'
 
-module ErbAsterisk
-  # Render template
-  def render(template, vars = {})
-    tpl = read_template(template)
-    e = new_erb(tpl)
-
-    b = binding
-    vars.each do |name, value|
-      b.local_variable_set(name, value)
-    end
-
-    e.result(b)
-  end
-
-  # Declare current config file inclusion 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)
-    unless arr.index { |i| i[:file] == current_conf_file }.nil?
-      puts "Skip #{current_conf_file} duplicate inclusion to #{file_name}"
-      return
-    end
-
-    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
+require 'erb_asterisk/render'
+require 'erb_asterisk/inclusion'
+require 'erb_asterisk/yields'
+require 'erb_asterisk/utils'
 
-    "; Applied \"#{line}\" to :#{tag}"
-  end
-
-  # Define place where put apply_line_to
-  def yield_here(tag)
-    "<%= yield_actual :#{tag} %>"
-  end
-
-  def yield_actual(tag)
-    "; Yield for :#{tag}\n" << @yields[tag]
-  end
-
-  # Escape special symbols in extension name
-  #
-  # vnov -> v[n]on
-  # LongExtension1234! -> Lo[n]gE[x]te[n]sio[n]1234[!]
-  #
-  def escape_exten(exten)
-    exten.each_char.reduce('') do |s, c|
-      s << (ERB_ASTERISK_PATTERNS.include?(c.downcase) ? "[#{c}]" : c)
-    end
-  end
+module ErbAsterisk
+  include Render
+  include Inclusion
+  include Yields
+  include Utils
 
   def execute(opts)
     init_instance(opts)
@@ -82,7 +29,6 @@ module ErbAsterisk
   ERB_PROJECT_FILE = './erb_asterisk_project.rb'.freeze
   ERB_ASTERISK_CONF = 'asterisk.conf'.freeze
   ERB_ASTERISK_DIR = 'asterisk/'.freeze
-  ERB_ASTERISK_PATTERNS = %w(x z n . !)
 
   def init_instance(opts)
     @exports = {}
@@ -168,6 +114,10 @@ module ErbAsterisk
   end
 
   def new_erb(content)
-    ERB.new(content, nil, '-')
+    ERB.new(content, nil, '-', '@erb_output')
+  end
+
+  def default_args!(args)
+    args[:priority] = 0 if args[:priority].nil?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb_asterisk
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Artem Baikuzin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -113,7 +113,11 @@ files:
 - exe/erb_asterisk
 - lib/erb_asterisk.rb
 - lib/erb_asterisk/arg_parser.rb
+- lib/erb_asterisk/inclusion.rb
+- lib/erb_asterisk/render.rb
+- lib/erb_asterisk/utils.rb
 - lib/erb_asterisk/version.rb
+- lib/erb_asterisk/yields.rb
 homepage: https://github.com/ybinzu/erb_asterisk
 licenses:
 - MIT