ltdtemplate 0.1.5 → 0.2.1

data/HISTORY.txt

@@ -1,3 +1,14 @@
+2013-07-28 Version 0.2.1
+	Added array.{each,each_rnd,each_seq} methods (executing the code
+	block supplied as the first parameter with parameters key and
+	value).
+
+	Added array/ and array% methods for parameter interpolation with
+	supporting changes to ::Code::Parameters.
+
+	Namespace and array to_native methods now dynamically return
+	an array, hash, or Sarah as required for the data.
+
 2013-07-24 Version 0.1.5
 	Added RESOURCES.txt to .yardopts. OOPS!
 

data/TEMPLATE_MANUAL.html

@@ -431,17 +431,35 @@ matrix[0, 0] /* => 1 */ matrix['type] /* => identity */</code></blockquote>
 
 <tr><td><code>class</code></td><td>Returns the string "Array"</td></tr>
 
+<tr><td><code>each(</code><i>code_block</i><code>)</code></td>
+    <td>Executes <i>code_block</i><code>.each_seq(</code><i>index</i>,
+    <i>value</i><code>)</code> for each sequential index then
+    <i>code_block</i><code>.each_rnd(</code><i>key</i>,
+    <i>value</i><code>)</code> for each random-access key
+    and returns an array of results (since 0.2.1)</td></tr>
+
+<tr><td><code>each_rnd(</code><i>code_block</i><code>)</code></td>
+    <td>Executes <i>code_block</i><code>.each_rnd(</code><i>key</i>,
+    <i>value</i><code>)</code> for each random-access key
+    and returns an array of results (since 0.2.1)</td></tr>
+
+<tr><td><code>each_seq(</code><i>code_block</i><code>)</code></td>
+    <td>Executes <i>code_block</i><code>.each_seq(</code><i>index</i>,
+    <i>value</i><code>)</code> for each sequential index
+    and returns an array of results (since 0.2.1)</td></tr>
+
 <tr><td><code>join</code></td><td>Joins sequential (positional)
     elements</td></tr>
 
 <tr><td><code>join(</code><i>separator</i><code>)</code></td><td>Join with
-    <i>separator</i> between elements</td></tr>
+    <i>separator</i> between sequential (positional) elements</td></tr>
 
 <tr><td><code>join(</code><i>two</i><code>, </code><i>first</i><code>,
     </code><i>middle</i><code>, </code><i>last</i><code>)</code></td>
-    <td>Joins two elements with <i>two</i> as the separator or more than two
-    elements with <i>first</i> as the first separator, <i>last</i> as the
-    last separator, and <i>middle</i> for all other separators</td></tr>
+    <td>Joins two sequential elements with <i>two</i> as the separator or
+    more than two sequential elements with <i>first</i> as the first
+    separator, <i>last</i> as the last separator, and <i>middle</i> for
+    all other separators</td></tr>
 
 <tr><td><code>pop</code>, <code>-&gt;</code></td><td>Pop the last sequential
     element</td></tr>
@@ -470,6 +488,14 @@ matrix[0, 0] /* => 1 */ matrix['type] /* => identity */</code></blockquote>
     <td>Adds zero or more elements in the <i>list</i> to the beginning of
     the array</td></tr>
 
+<tr><td><code>/</code></td><td>Interpolate the sequential and random-access
+    values of the array into the positional and named parameters of another
+    method call (since 0.2.1)</td></tr>
+
+<tr><td><code>%</code></td>
+    <td>Interpolate pairs of sequential values in the array as named
+    parameters of another method call (since 0.2.1)</td></tr>
+
 </table>
 
 <p><a href='#codeblock_syntax'>Code blocks</a> may be bound as methods for

data/lib/ltdtemplate/code/parameters.rb

@@ -8,6 +8,8 @@ require 'ltdtemplate/code'
 
 class LtdTemplate::Code::Parameters < LtdTemplate::Code
 
+    attr_reader :positional, :named
+
     #
     # Create a parameter list builder with code to generate positional
     # values and possibly code to generate named values.
@@ -24,17 +26,43 @@ class LtdTemplate::Code::Parameters < LtdTemplate::Code
     # and return a corresponding array t-value.
     #
     def get_value (opts = {})
-	positional = @positional.map { |val| val.get_value }
 	named = {}
+
+	# Process the positional parameters (pos1, ..., posN)
+	positional = @positional.map do |code|
+	    val = code.get_value
+	    if val.is_a? LtdTemplate::Code::Parameters
+		if val.named.is_a? Hash
+		    # Named parameters from array/
+		    val.named.each { |key, val| named[key] = val }
+		elsif val.named.is_a? Array
+		    # Named parameters from array%
+		    val.named.each_slice(2) do |key, val|
+			named[key.get_value.to_native] = val if val
+		    end
+		end
+		val.positional # Positional parameters from array/
+	    else val
+	    end
+	end.flatten
+
+	# Process the named parameters (.. key1, val1, ..., keyN, valN)
 	if @named
-	    @named.each_slice(2) do |key, val|
-		named[key.get_value.to_native] = val.get_value
+	    if @named.is_a? Hash then named.merge! @named
+	    else
+		@named.each_slice(2) do |key, val|
+		    named[key.get_value.to_native] = val.get_value if val
+		end
 	    end
 	    scalar = false
 	else
-	    scalar = positional.size == 1
+	    scalar = positional.size == 1 and !named.empty?
 	end
-	@template.factory(:array).set_value(positional, named, scalar)
+
+	array = @template.factory(:array).set_value(positional, named, scalar)
+
+	# Parameters may get called if chained, e.g. array/.type
+	opts[:method] ? array.get_value(opts) : array
     end
 
 end

data/lib/ltdtemplate/value/array.rb

@@ -45,13 +45,21 @@ class LtdTemplate::Value::Array < LtdTemplate::Code
     end
 
     def to_boolean; true; end
-    def to_native; @sarah.seq.map { |val| val.to_native }; end
+    def to_native
+	if @sarah.rnd_size == 0 then native = []
+	elsif @sarah.seq_size == 0 then native = {}
+	else native = Sarah.new
+	end
+	@sarah.each { |key, val| native[key] = val.to_native }
+	native
+    end
     def to_text; @sarah.seq.map { |val| val.to_text }.join ''; end
 
     def get_value (opts = {})
 	case opts[:method]
 	when nil, 'call' then self
 	when 'class' then @template.factory :string, 'Array'
+	when 'each', 'each_rnd', 'each_seq' then do_each opts
 	when 'join' then do_join opts
 	when 'pop', '->' then do_pop opts
 	when 'push', '+>' then do_push opts
@@ -61,6 +69,8 @@ class LtdTemplate::Value::Array < LtdTemplate::Code
 	when 'size' then @template.factory :number, @sarah.size
 	when 'type' then @template.factory :string, 'array'
 	when 'unshift', '<+' then do_unshift opts
+	when '/' then @template.factory :parameters, @sarah.seq, @sarah.rnd
+	when '%' then @template.factory :parameters, [], @sarah.seq
 	else do_method opts, 'Array'
 	end
     end
@@ -110,6 +120,35 @@ class LtdTemplate::Value::Array < LtdTemplate::Code
 	self
     end
 
+    #
+    # Loop over each key, value
+    #
+    def do_each (opts)
+	results = @template.factory :array
+	if params = opts[:parameters] and params.positional.size > 0
+	    body = params.positional[0]
+	    if opts[:method] != 'each_rnd'
+		@sarah.seq.each_index do |idx|
+		    @template.use :iterations
+		    body_params = @template.factory :parameters,
+		      [@template.factory(:number, idx), @sarah.seq[idx]]
+		    results.sarah.push body.get_value(:method => 'each_seq',
+		      :parameters => body_params)
+		end
+	    end
+	    if opts[:method] != 'each_seq'
+		@sarah.rnd.each do |key, val|
+		    @template.use :iterations
+		    body_params = @template.factory :parameters,
+		      [map_native_value(key), val]
+		    results.sarah.push body.get_value(:method => 'each_rnd',
+		      :parameters => body_params)
+		end
+	    end
+	end
+	results
+    end
+
     #
     # Combine array element values into a string
     #

data/lib/ltdtemplate/value/namespace.rb

@@ -20,6 +20,18 @@ class LtdTemplate::Value::Namespace < LtdTemplate::Value::Array
 	clear
     end
 
+    def to_native
+	if @sarah.rnd_size == 3 then native = []
+	elsif @sarah.seq_size == 0 then native = {}
+	else native = Sarah.new
+	end
+	@sarah.each do |key, value|
+	    # Exclude some permanent namespace attributes
+	    native[key] = value.to_native unless key =~ /^[_@$]$/
+	end
+	native
+    end
+
     #
     # Clear values except for permanent namespace attributes.
     #
@@ -103,7 +115,7 @@ class LtdTemplate::Value::Namespace < LtdTemplate::Value::Array
     end
 
     def do_loop (opts)
-	results = @template.factory(:array)
+	results = @template.factory :array
 	if params = opts[:parameters] and params.positional.size > 1
 	    params = params.positional
 	    while params[0].get_value(:method => 'call').to_boolean

data/ltdtemplate.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name         = "ltdtemplate"
-  s.version      = "0.1.5"
-  s.date         = "2013-07-24"
+  s.version      = "0.2.1"
+  s.date         = "2013-07-28"
   s.authors      = ["Brian Katzung"]
   s.email        = ["briank@kappacs.com"]
   s.homepage     = "http://rubygems.org/gems/ltdtemplate"

data/test/07each.rb

@@ -0,0 +1,68 @@
+require 'minitest/autorun'
+require 'ltdtemplate'
+
+class TestLtdTemplate_07 < MiniTest::Unit::TestCase
+
+    def setup
+	@tpl = LtdTemplate.new
+    end
+
+    def test_each
+	@tpl.parse <<'TPL'
+<<a=(1,2,3..'four,4,'five,5,'six,6,7,7)
+a.each({ $.*($.method,$_[0].type,$_[0],$_[1]).join(",") }).join(";")
+.>>
+TPL
+	expected = {}
+	%w(
+	each_seq,number,0,1
+	each_seq,number,1,2
+	each_seq,number,2,3
+	each_rnd,string,four,4
+	each_rnd,string,five,5
+	each_rnd,string,six,6
+	each_rnd,number,7,7
+	).each { |exp| expected[exp] = nil }
+	actual = {}
+	@tpl.render.split(?;).each { |res| actual[res] = nil }
+	assert_equal(expected, actual, "array.each")
+    end
+
+    def test_each_rnd
+	@tpl.parse <<'TPL'
+<<a=(1,2,3..'four,4,'five,5,'six,6,7,7)
+a.each_rnd({ $.*($.method,$_[0].type,$_[0],$_[1]).join(",") }).join(";")
+.>>
+TPL
+	expected = {}
+	%w(
+	each_rnd,string,four,4
+	each_rnd,string,five,5
+	each_rnd,string,six,6
+	each_rnd,number,7,7
+	).each { |exp| expected[exp] = nil }
+	actual = {}
+	@tpl.render.split(?;).each { |res| actual[res] = nil }
+	assert_equal(expected, actual, "array.each_rnd")
+    end
+
+    def test_each_seq
+	@tpl.parse <<'TPL'
+<<a=(1,2,3..'four,4,'five,5,'six,6,7,7)
+a.each_seq({ $.*($.method,$_[0].type,$_[0],$_[1]).join(",") }).join(";")
+.>>
+TPL
+	expected = {}
+	%w(
+	each_seq,number,0,1
+	each_seq,number,1,2
+	each_seq,number,2,3
+	).each { |exp| expected[exp] = nil }
+	actual = {}
+	@tpl.render.split(?;).each { |res| actual[res] = nil }
+	assert_equal(expected, actual, "array.each_seq")
+    end
+
+end
+
+# END

data/test/08interpolate.rb

@@ -0,0 +1,38 @@
+require 'minitest/autorun'
+require 'ltdtemplate'
+
+class TestLtdTemplate_08 < MiniTest::Unit::TestCase
+
+    def setup
+	@tpl = LtdTemplate.new
+    end
+
+    def test_interpolate1_slash
+	@tpl.parse '<<a=(1,2)b=(a/)b.join(",">>'
+	assert_equal '1,2', @tpl.render, "a=(1,2)b=(a/)b.join(,)"
+	@tpl.parse '<<a=(1,2) $.*(a/,a/).join(",")>>'
+	assert_equal "1,2,1,2", @tpl.render, "a=(1,2)$.*(a/,a/).join"
+	@tpl.parse '<<a=(1,2) $.*(a).join(",") " " $.*(a/).join(",")>>'
+	assert_equal "12 1,2", @tpl.render, "$.*(a).join $.*(a/).join"
+    end
+
+    def test_interpolate2_percent
+	@tpl.parse '<<a=("key","value")b=(a%)b.each_rnd({_.join(";")})>>'
+	assert_equal 'key;value', @tpl.render, 'a=(key,value) b=(a%)'
+    end
+
+    def test_interpolate3
+	@tpl.parse <<'TPL'
+<< a=(2, 3 .. 'a, 'a, 'x, 'a, 'y, 'a) b=(5, 6 .. 'b, 'b, 'x, 'b, 'y, 'b)
+c=('c, 'c, 'x, 'c, 'y, 'c) d=(1, a/, 4, b/, 7, c%, 8 .. 'd, 'd, 'y, 'd) >>
+TPL
+	@tpl.render
+	d = @tpl.namespace.get_item(?d).to_native
+	assert_equal [1, 2, 3, 4, 5, 6, 7, 8], d.seq, "d (sequential)"
+	assert_equal({ ?a => ?a, ?b => ?b, ?c => ?c, ?d => ?d,
+	  ?x => ?c, ?y => ?d }, d.rnd, "d (random-access)")
+    end
+
+end
+
+# END

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 5
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors: 
 - Brian Katzung
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-24 00:00:00 -05:00
+date: 2013-07-28 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -52,7 +52,9 @@ files:
 - test/04number.rb
 - test/05string.rb
 - test/06array.rb
+- test/07each.rb
 - test/03tpl_singletons.rb
+- test/08interpolate.rb
 - test/01instance.rb
 - test/02tpl_literal.rb
 has_rdoc: true
@@ -92,6 +94,8 @@ test_files:
 - test/04number.rb
 - test/05string.rb
 - test/06array.rb
+- test/07each.rb
 - test/03tpl_singletons.rb
+- test/08interpolate.rb
 - test/01instance.rb
 - test/02tpl_literal.rb