rscript 0.1.7 → 0.1.8

data/lib/rscript.rb

@@ -21,7 +21,7 @@
 #  http://www.opensource.org/licenses/mit-license.php
 
 
-require 'rscript_base'
+require '/home/james/learning/ruby/rscript_base'
 require 'hashcache'
 
 class RScript < RScriptBase
@@ -56,17 +56,37 @@ class RScript < RScriptBase
 
     [out, args]
   end
+
+  def reset()
+    @rsf_cache.reset
+  end
   
   private
+
+  def read_doc_rsf(args=[])
+    rsfile = args[0]; args.shift
+
+    $rsfile = rsfile[/[a-zA-z0-9]+(?=\.rsf)/]
+
+    @url_base = rsfile[/\w+:\/\/[^\/]+/]
+    buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
+
+    doc =  Document.new(buffer)
+    yield(doc)
+
+  end
+  
       
   def read_rsf(args=[])
     rsfile = args[0]; args.shift
 
     $rsfile = rsfile[/[a-zA-z0-9]+(?=\.rsf)/]
-    doc = @rsf_cache.read(rsfile) { Document.new(read_sourcecode(rsfile)) }
+    buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
+    @url_base = rsfile[/\w+:\/\/[^\/]+/]
+    doc =  Document.new(buffer)
     yield(doc)
-  end
-          
+
+  end          
   
 end
 

data/lib/rscript_base.rb

@@ -20,6 +20,7 @@ class RScriptBase
   def read_script(script)  
     out_buffer = ''
     src = script.attribute('src')
+
     if src then
       out_buffer = read_sourcecode(script.attribute('src').value.to_s)
     else
@@ -31,7 +32,6 @@ class RScriptBase
         
   def read_sourcecode(rsf)
     if rsf[/https?:\/\//] then
-      @url_base = rsf[/\w+:\/\/[^\/]+/]
       return open(rsf, "UserAgent" => "Ruby-SourceCodeReader").read
     elsif rsf[/^\//]
       return open(@url_base + rsf, "UserAgent" => "Ruby-SourceCodeReader").read

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rscript
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +00:00
+date: 2011-02-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency