docstache 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6755758d881843dbac0475960fe9234c627bcae
-  data.tar.gz: 5d86fa6e76ac7ca3bdde8e5a657d7b84a47cec79
+  metadata.gz: e82b56fd6b5c8941104ade8ba8c8d683a1e01389
+  data.tar.gz: 60abfa4c732098cbf233088d00d84bed12d15546
 SHA512:
-  metadata.gz: 8bcd5f84babf9bbbc494d276ba483765f160c968ccd16e069183eabdedcef256322ef7918044c465aaa707bfefc7a6fa74b7a86a02517887d4974f754f4f1083
-  data.tar.gz: 2f474a94f96b6ec2c2b97fe91a8ed88c6e3eb86e8d355110e4696fc3e332d6061ee63df6c7c022ed650600df7d90b2d35f0e119966779aeb6f35849b58a450aa
+  metadata.gz: 4293f3d05fab0da40b7d0bcffbd5df4cd583ab00e61b158b7e5ecab247566cb6f99cb7623b1528df2c0bebb19e1882ee0d10a811693d061dc1738d21c6bfaeaf
+  data.tar.gz: c67664422e5d74242af736abc33909ba0626ae0ca52c002213d855c2c58a10c1b92ad7a66da21e227a84a779e092f512bd2eba69a17929e3da7cdde0984a2f22

data/docstache.gemspec

@@ -19,4 +19,6 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_runtime_dependency 'nokogiri', '~> 1.6'
   s.add_runtime_dependency 'rubyzip', '~> 1.1'
+
+  s.add_development_dependency 'rspec', '~> 3.1.0'
 end

data/lib/docstache/data_scope.rb

@@ -0,0 +1,32 @@
+module Docstache
+  class DataScope
+
+    def initialize(data, parent=EmptyDataScope.new)
+      @data = data
+      @parent = parent
+    end
+
+    def get(key, hash=@data, original_key=key)
+      tokens = key.split('.')
+      if tokens.length == 1
+        return hash.fetch(key.to_sym) { |key| @parent.get(original_key) }
+      elsif tokens.length > 1
+        key = tokens.shift
+        if hash.has_key?(key.to_sym)
+          subhash = hash.fetch(key.to_sym)
+        else
+          return @parent.get(original_key)
+        end
+        return get(tokens.join('.'), subhash, original_key)
+      end
+    end
+
+  end
+
+  class EmptyDataScope
+    def get(_)
+      return nil
+    end
+  end
+
+end

data/lib/docstache/renderer.rb

@@ -2,7 +2,7 @@ module Docstache
   class Renderer
     def initialize(xml, data)
       @content = xml
-      @data = data
+      @data = DataScope.new(data)
     end
 
     def render
@@ -42,7 +42,7 @@ module Docstache
       when end_nd.text.to_s
         out = []
       when /\{\{\#([a-zA-Z0-9_\.]+)\}\}/
-        new_key = $1.to_sym
+        new_key = $1
         out += process_loop(nd, new_key, element)
       else
         new_node = nd.dup
@@ -71,26 +71,26 @@ module Docstache
 
     def process_loop(nd, key, data)
       out = []
-      puts "Found Loop #{key.to_s}"
-      end_row = extract_end_row(nd, key)
-
-      if !data.has_key?(key)
-        nil # Error in the data model
-        return []
-      elsif data[key].empty?
-        remove_loop(nd, key) # No data to put in
-        return []
-      else # Actual loop to process
-        data_set = data[key]
-        puts "Expanding Rows for loop #{key.to_s}"
-        puts "Data count is #{data_set.count}"
-        puts "Data is #{data_set}"
-
-        data_set.each do |element|
-          out += expand_loop(nd, end_row, key, element)
-        end
-        return out
-      end
+      # puts "Found Loop #{key.to_s}"
+      # end_row = extract_end_row(nd, key)
+      #
+      # if !data.has_key?(key)
+      #   nil # Error in the data model
+      #   return []
+      # elsif data[key].empty?
+      #   remove_loop(nd, key) # No data to put in
+      #   return []
+      # else # Actual loop to process
+      #   data_set = data[key]
+      #   puts "Expanding Rows for loop #{key.to_s}"
+      #   puts "Data count is #{data_set.count}"
+      #   puts "Data is #{data_set}"
+      #
+      #   data_set.each do |element|
+      #     out += expand_loop(nd, end_row, key, element)
+      #   end
+      #   return out
+      # end
     end
 
     def parse_content(elements, data=@data)
@@ -99,7 +99,7 @@ module Docstache
         when "tr"
           case nd.text.to_s
           when /\{\{\#([a-zA-Z0-9_\.]+)\}\}/
-            key = $1.to_sym
+            key = $1
             # Get elements to add
             elements = process_loop(nd, key, data)
             # Add elements
@@ -133,9 +133,9 @@ module Docstache
 
     def subst_content(nd, data)
       inner = nd.inner_html
-      keys = nd.text.scan(/\{\{([a-zA-Z0-9_\.]+)\}\}/).map(&:first).map(&:to_sym)
+      keys = nd.text.scan(/\{\{([a-zA-Z0-9_\.]+)\}\}/).map(&:first)
       keys.each do |key|
-        value = data[key]
+        value = data.get(key)
         puts "Substituting {{#{key.to_s}}} with #{value}"
         inner.gsub!("{{#{key.to_s}}}", safe(value))
       end

data/lib/docstache/version.rb

@@ -1,3 +1,3 @@
 module Docstache
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/docstache.rb

@@ -1,6 +1,7 @@
 require 'nokogiri'
 require 'zip'
 
+require "docstache/data_scope"
 require "docstache/renderer"
 require "docstache/document"
 

data/spec/data_scope_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Docstache::DataScope do
+  describe "#get" do
+    context "main body" do
+      let(:data_scope) { Docstache::DataScope.new({foo: "bar1", bar: {baz: "bar2", qux: {quux: "bar3"}}}) }
+      it "should resolve keys with no nesting" do
+        expect(data_scope.get('foo')).to eq("bar1")
+      end
+
+      it "should resolve nested keys" do
+        expect(data_scope.get('bar.baz')).to eq("bar2")
+      end
+
+      it "should resolve super nested keys" do
+        expect(data_scope.get('bar.qux.quux')).to eq("bar3")
+      end
+    end
+
+    context "loop" do
+      let(:parent_data_scope) { Docstache::DataScope.new({users: [{id: 1, name: "John Smith", brother: {id: 3, name: "Will Smith"}}], id: 2, foo: "bar", brother: {baz: "qux"}}) }
+      let(:data_scope) { Docstache::DataScope.new({id: 1, name: "John Smith", brother: {id: 3, name: "Will Smith"}}, parent_data_scope) }
+
+      it "should resolve keys with no nesting" do
+        expect(data_scope.get("id")).to eq(1)
+      end
+
+      it "should resolve nested keys" do
+        expect(data_scope.get("brother.id")).to eq(3)
+      end
+
+      it "should fall back to parent scope if key not found" do
+        expect(data_scope.get("foo")).to eq("bar")
+      end
+
+      it "should fall back to parent even during a partial match" do
+        expect(data_scope.get("brother.baz")).to eq("qux")
+      end
+
+      it "should return nil for no match" do
+        expect(data_scope.get("bat")).to be_nil
+        expect(data_scope.get("brother.qux")).to be_nil
+      end
+    end
+  end
+end

data/spec/empty_data_scope_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Docstache::EmptyDataScope do
+  let(:empty_data_scope) { Docstache::EmptyDataScope.new }
+  describe '#get' do
+    it "should always return nil" do
+      expect(empty_data_scope.get('foo')).to be_nil
+    end
+  end
+end

data/spec/integration_spec.rb

@@ -1,40 +1,40 @@
-require 'spec_helper'
-require 'template_processor_spec'
-
-describe 'integration test', integration: true do
-  let(:data) { Docstache::TestData::DATA }
-  let(:base_path) { SPEC_BASE_PATH.join('example_input') }
-  let(:input_file) { "#{base_path}/ExampleTemplate.docx" }
-  let(:output_dir) { "#{base_path}/tmp" }
-  let(:output_file) { "#{output_dir}/IntegrationTestOutput.docx" }
-  before do
-    FileUtils.rm_rf(output_dir) if File.exist?(output_dir)
-    Dir.mkdir(output_dir)
-  end
-
-  context 'should process in incoming docx' do
-    it 'generates a valid zip file (.docx)' do
-      Docstache::Render.new(input_file, data).generate_docx_file(output_file)
-
-      archive = Zip::File.open(output_file)
-      archive.close
-
-      puts "\n************************************"
-      puts '   >>> Only will work on mac <<<'
-      puts 'NOW attempting to open created file in Word.'
-      cmd = "open #{output_file}"
-      puts "  will run '#{cmd}'"
-      puts '************************************'
-
-      system cmd
-    end
-
-    it 'generates a file with the same contents as the input docx' do
-      input_entries = Zip::File.open(input_file) { |z| z.map(&:name) }
-      DocxTemplater::DocxCreator.new(input_file, data).generate_docx_file(output_file)
-      output_entries = Zip::File.open(output_file) { |z| z.map(&:name) }
-
-      expect(input_entries).to eq(output_entries)
-    end
-  end
-end
+# require 'spec_helper'
+# require 'template_processor_spec'
+#
+# describe 'integration test', integration: true do
+#   let(:data) { Docstache::TestData::DATA }
+#   let(:base_path) { SPEC_BASE_PATH.join('example_input') }
+#   let(:input_file) { "#{base_path}/ExampleTemplate.docx" }
+#   let(:output_dir) { "#{base_path}/tmp" }
+#   let(:output_file) { "#{output_dir}/IntegrationTestOutput.docx" }
+#   before do
+#     FileUtils.rm_rf(output_dir) if File.exist?(output_dir)
+#     Dir.mkdir(output_dir)
+#   end
+#
+#   context 'should process in incoming docx' do
+#     it 'generates a valid zip file (.docx)' do
+#       Docstache::Render.new(input_file, data).generate_docx_file(output_file)
+#
+#       archive = Zip::File.open(output_file)
+#       archive.close
+#
+#       puts "\n************************************"
+#       puts '   >>> Only will work on mac <<<'
+#       puts 'NOW attempting to open created file in Word.'
+#       cmd = "open #{output_file}"
+#       puts "  will run '#{cmd}'"
+#       puts '************************************'
+#
+#       system cmd
+#     end
+#
+#     it 'generates a file with the same contents as the input docx' do
+#       input_entries = Zip::File.open(input_file) { |z| z.map(&:name) }
+#       DocxTemplater::DocxCreator.new(input_file, data).generate_docx_file(output_file)
+#       output_entries = Zip::File.open(output_file) { |z| z.map(&:name) }
+#
+#       expect(input_entries).to eq(output_entries)
+#     end
+#   end
+# end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'docstache'
+require_relative '../lib/docstache'
 
 SPEC_BASE_PATH = Pathname.new(File.expand_path(File.dirname(__FILE__)))
 

data/spec/template_processor_spec.rb

@@ -1,222 +1,222 @@
-require 'spec_helper'
-require 'nokogiri'
-
-module Docstache
-  module TestData
-    DATA = {
-      teacher: 'Priya Vora',
-      building: 'Building #14',
-      classroom: 'Rm 202'.to_sym,
-      district: 'Washington County Public Schools',
-      senority: 12.25,
-      roster: [
-        { name: 'Sally', age: 12, attendence: '100%' },
-        { name: :Xiao, age: 10, attendence: '94%' },
-        { name: 'Bryan', age: 13, attendence: '100%' },
-        { name: 'Larry', age: 11, attendence: '90%' },
-        { name: 'Kumar', age: 12, attendence: '76%' },
-        { name: 'Amber', age: 11, attendence: '100%' },
-        { name: 'Isaiah', age: 12, attendence: '89%' },
-        { name: 'Omar', age: 12, attendence: '99%' },
-        { name: 'Xi', age: 11, attendence: '20%' },
-        { name: 'Noushin', age: 12, attendence: '100%' }
-      ],
-      event_reports: [
-        { name: 'Science Museum Field Trip', notes: 'PTA sponsored event. Spoke to Astronaut with HAM radio.' },
-        { name: 'Wilderness Center Retreat', notes: '2 days hiking for charity:water fundraiser, $10,200 raised.' }
-      ],
-      created_at: '11-12-03 02:01'
-    }
-  end
-end
-
-describe Docstache::Render do
-  let(:data) { Marshal.load(Marshal.dump(DocxTemplater::TestData::DATA)) } # deep copy
-  let(:base_path) { SPEC_BASE_PATH.join('example_input') }
-  let(:xml) { File.read("#{base_path}/word/document.xml") }
-  let(:parser) { DocxTemplater::TemplateProcessor.new(data) }
-
-  context 'valid xml' do
-    it 'should render and still be valid XML' do
-      expect(Nokogiri::XML.parse(xml)).to be_xml
-      out = parser.render(xml)
-      expect(Nokogiri::XML.parse(out)).to be_xml
-    end
-
-    it 'should accept non-ascii characters' do
-      data[:teacher] = '老师'
-      out = parser.render(xml)
-      expect(out).to include('老师')
-      expect(Nokogiri::XML.parse(out)).to be_xml
-    end
-
-    it 'should escape as necessary invalid xml characters, if told to' do
-      data[:building] = '23rd & A #1 floor'
-      data[:classroom] = '--> 201 <!--'
-      data[:roster][0][:name] = '<#Ai & Bo>'
-      out = parser.render(xml)
-
-      expect(Nokogiri::XML.parse(out)).to be_xml
-      expect(out).to include('23rd &amp; A #1 floor')
-      expect(out).to include('--&gt; 201 &lt;!--')
-      expect(out).to include('&lt;#Ai &amp; Bo&gt;')
-    end
-
-    context 'not escape xml' do
-      let(:parser) { DocxTemplater::TemplateProcessor.new(data, false) }
-      it 'does not escape the xml attributes' do
-        data[:building] = '23rd <p>&amp;</p> #1 floor'
-        out = parser.render(xml)
-        expect(Nokogiri::XML.parse(out)).to be_xml
-        expect(out).to include('23rd <p>&amp;</p> #1 floor')
-      end
-    end
-  end
-
-  context 'unmatched begin and end row templates' do
-    it 'should not raise' do
-      xml = <<EOF
-<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-  <w:body>
-    <w:tbl>
-      <w:tr><w:tc>
-          <w:p>
-            <w:r><w:t>#BEGIN_ROW:#{:roster.to_s.upcase}#</w:t></w:r>
-          </w:p>
-      </w:tc></w:tr>
-      <w:tr><w:tc>
-          <w:p>
-            <w:r><w:t>#END_ROW:#{:roster.to_s.upcase}#</w:t></w:r>
-          </w:p>
-      </w:tc></w:tr>
-      <w:tr><w:tc>
-          <w:p>
-            <w:r><w:t>#BEGIN_ROW:#{:event_reports.to_s.upcase}#</w:t></w:r>
-          </w:p>
-      </w:tc></w:tr>
-      <w:tr><w:tc>
-          <w:p>
-            <w:r><w:t>#END_ROW:#{:event_reports.to_s.upcase}#</w:t></w:r>
-          </w:p>
-      </w:tc></w:tr>
-    </w:tbl>
-  </w:body>
-</xml>
-EOF
-      expect { parser.render(xml) }.to_not raise_error
-    end
-
-    it 'should raise an exception' do
-      xml = <<EOF
-<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-  <w:body>
-    <w:tbl>
-      <w:tr><w:tc>
-          <w:p>
-            <w:r><w:t>#BEGIN_ROW:#{:roster.to_s.upcase}#</w:t></w:r>
-          </w:p>
-      </w:tc></w:tr>
-      <w:tr><w:tc>
-          <w:p>
-            <w:r><w:t>#END_ROW:#{:roster.to_s.upcase}#</w:t></w:r>
-          </w:p>
-      </w:tc></w:tr>
-      <w:tr><w:tc>
-          <w:p>
-            <w:r><w:t>#BEGIN_ROW:#{:event_reports.to_s.upcase}#</w:t></w:r>
-          </w:p>
-      </w:tc></w:tr>
-    </w:tbl>
-  </w:body>
-</xml>
-EOF
-      expect { parser.render(xml) }.to raise_error(/#END_ROW:EVENT_REPORTS# nil: true/)
-    end
-  end
-
-  it 'should enter no text for a nil value' do
-    xml = <<EOF
-<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-<w:body>
-  <w:p>Before.$KEY$After</w:p>
-</w:body>
-</xml>
-EOF
-    actual = DocxTemplater::TemplateProcessor.new(key: nil).render(xml)
-    expected_xml = <<EOF
-<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-<w:body>
-  <w:p>Before.After</w:p>
-</w:body>
-</xml>
-EOF
-    expect(actual).to eq(expected_xml)
-  end
-
-  it 'should replace all simple keys with values' do
-    non_array_keys = data.reject { |_, v| v.is_a?(Array) }
-    non_array_keys.keys.each do |key|
-      expect(xml).to include("$#{key.to_s.upcase}$")
-      expect(xml).not_to include(data[key].to_s)
-    end
-    out = parser.render(xml)
-
-    non_array_keys.each do |key|
-      expect(out).not_to include("$#{key}$")
-      expect(out).to include(data[key].to_s)
-    end
-  end
-
-  it 'should replace all array keys with values' do
-    expect(xml).to include('#BEGIN_ROW:')
-    expect(xml).to include('#END_ROW:')
-    expect(xml).to include('$EACH:')
-
-    out = parser.render(xml)
-
-    expect(out).not_to include('#BEGIN_ROW:')
-    expect(out).not_to include('#END_ROW:')
-    expect(out).not_to include('$EACH:')
-
-    [:roster, :event_reports].each do |key|
-      data[key].each do |row|
-        row.values.map(&:to_s).each do |row_value|
-          expect(out).to include(row_value)
-        end
-      end
-    end
-  end
-
-  it 'shold render students names in the same order as the data' do
-    out = parser.render(xml)
-    expect(out).to include('Sally')
-    expect(out).to include('Kumar')
-    expect(out.index('Kumar')).to be > out.index('Sally')
-  end
-
-  it 'shold render event reports names in the same order as the data' do
-    out = parser.render(xml)
-    expect(out).to include('Science Museum Field Trip')
-    expect(out).to include('Wilderness Center Retreat')
-    expect(out.index('Wilderness Center Retreat')).to be > out.index('Science Museum Field Trip')
-  end
-
-  it 'should render 2-line event reports in same order as docx' do
-    event_reports_starting_at = xml.index('#BEGIN_ROW:EVENT_REPORTS#')
-    expect(event_reports_starting_at).to be >= 0
-    expect(xml.index('$EACH:NAME$', event_reports_starting_at)).to be > event_reports_starting_at
-    expect(xml.index('$EACH:NOTES$', event_reports_starting_at)).to be > event_reports_starting_at
-    expect(xml.index('$EACH:NOTES$', event_reports_starting_at)).to be > xml.index('$EACH:NAME$', event_reports_starting_at)
-
-    out = parser.render(xml)
-    expect(out.index('PTA sponsored event. Spoke to Astronaut with HAM radio.')).to be > out.index('Science Museum Field Trip')
-  end
-
-  it 'should render sums of input data' do
-    expect(xml).to include('#SUM')
-    out = parser.render(xml)
-    expect(out).not_to include('#SUM')
-    expect(out).to include("#{data[:roster].count} Students")
-    expect(out).to include("#{data[:event_reports].count} Events")
-  end
-end
+# require 'spec_helper'
+# require 'nokogiri'
+#
+# module Docstache
+#   module TestData
+#     DATA = {
+#       teacher: 'Priya Vora',
+#       building: 'Building #14',
+#       classroom: 'Rm 202'.to_sym,
+#       district: 'Washington County Public Schools',
+#       senority: 12.25,
+#       roster: [
+#         { name: 'Sally', age: 12, attendence: '100%' },
+#         { name: :Xiao, age: 10, attendence: '94%' },
+#         { name: 'Bryan', age: 13, attendence: '100%' },
+#         { name: 'Larry', age: 11, attendence: '90%' },
+#         { name: 'Kumar', age: 12, attendence: '76%' },
+#         { name: 'Amber', age: 11, attendence: '100%' },
+#         { name: 'Isaiah', age: 12, attendence: '89%' },
+#         { name: 'Omar', age: 12, attendence: '99%' },
+#         { name: 'Xi', age: 11, attendence: '20%' },
+#         { name: 'Noushin', age: 12, attendence: '100%' }
+#       ],
+#       event_reports: [
+#         { name: 'Science Museum Field Trip', notes: 'PTA sponsored event. Spoke to Astronaut with HAM radio.' },
+#         { name: 'Wilderness Center Retreat', notes: '2 days hiking for charity:water fundraiser, $10,200 raised.' }
+#       ],
+#       created_at: '11-12-03 02:01'
+#     }
+#   end
+# end
+#
+# describe Docstache::Render do
+#   let(:data) { Marshal.load(Marshal.dump(DocxTemplater::TestData::DATA)) } # deep copy
+#   let(:base_path) { SPEC_BASE_PATH.join('example_input') }
+#   let(:xml) { File.read("#{base_path}/word/document.xml") }
+#   let(:parser) { DocxTemplater::TemplateProcessor.new(data) }
+#
+#   context 'valid xml' do
+#     it 'should render and still be valid XML' do
+#       expect(Nokogiri::XML.parse(xml)).to be_xml
+#       out = parser.render(xml)
+#       expect(Nokogiri::XML.parse(out)).to be_xml
+#     end
+#
+#     it 'should accept non-ascii characters' do
+#       data[:teacher] = '老师'
+#       out = parser.render(xml)
+#       expect(out).to include('老师')
+#       expect(Nokogiri::XML.parse(out)).to be_xml
+#     end
+#
+#     it 'should escape as necessary invalid xml characters, if told to' do
+#       data[:building] = '23rd & A #1 floor'
+#       data[:classroom] = '--> 201 <!--'
+#       data[:roster][0][:name] = '<#Ai & Bo>'
+#       out = parser.render(xml)
+#
+#       expect(Nokogiri::XML.parse(out)).to be_xml
+#       expect(out).to include('23rd &amp; A #1 floor')
+#       expect(out).to include('--&gt; 201 &lt;!--')
+#       expect(out).to include('&lt;#Ai &amp; Bo&gt;')
+#     end
+#
+#     context 'not escape xml' do
+#       let(:parser) { DocxTemplater::TemplateProcessor.new(data, false) }
+#       it 'does not escape the xml attributes' do
+#         data[:building] = '23rd <p>&amp;</p> #1 floor'
+#         out = parser.render(xml)
+#         expect(Nokogiri::XML.parse(out)).to be_xml
+#         expect(out).to include('23rd <p>&amp;</p> #1 floor')
+#       end
+#     end
+#   end
+#
+#   context 'unmatched begin and end row templates' do
+#     it 'should not raise' do
+#       xml = <<EOF
+# <w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+#   <w:body>
+#     <w:tbl>
+#       <w:tr><w:tc>
+#           <w:p>
+#             <w:r><w:t>#BEGIN_ROW:#{:roster.to_s.upcase}#</w:t></w:r>
+#           </w:p>
+#       </w:tc></w:tr>
+#       <w:tr><w:tc>
+#           <w:p>
+#             <w:r><w:t>#END_ROW:#{:roster.to_s.upcase}#</w:t></w:r>
+#           </w:p>
+#       </w:tc></w:tr>
+#       <w:tr><w:tc>
+#           <w:p>
+#             <w:r><w:t>#BEGIN_ROW:#{:event_reports.to_s.upcase}#</w:t></w:r>
+#           </w:p>
+#       </w:tc></w:tr>
+#       <w:tr><w:tc>
+#           <w:p>
+#             <w:r><w:t>#END_ROW:#{:event_reports.to_s.upcase}#</w:t></w:r>
+#           </w:p>
+#       </w:tc></w:tr>
+#     </w:tbl>
+#   </w:body>
+# </xml>
+# EOF
+#       expect { parser.render(xml) }.to_not raise_error
+#     end
+#
+#     it 'should raise an exception' do
+#       xml = <<EOF
+# <w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+#   <w:body>
+#     <w:tbl>
+#       <w:tr><w:tc>
+#           <w:p>
+#             <w:r><w:t>#BEGIN_ROW:#{:roster.to_s.upcase}#</w:t></w:r>
+#           </w:p>
+#       </w:tc></w:tr>
+#       <w:tr><w:tc>
+#           <w:p>
+#             <w:r><w:t>#END_ROW:#{:roster.to_s.upcase}#</w:t></w:r>
+#           </w:p>
+#       </w:tc></w:tr>
+#       <w:tr><w:tc>
+#           <w:p>
+#             <w:r><w:t>#BEGIN_ROW:#{:event_reports.to_s.upcase}#</w:t></w:r>
+#           </w:p>
+#       </w:tc></w:tr>
+#     </w:tbl>
+#   </w:body>
+# </xml>
+# EOF
+#       expect { parser.render(xml) }.to raise_error(/#END_ROW:EVENT_REPORTS# nil: true/)
+#     end
+#   end
+#
+#   it 'should enter no text for a nil value' do
+#     xml = <<EOF
+# <w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+# <w:body>
+#   <w:p>Before.$KEY$After</w:p>
+# </w:body>
+# </xml>
+# EOF
+#     actual = DocxTemplater::TemplateProcessor.new(key: nil).render(xml)
+#     expected_xml = <<EOF
+# <w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+# <w:body>
+#   <w:p>Before.After</w:p>
+# </w:body>
+# </xml>
+# EOF
+#     expect(actual).to eq(expected_xml)
+#   end
+#
+#   it 'should replace all simple keys with values' do
+#     non_array_keys = data.reject { |_, v| v.is_a?(Array) }
+#     non_array_keys.keys.each do |key|
+#       expect(xml).to include("$#{key.to_s.upcase}$")
+#       expect(xml).not_to include(data[key].to_s)
+#     end
+#     out = parser.render(xml)
+#
+#     non_array_keys.each do |key|
+#       expect(out).not_to include("$#{key}$")
+#       expect(out).to include(data[key].to_s)
+#     end
+#   end
+#
+#   it 'should replace all array keys with values' do
+#     expect(xml).to include('#BEGIN_ROW:')
+#     expect(xml).to include('#END_ROW:')
+#     expect(xml).to include('$EACH:')
+#
+#     out = parser.render(xml)
+#
+#     expect(out).not_to include('#BEGIN_ROW:')
+#     expect(out).not_to include('#END_ROW:')
+#     expect(out).not_to include('$EACH:')
+#
+#     [:roster, :event_reports].each do |key|
+#       data[key].each do |row|
+#         row.values.map(&:to_s).each do |row_value|
+#           expect(out).to include(row_value)
+#         end
+#       end
+#     end
+#   end
+#
+#   it 'shold render students names in the same order as the data' do
+#     out = parser.render(xml)
+#     expect(out).to include('Sally')
+#     expect(out).to include('Kumar')
+#     expect(out.index('Kumar')).to be > out.index('Sally')
+#   end
+#
+#   it 'shold render event reports names in the same order as the data' do
+#     out = parser.render(xml)
+#     expect(out).to include('Science Museum Field Trip')
+#     expect(out).to include('Wilderness Center Retreat')
+#     expect(out.index('Wilderness Center Retreat')).to be > out.index('Science Museum Field Trip')
+#   end
+#
+#   it 'should render 2-line event reports in same order as docx' do
+#     event_reports_starting_at = xml.index('#BEGIN_ROW:EVENT_REPORTS#')
+#     expect(event_reports_starting_at).to be >= 0
+#     expect(xml.index('$EACH:NAME$', event_reports_starting_at)).to be > event_reports_starting_at
+#     expect(xml.index('$EACH:NOTES$', event_reports_starting_at)).to be > event_reports_starting_at
+#     expect(xml.index('$EACH:NOTES$', event_reports_starting_at)).to be > xml.index('$EACH:NAME$', event_reports_starting_at)
+#
+#     out = parser.render(xml)
+#     expect(out.index('PTA sponsored event. Spoke to Astronaut with HAM radio.')).to be > out.index('Science Museum Field Trip')
+#   end
+#
+#   it 'should render sums of input data' do
+#     expect(xml).to include('#SUM')
+#     out = parser.render(xml)
+#     expect(out).not_to include('#SUM')
+#     expect(out).to include("#{data[:roster].count} Students")
+#     expect(out).to include("#{data[:event_reports].count} Events")
+#   end
+# end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: docstache
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Will Cosgrove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: Integrates data into MS Word docx template files. Processing supports
   loops and replacement of strings of data both outside and within loops.
 email:
@@ -46,16 +60,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - docstache.gemspec
 - lib/docstache.rb
+- lib/docstache/data_scope.rb
 - lib/docstache/document.rb
 - lib/docstache/renderer.rb
 - lib/docstache/version.rb
+- spec/data_scope_spec.rb
+- spec/empty_data_scope_spec.rb
 - spec/example_input/ExampleTemplate.docx
 - spec/example_input/word/document.xml
 - spec/integration_spec.rb
@@ -71,21 +88,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Merges Hash of Data into Word docx template files using mustache syntax
 test_files:
+- spec/data_scope_spec.rb
+- spec/empty_data_scope_spec.rb
 - spec/example_input/ExampleTemplate.docx
 - spec/example_input/word/document.xml
 - spec/integration_spec.rb