rscript 0.1.27 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fab236c9a86767d5708a8a2a94f89c4ec3fa1244
-  data.tar.gz: da8f6234d734a9020aabcdd6ffdeb2659ec9df16
+  metadata.gz: f201f0d5a1f573fd47ec5cc8f8cd2908fb99624f
+  data.tar.gz: 5eb6ac706c9bb08669ba68f12486fc92615fbc2f
 SHA512:
-  metadata.gz: 790095e5b47342c7c15ef6648ca8701405fe4e40e04d1515aee581bfc86471ec858dbc6b6a38e4a3f52884ec19b86b1e31c317b479f14f367133a30273b240a6
-  data.tar.gz: 2b2dffe7ecf14306dc01112025faa3c81524d8776d9d1b228ad346eeabfa92c156dc8c52ed8ca80450b4d2310004d6b0eda6db37ffc8377a22b4a6e987a235d6
+  metadata.gz: d5a07a761a98030e6d7de2348d1b1f5cb86bad17202a658a727c497175bb6e0766a6775078856b332080d299635a20839b14441d8a6c39f66112bf9c2ceaa5bf
+  data.tar.gz: 8f53bdcf076ea7a5149be05bfa2bd1124523667a79fa003190e3898f8e56ba14a3601739172ea2131790f9df70a8188811b66c0f58b5fcc285d7575cc585468b

data/lib/rscript.rb

@@ -2,11 +2,13 @@
 
 # file: rscript.rb
 
+
 # created:  1-Jul-2009
-# updated: 06-Nov-2013
+# updated: 29-Jan-2015
 
 # modification:
 
+  # 29-Jan-2015: Replaced REXML with Rexle
   # 06-Nov-2013: An error is now raised if the job doesn't exist
   # 02-Nov-2013: Replaced XThreads with a simle thread
   # 01-Nov-2013: XThreads now handles the execution of eval statements;
@@ -32,6 +34,7 @@
 
 require 'rscript_base'
 require 'hashcache'
+require 'rexle'
 
 
 class RScript < RScriptBase
@@ -55,16 +58,16 @@ class RScript < RScriptBase
       args.compact!
 
       out = read_rsf(args) do |doc|
-        doc.root.elements.to_a("//job[#{ajob.join(' or ')}]").map do |job|
-          job.elements.to_a('script').map {|s| read_script(s)}.join("\n")
-        end.join("\n")
+        doc.root.xpath("//job[#{ajob.join(' or ')}]").map do |job|
+          job.xpath('script').map {|s| read_script(s)}.join("\n")
+        end.join("\n")        
       end
 
       raise "job not found" unless out.length > 0
       out
       
     else    
-      out = read_rsf(args) {|doc| doc.root.elements.to_a('//script').map {|s| read_script(s)}}    
+      out = read_rsf(args) {|doc| doc.root.xpath('//script').map {|s| read_script(s)}}    
     end 
 
     [out, args]
@@ -122,7 +125,7 @@ class RScript < RScriptBase
     buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
     #jr080813 buffer = read_sourcecode(rsfile) 
 
-    doc =  Document.new(buffer)
+    doc =  Rexle.new(buffer)
     yield(doc)
 
   end
@@ -133,9 +136,10 @@ class RScript < RScriptBase
 
     $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
     buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
-    #jr080813 buffer = read_sourcecode(rsfile) 
+
     @url_base = rsfile[/\w+:\/\/[^\/]+/]
-    doc =  Document.new(buffer)
+
+    doc =  Rexle.new(buffer)
     yield(doc)
 
   end          
@@ -147,4 +151,4 @@ if __FILE__ == $0 then
   rs = RScript.new()
   code, args = rs.read(raw_args)
   puts eval(code).join("\n")
-end
+end

data/lib/rscript_base.rb

@@ -1,32 +1,32 @@
 #!/usr/bin/env ruby
-#file: rscript_base.rb
+
+# file: rscript_base.rb
 
 require 'cgi'
 require 'open-uri'
 require 'rxfhelper'
-require 'rexml/document'
-#include REXML
 
 class RScriptBase
-  include REXML
   
   def initialize()
   end
   
   def read(doc)
-    doc.root.elements.to_a('//script').map {|s| run_script(s)}.join(';')
+    doc.root.xpath('//script').map {|s| run_script(s)}.join(';')
   end
   
   protected
   
   def read_script(script)  
     out_buffer = ''
-    src = script.attribute('src')
+
+    src = script.attributes[:src]
 
     if src then
-      out_buffer = read_sourcecode(script.attribute('src').value.to_s)
+
+      out_buffer = read_sourcecode(script.attributes[:src].value.to_s)
     else
-      code = script.text.to_s.strip.length > 0 ? script.text : script.cdatas.join.strip
+      code = script.text.strip.length > 0 ? script.text : script.cdatas.join.strip
       out_buffer = code
     end
     out_buffer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   pTl90ccAo96Myith2+5jI2p1BAoSjDRNTv+Uz21Zp7x1b0lFfXtaZ4FK5hu/B+DM
   B4M/dUmu40qQLg==
   -----END CERTIFICATE-----
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache
@@ -73,6 +73,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.12
+- !ruby/object:Gem::Dependency
+  name: rexle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -107,4 +127,3 @@ specification_version: 4
 summary: rscript previously known as rcscript, reads Ruby code which is embedded within
   an rscript XML file.
 test_files: []
-has_rdoc: