xmlss 0.4.0 → 0.4.1

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    xmlss (0.4.0)
+    xmlss (0.4.1)
       enumeration (~> 1.3)
-      undies (~> 2.1)
+      undies (~> 2.2)
 
 GEM
   remote: http://rubygems.org/
@@ -17,7 +17,7 @@ GEM
     enumeration (1.3.1)
     rake (0.9.2)
     ruby-prof (0.10.8)
-    undies (2.1.0)
+    undies (2.2.0)
 
 PLATFORMS
   ruby

data/examples/layout.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet">
   <Styles>
+    
   </Styles>
-  
   <Worksheet ss:Name="first">
     <Table>
       <Column />

data/examples/simple.rb

@@ -15,7 +15,7 @@ ExampleWorkbook.new("simple") do
     row {
 
       # put data into the row (infer type)
-      [1, "text", 123.45, "0001267", "$45.23"].each do |data_value|
+      [1, "text", 123.45, "<>&'\"/", "$45.23"].each do |data_value|
         cell { data data_value }
       end
 

data/examples/simple.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet">
   <Styles>
+    
   </Styles>
-  
   <Worksheet ss:Name="1 row, 5 columns">
     <Table>
       <Column />
@@ -21,7 +21,7 @@
           <Data ss:Type="Number">123.45</Data>
         </Cell>
         <Cell>
-          <Data ss:Type="String">0001267</Data>
+          <Data ss:Type="String">&lt;&gt;&amp;&#x27;&quot;&#x2F;</Data>
         </Cell>
         <Cell>
           <Data ss:Type="String">$45.23</Data>

data/examples/styles.xml

@@ -21,7 +21,6 @@
       <Font ss:Color="#FFFFFF" />
     </Style>
   </Styles>
-  
   <Worksheet ss:Name="styles">
     <Table>
       <Column />

data/examples/text.rb

@@ -16,9 +16,9 @@ ExampleWorkbook.new("text") do
     row {
       cell(:style_id => "general_text") {
         data %{
-A blob of text
-with line breaks
-  and leading space}
+A blob of <text>
+with line breaks, /escaped/ characters
+  & "leading" 'space'}
       }
     }
   end

data/examples/text.xml

@@ -6,13 +6,12 @@
       <NumberFormat ss:Format="@" />
     </Style>
   </Styles>
-  
   <Worksheet ss:Name="text">
     <Table>
       <Column />
       <Row>
         <Cell ss:StyleID="general_text">
-          <Data ss:Type="String">&#13;&#10;A blob of text&#13;&#10;with line breaks&#13;&#10;  and leading space</Data>
+          <Data ss:Type="String">&#13;&#10;A blob of &lt;text&gt;&#13;&#10;with line breaks, &#x2F;escaped&#x2F; characters&#13;&#10;  &amp; &quot;leading&quot; &#x27;space&#x27;</Data>
         </Cell>
       </Row>
     </Table>

data/lib/xmlss/element/data.rb

@@ -5,8 +5,6 @@ module Xmlss; end
 module Xmlss::Element
   class Data
 
-    LB = "
"
-
     include Enumeration
     enum :type, {
       :number => "Number",
@@ -34,8 +32,6 @@ module Xmlss::Element
       case self.value
       when ::Date, ::Time, ::DateTime
         self.value.strftime("%Y-%m-%dT%H:%M:%S")
-      when ::String, ::Symbol
-        self.value.to_s.gsub(/(\r|\n)+/, LB)
       else
         self.value.to_s
       end

data/lib/xmlss/undies_writer.rb

@@ -7,6 +7,7 @@ module Xmlss
     XML_NS   = "xmlns"
     SHEET_NS = "ss"
     NS_URI   = "urn:schemas-microsoft-com:office:spreadsheet"
+    LB       = "
"
 
     # The Undies writer is responsible for driving the Undies API to generate
     # the xmlss xml markup for the workbook.
@@ -140,7 +141,9 @@ module Xmlss
 
     def data(data, &block)
       @worksheets_t._Data(self.class.attributes(data, :type)) {
-        @worksheets_t.__ data.xml_value
+        @worksheets_t.__ Undies::Template.
+          escape_html(data.xml_value).
+          gsub(/(\r|\n)+/, LB)
       }
     end
 

data/lib/xmlss/version.rb

@@ -1,3 +1,3 @@
 module Xmlss
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/xmlss/workbook.rb

@@ -5,13 +5,14 @@ require 'xmlss/element/worksheet'
 module Xmlss
   class Workbook
 
+    # TODO: (writer, data={}, &build)
     def initialize(opts={}, &build)
       # (don't pollute workbook scope that the build may run in)
 
       # apply :data options to workbook scope
       data = (opts || {})[:data] || {}
       if (data.keys.map(&:to_s) & self.public_methods.map(&:to_s)).size > 0
-        raise ArgumentError, "data conflicts with template public methods."
+        raise ArgumentError, "data conflicts with workbook public methods."
       end
       metaclass = class << self; self; end
       data.each {|key, value| metaclass.class_eval { define_method(key){value} }}

data/test/element/data_test.rb

@@ -29,9 +29,6 @@ module Xmlss::Element
     should "generate it's xml value" do
       assert_equal "12", Data.new(12).xml_value
       assert_equal "string", Data.new("string").xml_value
-      assert_equal "line#{Data::LB}break", Data.new("line\nbreak").xml_value
-      assert_equal "return#{Data::LB}break", Data.new("return\rbreak").xml_value
-      assert_equal "returnline#{Data::LB}break", Data.new("returnline\r\nbreak").xml_value
       assert_equal "2011-03-01T00:00:00", Data.new(DateTime.parse('2011/03/01')).xml_value
       assert_equal "2011-03-01T00:00:00", Data.new(Date.parse('2011/03/01')).xml_value
       time = Time.now
@@ -67,21 +64,4 @@ module Xmlss::Element
 
   end
 
-  class WhitespaceDataTest < DataTest
-    desc "dealing with line breaks and leading space"
-    subject do
-      Data.new(%s{
-Should
-  honor
-    this
-      })
-    end
-
-    should "honor them when generating xml" do
-      reg = /#{Data::LB}Should#{Data::LB}\s{2}honor#{Data::LB}\s{4}this#{Data::LB}/
-      assert_match reg, subject.xml_value
-    end
-
-  end
-
 end

data/test/undies_writer_test.rb

@@ -211,14 +211,53 @@ class Xmlss::UndiesWriter
       )
     end
 
-    should "write data markup w/ line breaks" do
+    should "write data markup w/ \\n line breaks" do
+      subject.data(Xmlss::Element::Data.new("line\nbreak", :type => :string))
+      subject.flush
+
+      assert_equal "<Data ss:Type=\"String\">line#{Xmlss::UndiesWriter::LB}break</Data>", subject.element_markup
+    end
+
+    should "write data markup w/ \\r line breaks" do
+      subject.data(Xmlss::Element::Data.new("line\rbreak", :type => :string))
+      subject.flush
+
+      assert_equal "<Data ss:Type=\"String\">line#{Xmlss::UndiesWriter::LB}break</Data>", subject.element_markup
+    end
+
+    should "write data markup w/ \\r\\n line breaks" do
+      subject.data(Xmlss::Element::Data.new("line\r\nbreak", :type => :string))
+      subject.flush
+
+      assert_equal "<Data ss:Type=\"String\">line#{Xmlss::UndiesWriter::LB}break</Data>", subject.element_markup
+    end
+
+    should "write data markup w/ \\n\\r line breaks" do
+      subject.data(Xmlss::Element::Data.new("line\n\rbreak", :type => :string))
+      subject.flush
+
+      assert_equal "<Data ss:Type=\"String\">line#{Xmlss::UndiesWriter::LB}break</Data>", subject.element_markup
+    end
+
+    should "write data markup w/ line breaks and leading space" do
       subject.data(Xmlss::Element::Data.new(%s{
-        Hello World
-      }, :type => :string))
+Should
+  honor
+    this}, :type => :string))
+      subject.flush
+
+      assert_equal(
+        "<Data ss:Type=\"String\">#{Xmlss::UndiesWriter::LB}Should#{Xmlss::UndiesWriter::LB}  honor#{Xmlss::UndiesWriter::LB}    this</Data>",
+        subject.element_markup
+      )
+    end
+
+    should "write data markup w/ escaped values" do
+      subject.data(Xmlss::Element::Data.new("some\n&<>'\"/\ndata"))
       subject.flush
 
       assert_equal(
-        "<Data ss:Type=\"String\">&#13;&#10;        Hello World&#13;&#10;      </Data>",
+        "<Data ss:Type=\"String\">some&#13;&#10;&amp;&lt;&gt;&#x27;&quot;&#x2F;&#13;&#10;data</Data>",
         subject.element_markup
       )
     end

data/xmlss.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("bundler", ["~> 1.0"])
   s.add_development_dependency("assert", ["~> 0.6"])
-  s.add_dependency("undies", ["~> 2.1"])
+  s.add_dependency("undies", ["~> 2.2"])
   s.add_dependency("enumeration", ["~> 1.3"])
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xmlss
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 Z
+date: 2012-02-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -55,11 +55,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 2
-        - 1
-        version: "2.1"
+        - 2
+        version: "2.2"
   version_requirements: *id003
   name: undies
 - !ruby/object:Gem::Dependency