rack-rscript 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2d9082990c984616d9a1e5df565d4691931b996646569380500cfef752ff0af
-  data.tar.gz: 851c3dcf2920516de03778abda5bcbee715e846a419431758fb8756992319023
+  metadata.gz: 35ab3661aa2c2f191b140e28dbda3805f32a97e6a3eaf6c1f410e30f411d6b6c
+  data.tar.gz: b6d2ba9fd30c7ae71571f69918583c8206cd0d5dbebd89dd796e4f35d44662d0
 SHA512:
-  metadata.gz: e97d68f52d58c1fe00e019a51a8579b2aab3046dc4c82602f5857a88e91821542fc608f0e2f99a599a8becb9388599645911ea0c0ef46966abfa4aa553464e60
-  data.tar.gz: f25c004d25a0c65fc94900a1fcd3342e6f47849daf5a0ffab8f989ef172aceb5d69c0369459e2772c41928ceb9bcae74758d65d04a1380eee1a3e72422a1fe12
+  metadata.gz: 216dc0e7c0e24231bf0e0fbb7d6cd5550cf9bf027a37b860102f909a378c608c78c806f51ab1b170a4b5880d0fc021311cd23d2d42782b56dc200ffa15eacde4
+  data.tar.gz: da45f89a5e37161bf83a9c63cdc8830e69ed949241f004990db59e67e7d21d33d9533932df96de08f5136339d1d61b81589d73fa9814149a0fe20997a93f0845

data/lib/rack-rscript.rb

@@ -34,7 +34,7 @@ class RackRscript
   include RXFHelperModule
   using ColouredText
   
-  attr_reader :req
+  attr_reader :req, :rsc
   
   
   def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: nil, 
@@ -73,7 +73,7 @@ class RackRscript
     end
 
     super() # required for app-routes initialize method to exectue
-    default_routes(@env, @params)    
+    default_routes(@env, @params || {})    
     
     @rsc = nil
 
@@ -88,7 +88,7 @@ class RackRscript
 #=end
   end
 
-  def call(env)
+  def call(env, testmode: false)
 
 
     @env = env
@@ -96,9 +96,14 @@ class RackRscript
     #raw_request = env['REQUEST_PATH']
 
     @log.info 'RackRscript/call: ' + env.inspect if @log
-    @req = Rack::Request.new(env)
-
-    @req_params = @req.params
+    
+    if testmode == false then
+      
+      @req = Rack::Request.new(env)
+      @req_params = @req.params
+      
+    end
+    
     default_routes(env,@params)
     
     request = if @pxlinks then
@@ -110,6 +115,7 @@ class RackRscript
     
     @log.info 'RackRscript/call/request: ' + request.inspect if @log
 #=begin        
+    puts 'request: ' + request.inspect if @debug
     run_request(request)
 #=end    
 #    [200, {"Content-Type" => "text/plain"}, [env.inspect]]
@@ -119,8 +125,9 @@ class RackRscript
     @rscript.reset
   end
 
-  def run_job(url, jobs, params={}, type=:get, *qargs)
+  def run_job(url, job, params={}, type=:get, *qargs)
 
+    puts 'inside run_job' if @debug
     @log.debug 'RackRscript/run_job/params: ' + params.inspect if @log
     @log.debug 'RackRscript/run_job/qargs: ' + qargs.inspect if @log
     
@@ -139,9 +146,20 @@ class RackRscript
       @params.merge! h
     end
     
-    @params.merge! @req.params
+    @params.merge! @req.params if @req
     @rscript.type = type
-    result, args = @rscript.read([url, jobs.split(/\s/), \
+    
+    if not @rscript.jobs(url).include?(job.to_sym) then
+      
+      if @rscript.jobs(url).include?(:job_missing) then
+        job = 'job_missing' 
+      else
+        [404, 'job not found']
+      end
+
+    end
+    
+    result, args = @rscript.read([url, '//job:' + job, \
       qargs].flatten)
 
     rws = self
@@ -149,14 +167,29 @@ class RackRscript
     req = @req if @req
     
     begin
+
+      if @debug then
+        puts @rscript.jobs(url).inspect 
+        puts 'job: ' + job.inspect
+        puts 'url: ' + url.inspect
+        puts '@initialized: ' + @initialized.inspect
+        bflag = @rscript.jobs(url).include?(:initialize) and \
+            !@initialized[url] and job != 'initialize'
+        puts 'bflag: ' + bflag.inspect
+      end
       
-      if @rscript.jobs(url).include? :initialize and 
-          !@initialized[url]  and jobs != 'initialize' then
-        @rscript.run([url, '//job:initialize'])
+      if @rscript.jobs(url).include?(:initialize) and 
+          !@initialized[url]  and job != 'initialize' then
+        puts 'before run initialize' if @debug
+        r2 = @rscript.read([url, '//job:initialize'])        
+        puts 'r2: ' + r2.inspect if @debug
+        eval r2.join
         @initialized[url] = true
       end
       
+
       r = eval result
+
       return r
 
     rescue Exception => e  
@@ -196,33 +229,37 @@ class RackRscript
     
     get '/do/:package/:job' do |package,job|
       @log.info 'RackRscript/route/do/package/job: ' + [package, job].inspect if @log
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params)  
+      run_job("%s%s.rsf" % [@url_base, package], job, params)  
     end    
 
-    get /\/(.*)\/do\/(\w+)\/(\w+)/ do |d, package,job|
-      run_job(("%s%s/%s.rsf" % [@url_base, d, package]), 
-              "//job:" + job, params) 
+    get /\/(.*)\/do\/(\w+)\/(\w+)$/ do |d, package,job|
+      run_job(("%s%s/%s.rsf" % [@url_base, d, package]), job, params)
     end    
+    
+    get /\/(.*)\/do\/(\w+)\/(\w+)\/(.*)/ do |d, package, job, raw_args|
+      args = raw_args.split('/')
+      run_job(("%s%s/%s.rsf" % [@url_base, d, package]), job, params, :get, args)
+    end      
 
     post '/do/:package/:job' do |package,job|
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, :post)  
+      run_job("%s%s.rsf" % [@url_base, package], job, params, :post)  
     end
     
     get '/do/:package/:job/*' do |package, job|
       raw_args = params[:splat]
       args = raw_args.first[/[^\s\?]+/].to_s.split('/')[1..-1]
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, :get, args)
+      run_job("%s%s.rsf" % [@url_base, package], job, params, :get, args)
     end
 
     post '/do/:package/:job/*' do |package, job|
       raw_args = params[:splat]
       args = raw_args.first[/[^\s\?]+/].to_s.split('/')[1..-1]
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, :post, args)
+      run_job("%s%s.rsf" % [@url_base, package], job, params, :post, args)
     end
 
     get '/source/:package/:job' do |package,job|
       url = "%s%s.rsf" % [@url_base, package]
-      [@rscript.read([url, '//job:' + job]).first, 'text/plain']
+      [@rscript.read([url, job]).first, 'text/plain']
     end    
 
     get '/source/:package' do |package,job|
@@ -313,7 +350,8 @@ class RackRscript
     method_type = @env ? @env['REQUEST_METHOD'] : 'GET'
     content, content_type, status_code = run_route(request, method_type)    
     @log.info 'RackRscript/run_request/content: ' + content.inspect if @log
-    
+    #puts 'content: ' + content.inspect if @debug
+
     #@log.debug 'inside run_request' if @log
     if content.is_a? Redirect then
       
@@ -372,45 +410,9 @@ class RackRscript
   alias jumpto run_request
 
   private
-
-  def render99(name, type, opt={})
-    
-    options = {locals: {}}.merge!(opt)
-    locals = options.delete :locals
-    
-    unless @templates[:layout] then
-      template(:layout, type) { File.read('views/layout.' + type.to_s) }
-    end
-    
-    layout = Tilt[type.to_s].new(options) {|x| @templates[:layout][:content]}    
-
-    unless @templates[name] then
-      template(name, type) { File.read("views/%s.%s" % [name.to_s, type.to_s])}
-    end    
-
-    template = Tilt[type.to_s].new(options) {|x| @templates[name][:content]}
-    layout.render{ template.render(self, locals)}
-  end            
-  
+            
   def template(name, type=nil, &blk)
     @render.template name, type, &blk
-  end   
-  
-  def template99(name, type=nil, &blk)
-    @templates.merge!({name => {content: blk.call, type: type}})
-    @templates[name]
-  end                  
-
-  def tilt99(name, options={})
-    
-    options = {locals: {}}.merge!(opt)
-    locals = options.delete :locals
-    layout = Tilt[@templates[:layout][:type].to_s].new(options)\
-        {|x| @templates[:layout][:content]}
-    template = Tilt[@templates[name][:type].to_s].new(options) \
-        {|x| @templates[name][:content]}
-    layout.render{ template.render(self, locals)}
-    
-  end    
+  end     
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   tilHf4Ok7vnZYPnxQk5PY3q28lYoflnB47YIc0pdkJHI1M3YXL/HxrcZCEIHAU3W
   aTCBK3Pk2/LQtqaW3yaSg73t
   -----END CERTIFICATE-----
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -166,7 +166,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: polyrex-links
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.