rscript 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3845b49bc53494d6bbc97f701d3d1ff39b9c121
-  data.tar.gz: bad102556f34d806949de239f180a572809376d1
+  metadata.gz: 7eb9e42c934b67de1cb3ada17cd8904823e5c7ea
+  data.tar.gz: d2678d1666cd603dc582339246eeb9c8a1c7002c
 SHA512:
-  metadata.gz: 3ed86f99bba8dfa88452e4c47beef7189b71788a3534b31fc76d3a075cfaa947204e0e7214a3afc878da746f6a20e55f79daabfd2db57a3434b202e7040c80c7
-  data.tar.gz: 65a0a37b113a4fd3dea3b7f0b6a184d5dcac83706b40c0ba82e51107edd99b23b5fc2dd38b9863d47d82c5a0c89674115e7e16508b3b143206f74f56887fb690
+  metadata.gz: e446f1fb007aba23683f6f508ba934d3aae142b159f419c05914221737df3fa40b75b2bb7b2595d26c592ce9280dee8beb43e3267ae3abf6282d28082e7882d0
+  data.tar.gz: 50f96e09ef49dc13b55944d56139d99f370804fd1ea0457296677a5c0a6a1bba2358600a0b8fff78fcc60471f9b066615a0592996a66027d40e66631e065ee92

data/lib/rscript.rb

@@ -3,11 +3,12 @@
 # file: rscript.rb
 
 # created:  1-Jul-2009
-# updated: 13-Jul-2018
+# updated: 28-Jul-2018
 
 # modification:
 
-  # 13-Jul-2018@ bug fix: The use of a cache is now optional
+  # 28-Jul-2018: feature: Jobs are now looked up from a Hash object
+  # 13-Jul-2018: bug fix: The use of a cache is now optional
   # 10-Jul-2018: feature: Attributes can now be read from the job
   # 24-Mar-2018: Bug fix: Public method run() can now correctly 
   #               handle a param value of nil
@@ -68,23 +69,21 @@ class RScript < RScriptBase
      ajob = '' 
       args.each_index do |i| 
         if args[i].to_s[/\/\/#{@jobname}:/] then          
-          ajob = "@id='#{$'}'"; args[i] = nil
-          puts 'ajob: ' + ajob.inspect
+          ajob = $'; args[i] = nil
         end
       end
 
       args.compact!
-
-      out, attr = read_rsf(args) do |doc|
-        job = doc.root.element("//#{@jobname}[#{ajob}]")
-        [job.xpath('script').map {|s| read_script(s)}.join("\n"), job.attributes]        
-      end      
+      
+      a = read_rsfdoc(args)      
+      job = a.assoc(ajob.to_sym)
+      out, attr = job[:code], job[:attributes]
 
       raise "job not found" unless out.length > 0
       out
       
     else    
-      out = read_rsf(args) {|doc| doc.root.xpath('//script').map {|s| read_script(s)}}.join("\n")   
+      out = read_rsfdoc(args).map {|x| x.last[:code]}.join("\n")
     end    
           
     @log.info 'RScript/read: code: '  + out.inspect if @log
@@ -138,26 +137,35 @@ class RScript < RScriptBase
   end  
   
   private    
-      
-  def read_rsf(args=[])
+  
+  def build_a(rsfile)
+    
+    buffer = read_sourcecode(rsfile) 
+    doc =  Rexle.new(buffer)
+
+    doc.root.xpath("//#{@jobname}").inject([]) do |r,x|
+      codeblock = x.xpath('//script')\
+          .map {|s| read_script(s)}.join("\n")
+      r << [x.attributes[:id].to_sym, {attributes: x.attributes, 
+                                            code: codeblock}]
+    end        
+    
+  end      
+  
+  def read_rsfdoc(args=[])
     
     puts 'args: ' + args.inspect if @debug
     rsfile = args[0]; args.shift
     
     $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
     
-    buffer = if @cache then
-      @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
-    else
-      read_sourcecode(rsfile)
-    end
+    a = @cache ? @rsf_cache.read(rsfile) { build_a(rsfile) } : build_a(rsfile)
 
     @url_base = rsfile[/\w+:\/\/[^\/]+/]
+    
+    return a
 
-    doc =  Rexle.new(buffer)
-    yield(doc)
-
-  end          
+  end    
   
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   TqGxWMRGelsOt2zNIFH+8d4Yz1dYsNbhK66Q8KRR2vHoT/9T3IJGBPHdsR6Kl6yB
   e5SlxbsP/R/Leg==
   -----END CERTIFICATE-----
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache
@@ -59,20 +59,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement