recordx-xslt 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32427643d3e9a047fccc04309750bc0581f4cfb1
-  data.tar.gz: 612b152bdb0103f4018bcb00c0ff5fbc5d86f6be
+  metadata.gz: 7c98f1985544f6404511ad3bf75b2db83a4cfd9c
+  data.tar.gz: c55ddcb0d1c38eb8900d3f9172efe23efa607f7c
 SHA512:
-  metadata.gz: 9669e6fec7c490e4503a79b70ae9a9b1c7dbb1c2af4a1ca821c01785173e1ea42812180825b2837b6934950fecba9e5db0c8c73634fe5d138f7de95598df058b
-  data.tar.gz: 28e770b355c39476169388565967b799af6a99c70731b0821d5e7478598841e71e4e26f2751052b25ea62d2a3b8cc5898dbcfbacc4b3df181d2b8bf0fd9e39a3
+  metadata.gz: a11f3fba9added4ad4057d796315f4f46bd328b2f540cb3fc1b10ef2bb1d1c07e91f88086e6a29b20496936a25110fa2bf56a309d873b86164c31ae471e3a707
+  data.tar.gz: 0aaeb04fece5e16ed1277965916e8a295d38abfbe5c0419bb83eef10a1fce59a19ad7ef55b1736ede3d352be1d08d379ef4be395459b5d4685bc75120d7f1c2e

data/lib/recordx-xslt.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/envruby
+#!/usr/bin/env ruby
 
 # file: recordx-xslt.rb
 
@@ -23,15 +23,20 @@ HEADER
     a_element = @schema.split('/').map{|x| x[/\w+/]}
 
     a_html = @xslt_schema.split('/').map do |x|
-     
-      name = x[/\w+/]
-      children = ($')[/^[\(\[]([^\)\]]+)[\)\]]$/,1]
-      list = children.split(',').map {|y| y.split(':') } if children
 
+      result = x.match(/(\w+)(?:[\(\[]([^\]\)]+)[\]\)])?(.*)/)
+      name, children, remaining = result.captures if result
+
+      #children = ($')[/^[\(\[]([^\)\]]+)[\)\]]$/,1]
+
+      list = children.split(',').map {|y| y.split(':',2)} if children        
+
+      #[name, list, remaining]
       [name, list]
     end
 
     a = a_element.zip(a_html).map.with_index do |a,i|
+
       out = []
       tag = a.shift
       field = i > 0 ? 'records/' + tag : tag
@@ -45,7 +50,7 @@ HEADER
         out << "  <%s>\n" % a.first
         out << "    <xsl:apply-templates select='summary'/>\n"
         out << "    <xsl:apply-templates select='records'/>\n"
-        out << "  <\\%s>\n" % a.first
+        out << "  </%s>\n" % a.first
         out << "</xsl:template>\n\n"
         out << "<xsl:template match='%s/summary'>\n" % [tag]
         out << "</xsl:template>\n\n"
@@ -64,14 +69,17 @@ HEADER
     out = []
 
     unless a.first.is_a? Array then
+      
       tag = a.shift
+
       out << indent + "<%s>\n" % tag
       out << indent + "  <xsl:apply-templates select='summary'/>\n"
-      out << indent + "<\\%s>\n" % tag
+      out << indent + "</%s>\n" % tag
       out << "</xsl:template>\n\n"
       out << "<xsl:template match='%s/summary'>\n" % [prev_tag]
 
       a.flatten!(1)
+      
       if a.last.is_a? Array then
         out << scan_e(a, tag, indent + '  ') 
       else
@@ -79,8 +87,25 @@ HEADER
       end
 
     else
-      a.map do |x| 
-        out << indent + "<%s><xsl:value-of select='%s'/></%s>\n" % [x[0],x[-1],x[0]]
+      a.map do |target,src|
+
+        if src then
+          
+          start_tag = target.gsub(/\s*\{[^\}]+\}/) do |attr| 
+
+            ' ' + attr.scan(/(\w+[:=]\s*(?:\w+|["'][^"']+["'])),?\s*/)\
+            .map {|x| x.first.split(/\s*[:=]\s*/) }\
+            .map {|attr, val| "%s='%s'" % [attr,val.gsub(/^["']|["']$/,'')]}\
+            .join(', ')
+          end
+          
+          end_tag = target.gsub(/\s*{.*/,'')           
+
+          out << indent + "<%s><xsl:value-of select='%s'/></%s>\n" % 
+                                                [start_tag,src,end_tag]
+        else
+          out << indent + "<%s></%s>\n" % ([target] * 2)
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recordx-xslt
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Robertson
@@ -10,26 +10,28 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIxMDMwNFoXDTE0MDIwNjIxMDMwNFowSDESMBAG
+  8ixkARkWAmV1MB4XDTE0MDkwNjA5NTg0MFoXDTE1MDkwNjA5NTg0MFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAK8NUHb1HB3iER+JF+7o3YqymdJHeLv0F/CWyiMGLf37t3eL2DFjMnHY0czK
-  wuPPDa0x0DbX3OydOd9PCFrC9tDCwZcZgryH3wKXkAq3OkHjVysoSRaMAo+u03Wc
-  pGu40lLpjV2QBvxeQ/reFvlP5Q1yN9J4Z6dbiini3Bbo0PvpzEpQI6BDVcxI4TTd
-  b0zGnLNzBbuIZHhDk814hcnM2YfQ9ZuDsy3S9tnHJGNR4h5AteGJ9qSm8Nx+G8qg
-  wizL21uXog7dpgw0R0Gz+E9jQOaPRfKnqq+PlumUwV9vxBkCxoOc3PKq7bVSc+vf
-  VWYbgJqj5w5ynhQowuSH9WUPKBUCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQUQ5/Hfj/CpfM9i9RgxTet/JQcAJgwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQBlhMWZIlOMGMdUgqcjiCMilqCIPTZBy3Xj4LXlK70iVXCqcMUiGe6/
-  MRZ38lUrkEYqCOrPV1Y16zBGPv70VNQmVhHMnlHfOTc1hcLYzcL1l5J+wCZkc2/D
-  DZlLKZihECCg8agjY/A9xuVq5Ik8oIXEont7lYi/8dHjluCdYfSrJl23eOiFA0GC
-  GWNyXcGAFdTJQtn/ZKAsDyWl7R6huBVJZvHktElezBDqRnrH1qCO+DlhJ9sXc/T9
-  UT4SVdNm7xxWQijJNVwK+x85g3AEEHnoXAovU8ekT6IMDUBZdLt1OmNhE27F3MB/
-  TCtWbs+FLBCTvNxvyylZm98pMuPYFKwG
+  ggEBAJf6Fs8/B3TdHfk/8VA40P4qTGjBjGGAiatWEE6AwV69e32EvzIq5uYo9TVB
+  bbKJARxg/xw/pjWNL5uokm7wNAVo+vcjdDYBIQ35RZ4azpqKsyGgCvzdpy7Gs+69
+  /3zOH21IvTxmoHZBBEc+nl3Wf27KF/+x9IwuJJckztmR4/k9z8iMzAUUXqd6p2dU
+  Kks2pgK2ysQ9OpRVaAts7zuPrn4/b8fpGA0ZozubB0tw60Ty3KzPJz4lI24zTjlT
+  DVoU+NUhhLtaECA8a3X/9UpiysFAuQ+/WAB76NA8kSxeROiybNTQI1+UjTzw0YWu
+  mlgOL63eUHcBhJn5zAxBaRkwn/8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUd9M/twZFlT2ryhyHStUGknjPxEowJgYDVR0RBB8w
+  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEARaGHvr/r
+  k1hKZsDIp/0PGxF0+1fttN5nL5YTy52nqPNDC3pKCNdgzt9I1nFClli7jFFWwgSm
+  jOh99w8NopWEIej3mktGQqHGXDa1JN+aKaiX8sO7Y7WJ70Y5hByklFy3XOkdWE3Q
+  pkDttehe4z8k29E75Dmz/M73QLYR296bXSQ+BblXsfmzBwS+OKoOBvdKRHwZUYNg
+  zCJGl4kuaLfrZe2SVlKvdp+gMQP0dTjwYJLRntwhC9jI2w8tnEK4aUALVoXQHdQE
+  KoGXC4+vSmOB6gj1SBzG9iZn1bxVygLkiOO5uar/JjhbDTRNDqDy/B3D8SIIAGAO
+  uoX7MOe9OncggQ==
   -----END CERTIFICATE-----
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2014-09-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk
@@ -50,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -58,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: recordx-xslt