html-template 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7ee8a92f5791e4ac9a898027d3815cb0f4c3619
-  data.tar.gz: f20c60078147da549da1495b13abb55f7aef81f8
+  metadata.gz: 3e35f465439469ba0e64f58a6ece96b2b5aa8358
+  data.tar.gz: 94054c9cf1dd94bee198b2e76e296542698b2c49
 SHA512:
-  metadata.gz: 49601653c67d7e9eb88813fe399e6aa738a8bb232d4048b98aaaa918335e9d22261d24f084243d545c5f6f9ae4849809ac49a30d3b210396e1ca138a47ec8455
-  data.tar.gz: cdbc81e61aabbac50bfd499d3ffa9efa3417d3652fe2610a32c66b39d597a17bc604431b78f1684031a055527f3618de78770e7f0394b84e5f3669972bb73bed
+  metadata.gz: 3ffb1e09a7d8d3ddea7bc13789ed8037813750ae8dcad89e7f0d778808ef9c1797e86545031a734efe4ac9a0b50ef1ad9b613cd15bf743d9c2276fc57e1dd4e5
+  data.tar.gz: 3c5cf4655de62ee201567fb5650b8d8219b13fc3b6be6a534a1a8db8980f96fe9080d65c14fe04246793b1c891da972a72f235d7298c3b7cc7526db0025c9288

data/README.md

@@ -9,9 +9,364 @@
 
 
 
+
+## Intro
+
+Note: The original [`HTML::Template`](https://metacpan.org/pod/HTML::Template) package was written by Sam Tregar et al
+(in Perl with a first 1.0 release in 1999!)
+and the documentation here
+is mostly a copy from the original
+with some changes / adoptions for
+the ruby version.
+
+
+
+First you make a template - this is just a normal HTML file with a few extra tags, the simplest being `<TMPL_VAR>`
+
+For example, `students.html.tmpl`:
+
+```
+<TMPL_LOOP students>
+  <p>
+  Name: <TMPL_VAR name><br>
+  GPA: <TMPL_VAR gpa>
+  </p>
+</TMPL_LOOP>
+```
+
+Now you can use it in your script:
+
+``` ruby
+require 'html/template'
+
+template = HtmlTemplate.new( filename: 'students.html.tmpl' )
+
+puts template.render( students: [ { name: 'Bluto Blutarsky', gpa: 0.0 },
+                                  { name: 'Tracey Flick',    gpa: 4.0 }
+                                ]
+                    )
+```
+
+If all is well in the universe this should output something like this:
+
+```
+<p>
+Name: Bluto Blutarsky<br>
+GPA: 0.0
+</p>
+
+<p>
+Name: Tracey Flick<br>
+GPA: 4.0
+</p>
+```
+
+
 ## Usage
 
-To be done
+
+This library attempts to make using HTML templates simple and natural.
+It extends standard HTML with a few new HTML-esque tags - `<TMPL_VAR>` `<TMPL_LOOP>`, `<TMPL_IF>`, `<TMPL_ELSE>` and `<TMPL_UNLESS>`. The file written with HTML and these new tags is called a template. It is usually saved separate from your script - possibly even created by someone else! Using this module you fill in the values for the variables, loops and branches declared in the template. This allows you to separate design - the HTML - from the data, which you generate in the ~~Perl~~ Ruby script.
+
+### The Tags
+
+`TMPL_VAR` • `TMPL_LOOP` • `TMPL_IF` • `TMPL_ELSE` • `TMPL_UNLESS`
+
+
+####  `TMPL_VAR`
+
+    <TMPL_VAR name>
+
+The `<TMPL_VAR>` tag is very simple.
+When the template is output - for each `<TMPL_VAR>` tag you
+use in the template the `<TMPL_VAR>` is replaced with the value text you specified.
+If you don't set a value it just gets skipped in the output.
+
+**Attributes**
+
+The following "attributes" can also be specified in template var tags:
+
+`ESCAPE`
+
+This allows you to escape the value before it's put into the output.
+
+This is useful when you want to use a `TMPL_VAR` in a context where those characters would cause trouble. For example:
+
+    <input name=param type=text value="<TMPL_VAR name>">
+
+If you use a value like `sam"my` you'll get in trouble with HTML's
+idea of a double-quote. On the other hand,
+if you use `ESCAPE=HTML`, like this:
+
+    <input name=param type=text value="<TMPL_VAR name ESCAPE=HTML>">
+
+You'll get what you wanted no matter what value happens
+to be passed in.
+
+The following escape values are supported:
+
+`HTML`
+
+Replaces the following characters with their
+HTML entity equivalent: `&`, `"`, `'`, `<`, `>`
+
+`NONE`
+
+Performs no escaping. This is the default.
+
+
+
+
+#### `TMPL_LOOP`
+
+    <TMPL_LOOP name> ... </TMPL_LOOP>
+
+The `<TMPL_LOOP>` tag is a bit more complicated than `<TMPL_VAR>`. The `<TMPL_LOOP>` tag allows you to delimit a section of text and give it a name. Inside this named loop you place `<TMPL_VAR>`s. Now you pass in a list (an array) of values for this loop. The loop iterates over the list and produces output from the text block for each pass. Here's an example:
+
+In the template:
+
+    <TMPL_LOOP employees>
+      <p>
+      Name: <TMPL_VAR name><br>
+      Job:  <TMPL_VAR job>  
+      </p>
+    </TMPL_LOOP>
+
+In your Ruby code:
+
+``` ruby
+puts template.result( employees: [ { name: 'Sam',   job: 'programmer' },
+                                   { name: 'Steve', job: 'soda jerk' }
+                                 ]
+                    )
+```
+
+The output is:
+
+```
+<p>
+Name: Sam<br>
+Job: programmer
+</p>
+
+<p>
+Name: Steve<br>
+Job: soda jerk
+</p>
+```
+
+As you can see above the `<TMPL_LOOP>` takes a list of values
+and then iterates over the loop body producing output.
+
+
+**Loop Context Variables**
+
+Inside a loop extra variables that depend on the loop's context
+are made available. These are:
+
+`__FIRST__`
+
+Value that is true for the first iteration of the loop
+and false every other time.
+
+`__LAST__`
+
+Value that is true for the last iteration of the loop and false every other time.
+
+`__INNER__`
+
+Value that is true for the every iteration of the loop except for the first and last.
+
+`__OUTER__`
+
+Value that is true for the first and last iterations of the loop.
+
+`__ODD__`
+
+Value that is true for the every odd iteration of the loop.
+
+`__EVEN__`
+
+Value that is true for the every even iteration of the loop.
+
+`__COUNTER__`
+
+An integer (starting from 1) whose value increments for each iteration of the loop.
+
+`__INDEX__`
+
+An integer (starting from 0) whose value increments
+for each iteration of the loop.
+
+
+Just like any other `TMPL_VAR`s these variables can be used in `<TMPL_IF>`, `<TMPL_UNLESS>` and `<TMPL_ELSE>` to control how a loop is output.
+
+Example:
+
+```
+<TMPL_LOOP foos>
+  <TMPL_IF __FIRST__>
+    This only outputs on the first pass.
+  </TMPL_IF>
+
+  <TMPL_IF __ODD__>
+    This outputs every other pass, on the odd passes.
+  </TMPL_IF>
+
+  <TMPL_UNLESS __ODD__>
+    This outputs every other pass, on the even passes.
+  </TMPL_UNLESS>
+
+  <TMPL_IF __INNER__>
+    This outputs on passes that are neither first nor last.
+  </TMPL_IF>
+
+  This is pass number <TMPL_VAR __COUNTER__>.
+
+  <TMPL_IF __LAST__>
+    This only outputs on the last pass.
+  </TMPL_IF>
+</TMPL_LOOP>
+```
+
+One use of this feature is to provide a "separator" similar in effect to the ruby method `join()`. Example:
+
+```
+<TMPL_LOOP fruits>
+  <TMPL_IF __LAST__> and </TMPL_IF>
+  <TMPL_VAR name><TMPL_UNLESS __LAST__>, <TMPL_ELSE>.</TMPL_UNLESS>
+</TMPL_LOOP>
+```
+
+Would output something like:
+
+    Apples, Oranges, Brains, Toes, and Kiwi.
+
+
+NOTE: A loop with only a single pass will get both `__FIRST__` and `__LAST__`
+set to true, but not `__INNER__`.
+
+
+
+#### `TMPL_IF`
+
+    <TMPL_IF name> ... </TMPL_IF>
+
+The `<TMPL_IF>` tag allows you to include or not include a block of the template based on the value of a given name. If the name is given a value that is true for Ruby - like `true`   - then the block is included in the output. If it is not defined, or given a false value - like `false` or `nil` - then it is skipped. The names are specified the same way as with `<TMPL_VAR>`.
+
+Example Template:
+
+    <TMPL_IF bool>
+      Some text that is ouptut only if bool is true!
+    </TMPL_IF>
+
+Now if you call `template.result( bool: true )` then the above block will be included by output.
+
+`<TMPL_IF> </TMPL_IF>` blocks can include any valid HTML template construct - `VAR`s and `LOOP`s and other `IF/ELSE` blocks.
+
+
+
+####  `TMPL_ELSE`
+
+    <TMPL_IF name> ... <TMPL_ELSE> ... </TMPL_IF>
+
+You can include an alternate block in your `<TMPL_IF>` block by using `<TMPL_ELSE>`. NOTE: You still end the block with `</TMPL_IF>`, not `</TMPL_ELSE>`!
+
+Example:
+
+    <TMPL_IF bool>
+      Some text that is output only if bool is true.
+    <TMPL_ELSE>
+      Some text that is output only if bool is false.
+    </TMPL_IF>
+
+
+#### `TMPL_UNLESS`
+
+    <TMPL_UNLESS name> ... </TMPL_UNLESS>
+
+This tag is the opposite of `<TMPL_IF>`. The block is output if the name is set false or not defined. You can use `<TMPL_ELSE>` with `<TMPL_UNLESS>` just as you can with `<TMPL_IF>`.
+
+Example:
+
+    <TMPL_UNLESS bool>
+      Some text that is output only if bool is false.
+    <TMPL_ELSE>
+      Some text that is output only if bool is true.
+    </TMPL_UNLESS>
+
+
+
+
+
+## Back to the Future - Convert HTML Templates to Embedded Ruby (ERB)
+
+The HTML library always converts classic
+HTML Template to Embedded Ruby (ERB) style.
+Use the `text` attribute to get the converted template source.
+
+Example:
+
+``` ruby
+puts HtmlTemplate.new( <<TXT ).text
+<opml version="1.1">
+  <head>
+    <title><TMPL_VAR name ESCAPE="HTML"></title>
+    <dateModified><TMPL_VAR date_822></dateModified>
+    <ownerName><TMPL_VAR owner_name></ownerName>
+    <ownerEmail><TMPL_VAR owner_email></ownerEmail>
+  </head>
+
+  <body>
+    <TMPL_LOOP Channels>
+    <outline type="rss"
+             text="<TMPL_VAR name ESCAPE="HTML">"
+             xmlUrl="<TMPL_VAR url ESCAPE="HTML">"
+             <TMPL_IF channel_link> htmlUrl="<TMPL_VAR channel_link ESCAPE="HTML">"</TMPL_IF> />
+    </TMPL_LOOP>
+  </body>
+</opml>
+TXT
+```
+
+will print if debugging is turned on:
+
+```
+line 4 - match <TMPL_VAR name ESCAPE="HTML"> replacing with: <%=h name %>
+line 5 - match <TMPL_VAR date_822> replacing with: <%= date_822 %>
+line 6 - match <TMPL_VAR owner_name> replacing with: <%= owner_name %>
+line 7 - match <TMPL_VAR owner_email> replacing with: <%= owner_email %>
+line 11 - match <TMPL_LOOP Channels> replacing with: <% Channels.each_with_loop do |channel, channel_loop| %>
+line 13 - match <TMPL_VAR name ESCAPE="HTML"> replacing with: <%=h channel.name %>
+line 14 - match <TMPL_VAR url ESCAPE="HTML"> replacing with: <%=h channel.url %>
+line 15 - match <TMPL_IF channel_link> replacing with: <% if channel.channel_link %>
+line 15 - match <TMPL_VAR channel_link ESCAPE="HTML"> replacing with: <%=h channel.channel_link %>
+line 15 - match </TMPL_IF> replacing with: <% end %>
+line 16 - match </TMPL_LOOP> replacing with: <% end %>
+```
+
+and result in:
+
+``` erb
+<opml version="1.1">
+  <head>
+    <title><%=h name %></title>
+    <dateModified><%= date_822 %></dateModified>
+    <ownerName><%= owner_name %></ownerName>
+  </head>
+
+  <body>
+    <% Channels.each_with_loop do |channel, channel_loop| %>
+    <outline type="rss"
+             text="<%=h channel.name %>"
+             xmlUrl="<%=h channel.url %>"
+             <% if channel.channel_link %> htmlUrl="<%=h channel.channel_link %>"<% end %> />
+    <% end %>
+  </body>
+</opml>
+```
+
+
 
 ## License
 

data/lib/html/template/version.rb

@@ -3,8 +3,8 @@
 
 class HtmlTemplate
     MAJOR = 0
-    MINOR = 0
-    PATCH = 1
+    MINOR = 1
+    PATCH = 0
     VERSION = [MAJOR,MINOR,PATCH].join('.')
   
     def self.version

data/lib/html/template.rb

@@ -7,6 +7,27 @@ require 'ostruct'
 require 'fileutils'
 
 
+
+module Enumerable
+   class LoopMeta
+     def initialize( total )
+       @total = total
+       @index = 0
+     end
+     def index=(value) @index=value; end
+   end
+ 
+   def each_with_loop( &blk )
+     loop_meta = LoopMeta.new( size )
+     each_with_index do |item, index|
+        loop_meta.index = index
+        blk.call( item, loop_meta )
+     end 
+   end
+end
+
+
+
 # our own code
 require 'html/template/version'    # note: let version always get first
 
@@ -15,29 +36,54 @@ require 'html/template/version'    # note: let version always get first
 class HtmlTemplate
 
   attr_reader :text   ## returns converted template text (with "breaking" comments!!!)
-
-  def initialize( text )
-    @text     = convert( text )    ## note: keep a copy of the converted template text
-    @template = ERB.new( strip_comments( @text ) )
+  attr_reader :template  ## return "inner" (erb) template object 
+  attr_reader :errors
+
+  def initialize( text=nil, filename: nil )
+    if text.nil?   ## try to read file (by filename)
+      text = File.open( filename, 'r:utf-8' ) { |f| f.read }
+    end
+
+    ## todo/fix: add filename to ERB too (for better error reporting)
+    @text, @errors = convert( text )    ## note: keep a copy of the converted template text
+    
+    if @errors.size > 0
+      puts "!! ERROR - #{@errors.size} conversion / syntax error(s):"
+      pp @errors
+      raise   ## todo - find a good Error - StandardError - why? why not?
+    end
+
+    @template      = ERB.new( @text, nil, '%<>' )
   end
 
 
   VAR_RE = %r{<TMPL_(?<tag>VAR)
                  \s
-                 (?<ident>[a-zA-Z_0-9]+)
+                 (?<ident>[a-zA-Z_][a-zA-Z0-9_]*)
+                 (\s
+                   (?<escape>ESCAPE)
+                      =
+                    "(?<format>HTML|NONE)"
+                 )?
                >}x
 
-  IF_OPEN_RE = %r{(?<open><)TMPL_(?<tag>IF)
+  IF_OPEN_RE = %r{(?<open><)TMPL_(?<tag>IF|UNLESS)
                   \s
-                  (?<ident>[a-zA-Z_0-9]+)
+                  (?<ident>[a-zA-Z_][a-zA-Z0-9_]*)
                 >}x
 
-  IF_CLOSE_RE = %r{(?<close></)TMPL_(?<tag>IF)
+  IF_CLOSE_RE = %r{(?<close></)TMPL_(?<tag>IF|UNLESS)
+                    (\s
+                      (?<ident>[a-zA-Z_][a-zA-Z0-9_]*)
+                    )?     # note: allow optional identifier 
                   >}x
+ 
+  ELSE_RE = %r{<TMPL_(?<tag>ELSE)
+                 >}x
 
   LOOP_OPEN_RE = %r{(?<open><)TMPL_(?<tag>LOOP)
                       \s
-                      (?<ident>[a-zA-Z_0-9]+)
+                      (?<ident>[a-zA-Z_][a-zA-Z0-9_]*)
                     >}x
 
   LOOP_CLOSE_RE = %r{(?<close></)TMPL_(?<tag>LOOP)
@@ -45,27 +91,43 @@ class HtmlTemplate
 
   CATCH_OPEN_RE = %r{(?<open><)TMPL_(?<unknown>[^>]+?)
                       >}x
+  
+  CATCH_CLOSE_RE = %r{(?<close></)TMPL_(?<unknown>[^>]+?)
+                      >}x
 
 
   ALL_RE = Regexp.union( VAR_RE,
                          IF_OPEN_RE,
                          IF_CLOSE_RE,
+                         ELSE_RE,
                          LOOP_OPEN_RE,
                          LOOP_CLOSE_RE,
-                         CATCH_OPEN_RE )
-
-
-  def strip_comments( text )
-     ## strip/remove comments lines starting with #
-     buf = String.new('') ## note: '' required for getting source encoding AND not ASCII-8BIT!!!
-     text.each_line do |line|
-        next if line.lstrip.start_with?( '#' )
-        buf << line
-     end
-     buf
+                         CATCH_OPEN_RE,
+                         CATCH_CLOSE_RE )
+
+
+  def to_recursive_ostruct( o )  
+    if o.is_a?( Array )
+      o.reduce( [] ) do |ary, item|
+                       ary << to_recursive_ostruct( item )
+                       ary
+                     end
+    elsif o.is_a?( Hash )
+      ## puts 'to_recursive_ostruct (hash):'
+      OpenStruct.new( o.reduce( {} ) do |hash, (key, val)|
+                                       ## puts "#{key} => #{val}:#{val.class.name}"
+                                       hash[key] = to_recursive_ostruct( val )
+                                       hash
+                                     end )
+    else  ## assume regular "primitive" value - pass along as is
+      o
+    end
   end
 
+
   def convert( text )
+    errors = []   # note: reset global errros list
+
     stack = []
 
     ## note: convert line-by-line
@@ -76,7 +138,7 @@ class HtmlTemplate
       lineno += 1
 
       if line.lstrip.start_with?( '#' )    ## or make it tripple ### - why? why not?
-         buf << line    ## pass along as is for now!!
+         buf << "%#{line.lstrip}"   
       elsif line.strip.empty?
          buf << line
       else
@@ -90,6 +152,9 @@ class HtmlTemplate
                   ident       = m[:ident]
                   unknown     = m[:unknown]  # catch all for unknown / unmatched tags
 
+                  escape      = m[:escape]
+                  format      = m[:format]
+
                   ## todo/fix: rename ctx to scope or __ - why? why not?
                   ## note: peek; get top stack item
                   ##   if top level (stack empty)  => nothing
@@ -97,24 +162,40 @@ class HtmlTemplate
                   ctx = stack.empty? ? '' : "#{stack[-1]}."
 
                   code = if tag == 'VAR'
-                           "<%= #{ctx}#{ident} %>"
+                           if escape && format == 'HTML'
+                               ## check or use long form e.g. CGI.escapeHTML - why? why not?
+                              "<%=h #{ctx}#{ident} %>"
+                           else
+                              "<%= #{ctx}#{ident} %>"
+                           end
                          elsif tag == 'LOOP' && tag_open
                            ## assume plural ident e.g. channels
                            ##  cut-off last char, that is, the plural s channels => channel
                            ##  note:  ALWAYS downcase (auto-generated) loop iterator/pass name
                            it = ident[0..-2].downcase
                            stack.push( it )
-                           "<% #{ctx}#{ident}.each do |#{it}| %>"
+                           "<% #{ctx}#{ident}.each_with_loop do |#{it}, #{it}_loop| %>"
                          elsif tag == 'LOOP' && tag_close
                            stack.pop
                            "<% end %>"
                          elsif tag == 'IF' && tag_open
                            "<% if #{ctx}#{ident} %>"
-                         elsif tag == 'IF' && tag_close
+                          elsif tag == 'UNLESS' && tag_open
+                            "<% unless #{ctx}#{ident} %>"
+                          elsif (tag == 'IF' || tag == 'UNLESS') && tag_close
                            "<% end %>"
-                         elsif unknown && tag_open
-                          puts "!! ERROR"
-                           "<%# !!error - unknown open tag: #{unknown} %>"
+                         elsif tag == 'ELSE'
+                           "<% else %>"
+                         elsif unknown
+                            errors <<   if tag_open
+                                          "line #{lineno} - unknown open tag: #{unknown}"
+                                        else ## assume tag_close
+                                          "line #{lineno} - unknown close tag: #{unknown}"
+                                        end
+
+                            puts "!! ERROR in line #{lineno} - #{errors[-1]}:"
+                            puts line
+                            "<%# !!error - #{errors[-1]} %>"
                          else
                            raise ArgumentError  ## unknown tag #{tag}
                          end
@@ -125,7 +206,7 @@ class HtmlTemplate
                 end
         end
       end # each_line
-    buf
+    [buf, errors]
   end # method convert
 
 
@@ -142,6 +223,17 @@ class HtmlTemplate
     ## todo: use locals / assigns or something instead of **kwargs - why? why not?
     ##        allow/support (extra) locals / assigns - why? why not?
       ## note: Ruby >= 2.5 has ERB#result_with_hash - use later - why? why not?
+
+    kwargs = kwargs.reduce( {} ) do |hash, (key, val)|
+                                   ## puts "#{key} => #{val}:#{val.class.name}"
+                                   hash[key] = to_recursive_ostruct( val )
+                                   hash
+                                 end
+  
+    ## (auto-)convert array and hash values to ostruct
+    ##   for easy dot (.) access 
+    ##      e.g. student.name instead of student[:name]
+
     @template.result( Context.new( **kwargs ).get_binding )
   end
 end

data/test/templates/opml.xml.erb

@@ -1,17 +1,19 @@
+%### Planet OPML template.
+%###
 <?xml version="1.0"?>
 <opml version="1.1">
   <head>
-    <title><%= name %></title>
+    <title><%=h name %></title>
     <dateModified><%= date_822 %></dateModified>
     <ownerName><%= owner_name %></ownerName>
   </head>
 
   <body>
-    <% channels.each do |channel| %>
+    <% channels.each_with_loop do |channel, channel_loop| %>
     <outline type="rss"
-             text="<%= channel.name %>"
-             xmlUrl="<%= channel.url %>"
-             <% if channel.channel_link %> htmlUrl="<%= channel.channel_link %>"<% end %> />
+             text="<%=h channel.name %>"
+             xmlUrl="<%=h channel.url %>"
+             <% if channel.channel_link %> htmlUrl="<%=h channel.channel_link %>"<% end %> />
     <% end %>
   </body>
 </opml>

data/test/templates/opml.xml.tmpl

@@ -1,7 +1,9 @@
+### Planet OPML template.
+###
 <?xml version="1.0"?>
 <opml version="1.1">
   <head>
-    <title><TMPL_VAR name></title>
+    <title><TMPL_VAR name ESCAPE="HTML"></title>
     <dateModified><TMPL_VAR date_822></dateModified>
     <ownerName><TMPL_VAR owner_name></ownerName>
   </head>
@@ -9,9 +11,9 @@
   <body>
     <TMPL_LOOP channels>
     <outline type="rss"
-             text="<TMPL_VAR name>"
-             xmlUrl="<TMPL_VAR url>"
-             <TMPL_IF channel_link> htmlUrl="<TMPL_VAR channel_link>"</TMPL_IF> />
+             text="<TMPL_VAR name ESCAPE="HTML">"
+             xmlUrl="<TMPL_VAR url ESCAPE="HTML">"
+             <TMPL_IF channel_link> htmlUrl="<TMPL_VAR channel_link ESCAPE="HTML">"</TMPL_IF> />
     </TMPL_LOOP>
   </body>
 </opml>

data/test/templates/planet/atom.xml.tmpl

@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <feed xmlns="http://www.w3.org/2005/Atom">
 
-	<title><TMPL_VAR name></title>
-	<link rel="self" href="<TMPL_VAR feed ESCAPE="HTML">"/>
-	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
-	<id><TMPL_VAR feed ESCAPE="HTML"></id>
-	<updated><TMPL_VAR date_iso></updated>
-	<generator uri="http://www.planetplanet.org/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+  <title><TMPL_VAR name></title>
+  <link rel="self" href="<TMPL_VAR feed ESCAPE="HTML">"/>
+  <link href="<TMPL_VAR link ESCAPE="HTML">"/>
+  <id><TMPL_VAR feed ESCAPE="HTML"></id>
+  <updated><TMPL_VAR date_iso></updated>
+  <generator uri="http://www.planetplanet.org/"><TMPL_VAR generator ESCAPE="HTML"></generator>
 
 <TMPL_LOOP Items>
-	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
-		<title type="html"<TMPL_IF title_language> xml:lang="<TMPL_VAR title_language>"</TMPL_IF>><TMPL_VAR title ESCAPE="HTML"></title>
-		<link href="<TMPL_VAR link ESCAPE="HTML">"/>
-		<id><TMPL_VAR id ESCAPE="HTML"></id>
-		<updated><TMPL_VAR date_iso></updated>
-		<content type="html"<TMPL_IF content_language> xml:lang="<TMPL_VAR content_language>"</TMPL_IF>><TMPL_VAR content ESCAPE="HTML"></content>
-		<author>
+  <entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
+    <title type="html"<TMPL_IF title_language> xml:lang="<TMPL_VAR title_language>"</TMPL_IF>><TMPL_VAR title ESCAPE="HTML"></title>
+    <link href="<TMPL_VAR link ESCAPE="HTML">"/>
+    <id><TMPL_VAR id ESCAPE="HTML"></id>
+    <updated><TMPL_VAR date_iso></updated>
+    <content type="html"<TMPL_IF content_language> xml:lang="<TMPL_VAR content_language>"</TMPL_IF>><TMPL_VAR content ESCAPE="HTML"></content>
+    <author>
 <TMPL_IF author_name>
-			<name><TMPL_VAR author_name ESCAPE="HTML"></name>
+      <name><TMPL_VAR author_name ESCAPE="HTML"></name>
 <TMPL_IF author_email>
-			<email><TMPL_VAR author_email ESCAPE="HTML"></email>
+      <email><TMPL_VAR author_email ESCAPE="HTML"></email>
 </TMPL_IF author_email>
 <TMPL_ELSE>
 <TMPL_IF channel_author_name>
-			<name><TMPL_VAR channel_author_name ESCAPE="HTML"></name>
+      <name><TMPL_VAR channel_author_name ESCAPE="HTML"></name>
 <TMPL_IF channel_author_email>
-			<email><TMPL_VAR channel_author_email ESCAPE="HTML"></email>
+      <email><TMPL_VAR channel_author_email ESCAPE="HTML"></email>
 </TMPL_IF channel_author_email>
 <TMPL_ELSE>
-			<name><TMPL_VAR channel_name ESCAPE="HTML"></name>
+      <name><TMPL_VAR channel_name ESCAPE="HTML"></name>
 </TMPL_IF>
 </TMPL_IF>
-			<uri><TMPL_VAR channel_link ESCAPE="HTML"></uri>
-		</author>
-		<source>
+      <uri><TMPL_VAR channel_link ESCAPE="HTML"></uri>
+    </author>
+    <source>
 <TMPL_IF channel_title>
-			<title type="html"><TMPL_VAR channel_title ESCAPE="HTML"></title>
+      <title type="html"><TMPL_VAR channel_title ESCAPE="HTML"></title>
 <TMPL_ELSE>
-			<title type="html"><TMPL_VAR channel_name ESCAPE="HTML"></title>
+      <title type="html"><TMPL_VAR channel_name ESCAPE="HTML"></title>
 </TMPL_IF>
 <TMPL_IF channel_subtitle>
-			<subtitle type="html"><TMPL_VAR channel_subtitle ESCAPE="HTML"></subtitle>
+      <subtitle type="html"><TMPL_VAR channel_subtitle ESCAPE="HTML"></subtitle>
 </TMPL_IF>
-			<link rel="self" href="<TMPL_VAR channel_url ESCAPE="HTML">"/>
+      <link rel="self" href="<TMPL_VAR channel_url ESCAPE="HTML">"/>
 <TMPL_IF channel_id>
-			<id><TMPL_VAR channel_id ESCAPE="HTML"></id>
+      <id><TMPL_VAR channel_id ESCAPE="HTML"></id>
 <TMPL_ELSE>
-			<id><TMPL_VAR channel_url ESCAPE="HTML"></id>
+      <id><TMPL_VAR channel_url ESCAPE="HTML"></id>
 </TMPL_IF>
 <TMPL_IF channel_updated_iso>
-			<updated><TMPL_VAR channel_updated_iso></updated>
+      <updated><TMPL_VAR channel_updated_iso></updated>
 </TMPL_IF>
 <TMPL_IF channel_rights>
-			<rights type="html"><TMPL_VAR channel_rights ESCAPE="HTML"></rights>
+      <rights type="html"><TMPL_VAR channel_rights ESCAPE="HTML"></rights>
 </TMPL_IF>
-		</source>
-	</entry>
+    </source>
+  </entry>
 
 </TMPL_LOOP>
 </feed>

data/test/templates/planet/foafroll.xml.tmpl

@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <rdf:RDF
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-	xmlns:foaf="http://xmlns.com/foaf/0.1/"
-	xmlns:rss="http://purl.org/rss/1.0/"
-	xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+  xmlns:foaf="http://xmlns.com/foaf/0.1/"
+  xmlns:rss="http://purl.org/rss/1.0/"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
 >
 <foaf:Group>
-	<foaf:name><TMPL_VAR name ESCAPE="HTML"></foaf:name>
-	<foaf:homepage><TMPL_VAR link ESCAPE="HTML"></foaf:homepage>
-	<rdfs:seeAlso rdf:resource="<TMPL_VAR url ESCAPE="HTML">" />
+  <foaf:name><TMPL_VAR name ESCAPE="HTML"></foaf:name>
+  <foaf:homepage><TMPL_VAR link ESCAPE="HTML"></foaf:homepage>
+  <rdfs:seeAlso rdf:resource="<TMPL_VAR url ESCAPE="HTML">" />
 
 <TMPL_LOOP Channels>
-	<foaf:member>
-		<foaf:Agent>
-			<foaf:name><TMPL_VAR name ESCAPE="HTML"></foaf:name>
-			<foaf:weblog>
-				<foaf:Document rdf:about="<TMPL_VAR link ESCAPE="HTML">">
-					<dc:title><TMPL_VAR title_plain ESCAPE="HTML"></dc:title>
-					<rdfs:seeAlso>
-						<rss:channel rdf:about="<TMPL_VAR url ESCAPE="HTML">" />
-					</rdfs:seeAlso>
-				</foaf:Document>
-			</foaf:weblog>
-		</foaf:Agent>
-	</foaf:member>
+  <foaf:member>
+    <foaf:Agent>
+      <foaf:name><TMPL_VAR name ESCAPE="HTML"></foaf:name>
+      <foaf:weblog>
+        <foaf:Document rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+          <dc:title><TMPL_VAR title_plain ESCAPE="HTML"></dc:title>
+          <rdfs:seeAlso>
+            <rss:channel rdf:about="<TMPL_VAR url ESCAPE="HTML">" />
+          </rdfs:seeAlso>
+        </foaf:Document>
+      </foaf:weblog>
+    </foaf:Agent>
+  </foaf:member>
 </TMPL_LOOP>
 
 </foaf:Group>

data/test/templates/planet/opml.xml.tmpl

@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <opml version="1.1">
-	<head>
-		<title><TMPL_VAR name ESCAPE="HTML"></title>
-		<dateModified><TMPL_VAR date_822></dateModified>
-		<ownerName><TMPL_VAR owner_name></ownerName>
-		<ownerEmail><TMPL_VAR owner_email></ownerEmail>
-	</head>
-	
-	<body>
-		<TMPL_LOOP Channels>
-		<outline type="rss" text="<TMPL_VAR name ESCAPE="HTML">" xmlUrl="<TMPL_VAR url ESCAPE="HTML">" title="<TMPL_IF title><TMPL_VAR title ESCAPE="HTML"></TMPL_IF><TMPL_UNLESS title><TMPL_VAR name ESCAPE="HTML"></TMPL_UNLESS>"<TMPL_IF channel_link> htmlUrl="<TMPL_VAR channel_link ESCAPE="HTML">"</TMPL_IF> />
-		</TMPL_LOOP>
-	</body>
+  <head>
+    <title><TMPL_VAR name ESCAPE="HTML"></title>
+    <dateModified><TMPL_VAR date_822></dateModified>
+    <ownerName><TMPL_VAR owner_name></ownerName>
+    <ownerEmail><TMPL_VAR owner_email></ownerEmail>
+  </head>
+
+  <body>
+    <TMPL_LOOP Channels>
+    <outline type="rss" text="<TMPL_VAR name ESCAPE="HTML">" xmlUrl="<TMPL_VAR url ESCAPE="HTML">" title="<TMPL_IF title><TMPL_VAR title ESCAPE="HTML"></TMPL_IF><TMPL_UNLESS title><TMPL_VAR name ESCAPE="HTML"></TMPL_UNLESS>"<TMPL_IF channel_link> htmlUrl="<TMPL_VAR channel_link ESCAPE="HTML">"</TMPL_IF> />
+    </TMPL_LOOP>
+  </body>
 </opml>

data/test/templates/planet/rss10.xml.tmpl

@@ -1,36 +1,36 @@
 <?xml version="1.0"?>
 <rdf:RDF
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:foaf="http://xmlns.com/foaf/0.1/"
-	xmlns:content="http://purl.org/rss/1.0/modules/content/"
-	xmlns="http://purl.org/rss/1.0/"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:foaf="http://xmlns.com/foaf/0.1/"
+  xmlns:content="http://purl.org/rss/1.0/modules/content/"
+  xmlns="http://purl.org/rss/1.0/"
 >
 <channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
-	<title><TMPL_VAR name ESCAPE="HTML"></title>
-	<link><TMPL_VAR link ESCAPE="HTML"></link>
-	<description><TMPL_VAR name ESCAPE="HTML"> - <TMPL_VAR link ESCAPE="HTML"></description>
+  <title><TMPL_VAR name ESCAPE="HTML"></title>
+  <link><TMPL_VAR link ESCAPE="HTML"></link>
+  <description><TMPL_VAR name ESCAPE="HTML"> - <TMPL_VAR link ESCAPE="HTML"></description>
 
-	<items>
-		<rdf:Seq>
+  <items>
+    <rdf:Seq>
 <TMPL_LOOP Items>
-			<rdf:li rdf:resource="<TMPL_VAR id ESCAPE="HTML">" />
+      <rdf:li rdf:resource="<TMPL_VAR id ESCAPE="HTML">" />
 </TMPL_LOOP>
-		</rdf:Seq>
-	</items>
+    </rdf:Seq>
+  </items>
 </channel>
 
 <TMPL_LOOP Items>
 <item rdf:about="<TMPL_VAR id ESCAPE="HTML">">
-	<title><TMPL_VAR channel_name ESCAPE="HTML"><TMPL_IF title>: <TMPL_VAR title_plain ESCAPE="HTML"></TMPL_IF></title>
-	<link><TMPL_VAR link ESCAPE="HTML"></link>
-	<TMPL_IF content>
-	<content:encoded><TMPL_VAR content ESCAPE="HTML"></content:encoded>
-	</TMPL_IF>
-	<dc:date><TMPL_VAR date_iso></dc:date>
-	<TMPL_IF author_name>
-	<dc:creator><TMPL_VAR author_name></dc:creator>
-	</TMPL_IF>
+  <title><TMPL_VAR channel_name ESCAPE="HTML"><TMPL_IF title>: <TMPL_VAR title_plain ESCAPE="HTML"></TMPL_IF></title>
+  <link><TMPL_VAR link ESCAPE="HTML"></link>
+  <TMPL_IF content>
+  <content:encoded><TMPL_VAR content ESCAPE="HTML"></content:encoded>
+  </TMPL_IF>
+  <dc:date><TMPL_VAR date_iso></dc:date>
+  <TMPL_IF author_name>
+  <dc:creator><TMPL_VAR author_name></dc:creator>
+  </TMPL_IF>
 </item>
 </TMPL_LOOP>
 

data/test/templates/planet/rss20.xml.tmpl

@@ -2,27 +2,27 @@
 <rss version="2.0">
 
 <channel>
-	<title><TMPL_VAR name></title>
-	<link><TMPL_VAR link ESCAPE="HTML"></link>
-	<language>en</language>
-	<description><TMPL_VAR name ESCAPE="HTML"> - <TMPL_VAR link ESCAPE="HTML"></description>
+  <title><TMPL_VAR name></title>
+  <link><TMPL_VAR link ESCAPE="HTML"></link>
+  <language>en</language>
+  <description><TMPL_VAR name ESCAPE="HTML"> - <TMPL_VAR link ESCAPE="HTML"></description>
 
 <TMPL_LOOP Items>
 <item>
-	<title><TMPL_VAR channel_name ESCAPE="HTML"><TMPL_IF title>: <TMPL_VAR title_plain ESCAPE="HTML"></TMPL_IF></title>
-	<guid><TMPL_VAR id ESCAPE="HTML"></guid>
-	<link><TMPL_VAR link ESCAPE="HTML"></link>
-	<TMPL_IF content>
-	<description><TMPL_VAR content ESCAPE="HTML"></description>
-	</TMPL_IF>
-	<pubDate><TMPL_VAR date_822></pubDate>
-	<TMPL_IF author_email>
-	<TMPL_IF author_name>
-	<author><TMPL_VAR author_email> (<TMPL_VAR author_name>)</author>
-	<TMPL_ELSE>
-	<author><TMPL_VAR author_email></author>
-	</TMPL_IF>
-	</TMPL_IF>
+  <title><TMPL_VAR channel_name ESCAPE="HTML"><TMPL_IF title>: <TMPL_VAR title_plain ESCAPE="HTML"></TMPL_IF></title>
+  <guid><TMPL_VAR id ESCAPE="HTML"></guid>
+  <link><TMPL_VAR link ESCAPE="HTML"></link>
+  <TMPL_IF content>
+  <description><TMPL_VAR content ESCAPE="HTML"></description>
+  </TMPL_IF>
+  <pubDate><TMPL_VAR date_822></pubDate>
+  <TMPL_IF author_email>
+  <TMPL_IF author_name>
+  <author><TMPL_VAR author_email> (<TMPL_VAR author_name>)</author>
+  <TMPL_ELSE>
+  <author><TMPL_VAR author_email></author>
+  </TMPL_IF>
+  </TMPL_IF>
 </item>
 </TMPL_LOOP>
 

data/test/test_merge.rb

@@ -77,8 +77,6 @@ $template->param(
 print $template->output;
 =end
 
-  Student = Struct.new( :name, :gpa )
-
   def test_students_example
 
     tmpl =<<TXT
@@ -93,8 +91,8 @@ TXT
     t = HtmlTemplate.new( tmpl )
     puts t.text
     puts "---"
-    puts t.render( students: [ Student.new( 'Bluto Blutarsky', 0.0 ),
-                               Student.new( 'Tracey Flick',    4.0 ) ])
+    puts t.render( students: [ { name: 'Bluto Blutarsky', gpa: 0.0 },
+                               { name: 'Tracey Flick',    gpa: 4.0 } ])
 
 
     assert true   # assume it's alright if we get here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-template
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-09 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc