rexslt 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5d69aa2720ca591fb42c64e7b6173ce384945e5
-  data.tar.gz: da2e4a3b8f0e41eeca068f684fbd6e79df1f5d04
+  metadata.gz: 3a3bf1a0e1cf9b43802dfb28fffd0c3aa04a3e08
+  data.tar.gz: 0f023aa72ce7df0b1e4d01eb74bedc6119c5df39
 SHA512:
-  metadata.gz: ba6a47b920d0731d6104e59c3f6c5eb336f00d665691d92649f82ab33d45a7c0ac0502881c5646e2cc7e5cf643441c06d3a004ed165c2fced3a812d005e5e767
-  data.tar.gz: 3a3fd80f85b7d1f4d2cb6fa9db97963dcbcbab5b6901f30b77587f45d86d5ea7633bddbd6cc30b358c7763fcbe2edb5dce7182c85784a6e5b12db9d3a7449ab8
+  metadata.gz: 537c86472bc5971a9e99b17f6416428240b2deef586d4c6aea9e9d94f756516ec7a3ab5a7470640d10c72bacbde888db2023884102a40c47797c8a49430cece9
+  data.tar.gz: b90150549fdc860d9aa6c27f106348966317b599d7e5d75c4e281fcd73d9984d189374a7469f7a667f7fab2427f26ad0d5e8c042d9341d74eead7dcf33bd5e0a

data/lib/rexslt.rb

@@ -192,8 +192,9 @@ class Rexslt
 
     new_element = Rexle::Element.new(name) # .add_text(x.value.strip)
 
-    doc_element.add new_element
+    doc_element.text = element.text if element.text
     read_node(x, element, new_element, indent, i)
+    doc_element.add new_element    
     indent_after(element, x, doc_element, indent, i) if @indent == true
   end
   
@@ -238,6 +239,7 @@ class Rexslt
   def xsl_if(element, x, doc_element, indent, i=0)
     
     condition = x.attributes[:test].gsub('position()',i.to_s).gsub('&lt;','<').gsub('&gt;','>')
+
     result = element.element condition    
 
     if result then
@@ -285,6 +287,7 @@ class Rexslt
     procs = {"Rexle::Element" => :read_raw_element, "String" => :read_raw_text}        
 
     template_node.children.each_with_index do |x,j|
+
       method(procs[x.class.to_s]).call(element, x, doc_element, indent, i)
 
     end
@@ -298,12 +301,15 @@ class Rexslt
     #val = @indent == true ? padding(doc_element, raw_indent, x) : ''
     if x.to_s.strip.length > 0 then
       val = x.to_s #
-      doc_element.add_element val
+      #jr040316 doc_element.add_element val
     end
+
+    doc_element.add_text x if x.is_a? String
+
   end
   
   def read_raw_element(element, x, doc_element, indent, j)
-
+        
     method_name = x.name.gsub(/[:-]/,'_').to_sym
 
     if @xsl_methods.include? method_name then
@@ -311,7 +317,7 @@ class Rexslt
       if method_name == :'xsl_apply_templates' then
         #doc_element = doc_element.elements.last
       end
-
+      
       method(method_name).call(element, x, doc_element, indent, i=0)
 
     else
@@ -323,7 +329,9 @@ class Rexslt
       if x.children.length > 0 then           
 
         new_element = x.clone
-        new_element.text = ''
+
+        #jr030316 new_element.text = ''
+        new_element.text = x.text
 
         new_element.attributes.each do |k,v|
           
@@ -337,8 +345,9 @@ class Rexslt
         end
 
         indent_before(element, x, doc_element, new_indent, j) if @indent == true
-        doc_element.add new_element        
+             
         read_node(x, element, new_element, new_indent, i)        
+        doc_element.add new_element   
 
         if @indent == true then
           if doc_element.children.last.children.any? \
@@ -358,7 +367,7 @@ class Rexslt
 
       end
     end
-
+    
   end
   
   def xsl_text(element, x, doc_element, indent, i)
@@ -368,7 +377,7 @@ class Rexslt
   end
   
   def xsl_value_of(element, x, doc_element, indent, i)
-
+    
     field = x.attributes[:select]
 
     o = case field
@@ -381,14 +390,19 @@ class Rexslt
       ee
     end
 
-    doc_element.add_element o.to_s #unless o.to_s.empty?
+    #jr030316 doc_element.add_element o.to_s #unless o.to_s.empty?
+
+    doc_element.add_text  o
+    
+    doc_element
   end
   
 
-  def xslt_transform(xsl, xml, custom_params={})
+  def xslt_transform(raw_xsl, xml, custom_params={})
    
     doc_xml = Rexle.new xml
-    @doc_xsl = Rexle.new xsl
+    @doc_xsl = Rexle.new raw_xsl.gsub(/ +/,' ').gsub(/\n/,'')\
+                                                 .gsub(/> /,'>').gsub(/ </,'<')
 
     @doc = Rexle.new '<root></root>'
     indent = 0
@@ -425,7 +439,8 @@ class Rexslt
     end
 
     # using the 1st template    
-    xpath = String.new @templates.to_a[0][0]     
+    xpath = String.new @templates.to_a[0][0]
+
     read_node(@templates.to_a[0][-1], doc_xml.element(xpath), @doc.root, indent) 
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexslt
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - James Robertson
@@ -10,55 +10,69 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIxMDM0N1oXDTE0MDIwNjIxMDM0N1owSDESMBAG
+  8ixkARkWAmV1MB4XDTE2MDMwNDIzNTg1NloXDTE3MDMwNDIzNTg1NlowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAPR1qjW+XgvtrXdm0fM5NbMgSzf8HszUXDfA/4XglCq8LwBp6Db9t0UXHlXS
-  gMmtWWenWcxvLvqjHsETp+nZMRHfMqoLd0GwonuJo76HEEfkfKeRfUmnzj9+sIAD
-  yBcHA6zrObv7a184ywp5jIknmRS0J7qL7YieEda9Fhb7YH4D4C7HO5SZEmmXxL1h
-  vImRIJwyv0gX+i1ZPaa4oNe5ziwqNI2VBivLgjX9OnEL2OZASUlRavo4cCc5vffO
-  pCnF+UCRA/5EIhxzWZawflxgR30baH1tElL6iu4T31R9KkWVmpnGO8sJXKjtG+j8
-  8NcO0L093t0sxRWVmwu3h2aRdJECAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQU83c8Gj6E2y+OjyMZ8ymnvGDT41gwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQB3RVL1KMBxJX1n3JsvQt0TS8vJxfnGdI8taDY7G3Zpb3n4H6VfbTOU
-  BtxxMS+IRb4Vn5SoSl5G0D2AKRMq8RSvaYOeoLo8DX49Gz62llrJ1E5la6vjRrQl
-  hP7lZWMn+7F/Ou54j//Z3p3U0dqyy2dhvDDm72UQ8pCEOLcIAz3vCBdnJwVp+gmd
-  LPfHePTnVLzlKkBKornHC7clzLLtoE6/YW0ximDJZ6DG0PI0Ua6JLALluMiSMloi
-  1EigaCsx54frcmMsPZoLQ9vQ16ROqPAH1C131exu4wmQoeBd6s8hOLvmrfyTjo2K
-  6bAKBmswt4DzBQG3jblepE2u/lMoMrjo
+  ggEBAKzE015vYQSwDJ3b9+oMbtv9xKd3bx9aTF0MuF00hKmbPjFHd3L6dyJoEWCy
+  ZYxqiJZykN/TH8RD6wCvqPqtRwCM4j4zubSLfx9pLrWfA9KyHZ76sHNFvMwKJowV
+  /LvaQVWFsyvisyUGE5700jKE0pzt42g2MTIBsci6Lj6RTWzP5o1GgKVHEGW8JDv/
+  AEWspA+gCGoScP4lBKrwnfhjx8e0giWenEMxZFQLllLJcd95bxBsPudVXA9fSsZJ
+  LTSRPrEzX2w/T+BxTMwA3avOWPij/EqmfalHjBvruV9VHX7SIQb3wp8njvgFwI80
+  ctKDJ9kHhU0ImdBFsrEV91m3occCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUDSdtw1Awl7Da9uo7Dk/jGadtV8swJgYDVR0RBB8w
+  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAPMbAn90u
+  s7nXLA0sr2fcImZAoeklGL7xVxAjKPgy9T56LFU6KVe0p9u4uxXzs3Gi4HKIF/5P
+  P5uGfjvfnzhl0vNKbFMyrvAcgAYRR+4/T2KJHetMUBEOll3hvOgCEL96P2A3rvBs
+  Ey6GvidwOJWsH1l2PuYXh/XHX9OAUoYuzZf0oK0LSMpdqwmdyGBaIaGS/JIfusfZ
+  qti4dC2jX2jBO+yVrjhxjUa2mhJ4FMvFakkFu6ygoV2E2xff/njkAaoQHh6LW1R4
+  38j2+6ULVWalsVein3whb7qB6IOvxoSqjz6n7jAKFGHovoXPUqpv5y5Yor23rTrn
+  0YwisIc3UkL30g==
   -----END CERTIFICATE-----
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.11
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -76,17 +90,17 @@ require_paths:
 - lib
 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:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rexslt is an XSLT processor written purely in Ruby