rexslt 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95e290c2a89c244bf699efa66861541d7dd3c8b2
-  data.tar.gz: ea41c03ab0ff57e6593c1f01fa3f4de90246ae32
+  metadata.gz: 1e5cb3fb23bdbadadbc09927caf8290a487024ba
+  data.tar.gz: c106d6397abf4421c4585edeb08731672024bc22
 SHA512:
-  metadata.gz: 189af495ea0713480685d0e656f6cf9d4ec104f65c30276f4586da9c28e63794223616bbc2fc1a70cdba624b9e20a310a6af939b3e74a32e7b2168e9bdbb77f9
-  data.tar.gz: 895a8fc44f217954077d99a0658434e89ac477cf073930c340f5a910715fc517d12728352d366a4c66b65178d8f8277dd89540a1abfbbf23e606f39c01413bbb
+  metadata.gz: 2413e53b29a3dad2412d64fb7fb2a83780b9ae462a29ead1802fec907580d7db83618e03d99ff361192d4de28f35e7799207196945352aa28a0790afe8e725aa
+  data.tar.gz: 61c384317e59acdcedabd667fd806cd380b229b5b73b85468b8abfc90550fe0236241da8a6c8881cb3ad1875a403a77f6f072a862b6f2547ba456b91cc15c729

data/lib/rexslt.rb

@@ -6,32 +6,37 @@ require 'rexle'
 require 'rxfhelper'
 
 
-class Rexle::Element
-  def to_xpath(option=nil)
-    def attribute_scan(node)
-      result = ''
-      attr = %w(id class).detect {|x| node.attributes.has_key? x}
-      if attr then
-        value = node.attribute[attr]
-        result = "[@%s='%s']" % [attr, value]
+module RexPath
+  
+  refine Rexle::Element do
+    
+    def to_xpath(option=nil)
+      def attribute_scan(node)
+        result = ''
+        attr = %w(id class).detect {|x| node.attributes.has_key? x}
+        if attr then
+          value = node.attribute[attr]
+          result = "[@%s='%s']" % [attr, value]
+        end
+        result
       end
-      result
-    end
 
-    def doc_scan(node, option=nil)
-      name = node.name
-      attribute = option == :no_cond ? '' : attribute_scan(node)
-      result = doc_scan(node.parent,option) unless node.root === node.doc_root
-      [result, name.to_s + attribute]
-    end
+      def doc_scan(node, option=nil)
+        name = node.name
+        attribute = option == :no_cond ? '' : attribute_scan(node)
+        result = doc_scan(node.parent,option) unless node.root === node.doc_root
+        [result, name.to_s + attribute]
+      end
 
-    doc_scan(self, option).flatten.compact.join('/')
+      doc_scan(self, option).flatten.compact.join('/')
+    end
   end
 end
 
 
 class Rexslt
-
+  using RexPath
+  
   def initialize(xsl, xml, params={})    
     super()
     custom_params = params.inject({}){|r,x| r.merge(Hash[x[0].to_s,x[1]])}    
@@ -324,7 +329,6 @@ class Rexslt
     end
 
     #doc_element.add_text x if x.is_a? String
-    #puts '300 doc_element: '  + doc_element.inspect
 
   end
   
@@ -422,9 +426,9 @@ class Rexslt
 
   def xslt_transform(raw_xsl, xml, custom_params={})
    
-    doc_xml = Rexle.new xml
-  
-    @doc_xsl = Rexle.new raw_xsl
+    doc_xml = xml.is_a?(Rexle) ? xml : Rexle.new(xml)
+ 
+    @doc_xsl = raw_xsl.is_a?(Rexle) ? raw_xsl : Rexle.new(raw_xsl)
     
     filter_out_spaces @doc_xsl.root
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexslt
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   38j2+6ULVWalsVein3whb7qB6IOvxoSqjz6n7jAKFGHovoXPUqpv5y5Yor23rTrn
   0YwisIc3UkL30g==
   -----END CERTIFICATE-----
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
@@ -39,40 +39,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.3.11
 description: 
 email: james@r0bertson.co.uk
 executables: []