srscript 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d0e739f5baffe7ec3174500b2098f3db5eb9838f
-  data.tar.gz: 93e348cf0d5aff9bdefed17d6a32f0bed24227b4
+SHA256:
+  metadata.gz: 0aaec929b472cc38c1c1ebbbd833312492376a1dddfe96f0dde1c241269c1dbf
+  data.tar.gz: 0dd51e76b3e8fb78ae987d28495c38adf89cc9bf535e7be4c4d9996a9b4bdd50
 SHA512:
-  metadata.gz: 116ac9c38504211cd45d4621b4aae54a703c352ce02ef0d74aaacea09066e0de826e650a9ea3736b365901180fc6c6a84e18c7b9a90694dc557ba1d2242b1aba
-  data.tar.gz: 4dcc7df3bd156374f5f8b68ec1625ec23127df42cd660ceb326a5a81743854fbdf2cc8aef52fe8cf3f2ba8a45fef20a3226163d5c8e09e402a936eaa07b1dacf
+  metadata.gz: 5e2ab8e3809c411c911c238c75d6670ee381b07eb091a36a54da536afeae55fd9d7fb441591fce32d4596ea6c4163db7d49ca0121cf032bfbc806cdcd49caa5f
+  data.tar.gz: cf4141b11dc97cc6815e9035cb25b80b843a7f2a5d0823ae0f55b707fc838af801d081ec84ee692497ff01213e420e9393cd6a945641d96e1cf282d373a5ab30

data/lib/srscript.rb

@@ -1,355 +1,56 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 # file: srscript.rb
 
 
-require 'sinatra/base'
+require 'sinatra'
 require 'rscript'
 
-class SRScript < Sinatra::Base
-
-
-  URL_BASE = 'http://rorbuilder.info/r/heroku/' #
-
-  @@count = 0
-  @@rscript = RScript.new()
-  @@url_base = 'http://rorbuilder.info/r/heroku/' #
-  @@get_routes = {}; @@post_routes = {}
-  @@services = {}
-  @@templates = {}
-  @@app = nil
-  @content_type = 'text/html'
-
-  puts 'ready'
 
-  def initialize()
-    super
-    puts 'initialized at ' + Time.now.to_s
-  end
-
-  get '/bootstrap' do
-
-    doc = Document.new(File.open('server.xml','r').read)
-    server_name, url_base = XPath.match(doc.root, 'summary/*/text()').map(&:to_s)
-
-    url = URL_BASE + 'startup-level1.rsf'
-    run_script(url, '//job:bootstrap', server_name, url_base)
-  end
 
+class SRScriptError < Exception
+end
 
-  get '/' do
-    uri, @content_type = @@app.run_projectx('registry', 'get-key', :path => 'system/homepage/uri/text()')
-    redirect(uri.to_s)  
-  end
-
-
-  configure do
-    puts 'bootstrapping ... '
-    doc = Document.new(File.open('server.xml','r').read)
-    localhost = XPath.first(doc.root, 'summary/localhost/text()').to_s
-    Thread.new {sleep 8; open(localhost + 'bootstrap', 'UserAgent' => 'srscript')}
-  end
-
-  def run_rcscript(rsf_url, jobs, raw_args=[])
-    @@rscript.read([rsf_url, jobs.split(/\s/), raw_args].flatten)
-  end
-
-  def run_script(url, jobs, *qargs)
-    result, args = run_rcscript(url, jobs, qargs)
-    eval(result)
-  end
-
-  def display_url_run(url, jobs, opts)
-    h = {'.xml' => 'text/xml','.html' => 'text/html','.txt' => 'text/plain'}
-    @content_type = h[opts[:extension]]    
-    out = run_script(url, jobs, opts[:args])
-
-    content_type @content_type, :charset => 'utf-8' if defined? content_type
-    out
-  end
-
-  def check_url(url)
-    url = URI.parse(url)
-    Net::HTTP.start(url.host, url.port) do |http|
-      return http.head(url.request_uri).code
-    end
-  end
-
-  def package_run(package_id, job, opts={})
-    o = {
-      :extension => '.html',
-      :args => []
-    }.merge(opts)
-    jobs = "//job:" + job
-
-    url, @content_type = @@app.run_projectx('registry', 'get-key', :path => "system/packages/*[name='#{package_id}']/url/text()").map(&:to_s)
+class SRScript < Sinatra::Base
 
-    url = @@url_base + url[1..-1] if url[/^\//]
+  def initialize(pkg_src: nil, home_pg: nil)
 
-    if url then
-      display_url_run(url.to_s.sub(/^#{@@url_base}/,'\0s/open/'),jobs, o)
-    else
+    raise SRScriptError, 'pkg_src cannot be nil' unless pkg_src
 
-      code = check_url(url)
+    super()
+    @home_pg = home_pg
+    @url_base = pkg_src + '/'
 
-      if code == '200' then
-        url = "%s%s.rsf" % [@@url_base, package_id] 
-        display_url_run(url,jobs, o)
-      else
-        # 404
-        url = url_base + 'open-uri-error.rsf'
-        run_script(url, '//job:with-code', code)
-      end
-    end
+    @rscript = RScriptRW.new pkg_src: pkg_src
 
   end
 
   get '/' do
-    uri, @content_type = @@app.run_projectx('registry', 'get-key', :path => 'system/homepage/uri/text()')
-    redirect(uri.to_s)  
-  end
-
-  get %r{^\/([a-zA-Z0-9\-]+)$} do 
-    raw_url, @content_type = @@app.run_projectx('registry', 'get-key', :path => 'system/uri_aliases/url/text()')
-    url = raw_url.to_s.clone
-    
-    #url.sub!('http://rscript.rorbuilder.info/','\0s/open/')
-    doc = Document.new(open(url, "UserAgent" => "Sinatra-Rscript").read)
-    
-    #url = @@url_base + "alias.xml?passthru=1"
-    #doc = Document.new(open(url, "UserAgent" => "Sinatra-Rscript").read)
-    node = XPath.first(doc.root, "records/alias[name='#{params[:captures][0]}' and type='r']")
-
-    if node.nil? and not @@get_routes.has_key? params[:captures][0] then
-      url = "%s%s/index.xml" % [@@url_base, params[:captures][0]]
-      status = check_url url
-
-      redirect params[:captures][0] + '/' if status == '200'
-      # url = ...
-      # redirect url if check_url ""params[:alias] == '200'
-      pass
-    else
-      pass
-    end
-    uri = node.text('uri').to_s
-
-    redirect uri
-  end
-
-  get '/:directory/' do  
-    open("%s%s/index.xml" % [@@url_base, params[:directory]] , 'UserAgent' => 'S-Rscript').read
-  end
-
-  get '/css/:css' do
-
-    css = params[:css]
-    key = 'css/' + css
-
-    if @@get_routes.has_key? key then
-      out, @content_type = @@get_routes[key].call(params)
-      @content_type ||= 'text/css'
-      content_type @content_type, :charset => 'utf-8'
-      out
-    else
-      rsf_job, @content_type = @@app.run_projectx('registry', 'get-key', :path => "system/css/*[name='css/#{css}']/rsf_job/text()")
-      if rsf_job then
-        redirect rsf_job.to_s 
-      else
-        # 404
-      end
-    end
-  end
-
-  get '/:form/form' do
-
-    form = params[:form]
-    key = form + '/form'
-
-    if @@get_routes.has_key? key then
-      out, @content_type = @@get_routes[key].call(params)
-      @content_type ||= 'text/html'
-      content_type @content_type, :charset => 'utf-8'
-      out
-    else
-      rsf_job, @content_type = @@app.run_projectx('registry', 'get-key', :path => "system/forms/*[name='#{form}/form']/rsf_job/text()")
-      if rsf_job then
-        puts 'job found'
-        redirect rsf_job.to_s 
-      else
-        # 404
-      end
-    end
+    package, job = @home_pg.split('#',2)
+    run_job("%s%s.rsf" % [@url_base, package], job, params)
   end
 
-  get '/:form/form/*' do
-
-    form = params[:form]
-    key = form + '/form'
-    args = params[:splat]
-
-    if @@get_routes.has_key? key then
-      out, @content_type = @@get_routes[key].call(params, args)
-      @content_type ||= 'text/html'
-      content_type @content_type, :charset => 'utf-8'
-      out
-    else
-      rsf_job, @content_type = @@app.run_projectx('registry', 'get-key', :path => "system/forms/*[name='#{form}/form']/rsf_job/text()")
-      if rsf_job then
-        file_path = args.length > 0 ? '/' + args.join('/') : ''
-        puts 'form file_path : ' + file_path.to_s
-        redirect rsf_job.to_s  + file_path
-      else
-        # 404
-      end
-    end
-  end
-
-  get '/do/:package_id/:job' do
-    package_id = params[:package_id] #
-    job, extension = params[:job][/\.\w{3}$/] ? [$`, $&] : [params[:job], '.html']
-    package_run(package_id, job, {:extension => extension})
-  end
+  get '/do/:package/:job/*' do
 
-  get '/view-source/:package_id/:job' do
-    package_id = params[:package_id] #
-    *jobs = params[:job] 
-
-    #url = "%s%s.rsf" % [url_base, package_id]
-    url, @content_type = @@app.run_projectx('registry', 'get-key', :path => "system/packages/*[name='#{package_id}']/url/text()")
-    if url then
-
-      #redirect rsf_job.to_s 
-      buffer = open(url.to_s.sub(/^http:\/\/rscript.rorbuilder.info\//,'\0s/open/'), "UserAgent" => 'Sinatra-Rscript').read
-      content_type 'text/plain', :charset => 'utf-8'
-      doc = Document.new(buffer)
-
-      jobs.map!{|x| "@id='%s'" % x}
-      doc.root.elements.to_a("//job[#{jobs.join(' or ')}]").map do |job|
-        job.to_s
-      end
-    end
-
-
-  end
-
-  get '/do/:package_id/:job/*' do
-    h = {'.xml' => 'text/xml','.html' => 'text/html','.txt' => 'text/plain'}
-    package_id = params[:package_id] #
-    job, extension = params[:job][/\.\w{3}$/] ? [$`, $&] : [params[:job], '.html']
-    jobs = "//job:" + job
-    raw_args = params[:splat]
+    raw_args = params['splat']
     args = raw_args.join.split('/')
-
-    package_run(package_id, job, {:extension => extension, :args => args})
+    run_job("%s%s.rsf" % [@url_base, params['package']], params['job'],
+      params, :get, args)
 
   end
 
-  get '/view-source/:package_id' do
-    package_id = params[:package_id] #
-    #url = "%s%s.rsf" % [url_base, package_id]
-    url, @content_type = @@app.run_projectx('registry', 'get-key', :path => "system/packages/*[name='#{package_id}']/url/text()")
-    if url then
-      buffer = open(url.to_s.sub(/^http:\/\/rscript.rorbuilder.info\//,'\0s/open/'), "UserAgent" => 'Sinatra-Rscript').read
-      content_type 'text/plain', :charset => 'utf-8'
-      buffer
-    end
+  get '/do/:package/:job' do |package,job|
+    run_job("%s%s.rsf" % [@url_base, package], job, params)
   end
 
-  get '/do/:package_id/' do
-    redirect "/do/r/p/" + params[:package_id]
-  end
+  private
 
+  def run_job(url, job, params={}, type=:get, *qargs)
 
-  # projectx request
-  get '/p/:project_name/:method_name' do
-    project_name = params[:project_name]
-    method_name = params[:method_name]
-    r, @content_type = @@app.run_projectx(project_name, method_name, request.params)  
-    
-    @content_type ||= 'text/html'
-    content_type @content_type, :charset => 'utf-8'
-    # todo: implement a filter to check for rexml objects to be converted to a string
-    r
-  end
-
-
-  # projectx request
-  get '/p/projectx' do
-    xml_project = request.params.to_a[0][1]
-    projectx_handler(xml_project)
-  end
-
-  get '/load/:package_id/:job' do
-
-    package_id = params[:package_id] #
-    job, extension = params[:job][/\.\w{3}$/] ? [$`, $&] : [params[:job], '.html']
-    load_rsf_job2(package_id, job, route=package_id + '/' + job, extension)
-  end
-
-
-
-  def follow_route(routes, key)
-    if routes.has_key? key then      
-      routes[key].call(params)
-      
-    else
-      route = routes.detect {|k,v| key[/#{k}/]}
-
-      if route then
-        remaining = $'
-        if remaining then
-          args = remaining.split('/')
-          args.shift
-        else
-          args = []
-        end
-
-        route[1].call( params, args)
-
-      else
-        puts '@@app is ' + @@app.inspect
-        out, @content_type = @@app.run_projectx('dir', 'view', {:file_path => key, :passthru => params[:passthru]})
-        [out, @content_type]
-        #puts "no match"
-      end
-    end
-  end
-
-  # custom routes
-  get '/*' do
-    key = params[:splat].join
-
-    if params.has_key? 'edit' and params[:edit] = '1' then
-      # fetch the editor
-      # we first need to know the file type
-      # open the xml file
-      url = @@url_base + key
-      buffer = open(url.to_s.sub(/^http:\/\/rscript.rorbuilder.info\//,'\0s/open/'), "UserAgent" => 'Sinatra-Rscript').read
-      doc = Document.new(buffer)
-      recordx_type = XPath.first(doc.root, 'summary/recordx_type/text()').to_s
-      uri, @content_type = @@app.run_projectx('registry', 'get-key', :path => "system/recordx_editor/#{recordx_type}/uri/text()")
-      editor_url = @@url_base + uri.to_s + '/' + key
-
-      redirect editor_url
-    else
-    
-      out, content_type = follow_route(@@get_routes, key)  
-      #puts out
-      puts 'Content type : ' + content_type unless content_type.nil?
-      content_type ||= 'text/html'
-      content_type        content_type, :charset => 'utf-8'
-      out
-    end
-  end
+    @rscript.type = type
+    result, args = @rscript.read([url, '//job:' + job, qargs].flatten)
+    r = eval result
 
-  post '/*' do
-    key = params[:splat].join
-    out, content_type = follow_route(@@post_routes, key)
-    #puts 'sss' + out.to_s
-    #out = follow_route(@@post_routes, key)
-    content_type ||= 'text/html'
-    content_type  content_type, :charset => 'utf-8'  
-    out
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: srscript
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,57 +10,75 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIxMDYyN1oXDTE0MDIwNjIxMDYyN1owSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBANd9dfY4pYA20eSePArM2mbotk15L2F7Qg9TWAsCfWWqltZwoMg9UX19LjGR
-  P9k3znGXZsZufo91Xosx67st2E1iwL3OlTfdxok7NaJ7QYU6668qY2C4K/f0RtMs
-  guNM+dJly8r8KdLJ66HJ5bXvf+MQ+RvRSxqIYt0LsA81JZEy2rQXcOx2F6q+S2OJ
-  qKqaqEGyq7PicShXzJocyGtQvf538dfF/edCLD79iEIUbHokYJALFsuCknOiXffR
-  qCzMqPZke40T4gjK0qXjjtQQQNvi+rKgv27+k02181117BPZLLj/pHM9B9/Owx/M
-  DhFWYPvCuUyDy+VfzlaXXgT0u30CAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQUKHg/9vNIaGCbbkTNigc/OfnNHzYwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQC2aHH+cBVLQf8MKW+vz4/15qXV/qRfVo+uL3QQEZjtX13XrgGfjrLL
-  ZQYJ9Qx7rWRJNtQbxG1OEJFViX7QH5r+ElnhyteWa0LenYpsLXf2Rdqny9Pd2Zhh
-  CQOwDCDXKt12rvh95eWKdtavk5jobVLGWZlX1pPbKXBjr3Ua1BmddIKMDM0sijzv
-  aPkBMJTgV6D0ToN5DojyPWGys7xUAnC2drd57ztKK9mZPlVUVUP7ZmTIpTncgMJQ
-  ZDjUblT6kOoS2GYI+2MxVyMsWc4tKtCX7Zbzv5h7uX57FgL0AdKxpXfDbMKMk+Tv
-  iFh4gBdpaP47qEQUk0iiURIX2/vjlEBl
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMzA5MjIzNjE1WhcN
+  MjMwMzA5MjIzNjE1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDHKxjh
+  ZpGjjKRT4iIosaCoTSoqIfZ39SUU0V2nY5aTCY6WA1/GYDr2rcobxxSNa9P6cA6B
+  xKdKWUBKoU1A8Zfrv2fKJU5r5TKnFZod7KaGJQLSCcZA5hDOV0tt6qPKhZaAmlKm
+  XLp4yQXtDDGsTPtD1zCMCBH6B3PrWSaP6wwevRg5rG5mLcM/I+PBN9W2uocpTZN1
+  DUPjVXlo0vUzFErzf1YqowbgL70gZNYaIXbh94eSAJqIl32VfNNM+0rESNd9yYty
+  3dRiYvLnYh1dA5RmDdNQaajU8+uHMfidfgqgEpvuAvC+c017lriTP/LRAewZRg1J
+  aAvgXTgCjRdqF3SKX1ErWgdc+hivGkque0huAUk4QQ1vTJytvyuH7og6lSORg29F
+  sQVzHHAihLu4N3UTjhm0B+I7R/ROhK1G8W453HBhXZDQjWohLJSsmsNvkyl1DDu2
+  P11hNYay3zYr5L9t6v7Pq1vmCTF/3o921ACb0vKb9IiqhO1gDy6rprSZAckCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU5Xn66R4k
+  A1lOu07s8nG0Q3O8hRcwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAU+mpOg2I7sm+9fKRedWEfF+luyt+hNwymZ7uwAMF
+  8nPytLkvc0QWFxGPjThQ0hyqgqWCLd7FjGFKwA+w4uPg2II0Gnc3ma57MCEroYtr
+  cJxRA6F12HNY8zctS8rqEn6qYy9ah0ZVIgJDHN3wrnyR9L9of0k8J1FJbrcseyvl
+  IoWLe0QeSnvGaWQDCLU11dYcTy5ZvGOEpMPISsQ5gtCEoXdT2EIX8pQ0aogOE6/8
+  qsPY+HWMhVeiCoUGT4gBWV27Pm1tkh0nSdoIMJiSiVfhfWyKRLqTdzsGpS6G1XAh
+  U12gY1Lt1MrgDDcgmCLu4N7CxVJx/eVkS9V7cu65Q2D5YMe9IL9C7jgUZmB4oZkA
+  W60Ynnyc+GlLuzw+mI84MWVK/tf749G1XsaMvx2nnp86qdGfLf7xrGWawbKWJxi3
+  2z1HlZv8zwgUdcV5iOVRfftvVqIXZESN34zxHHSgp9A0zmsLDe0wbOSybmRVGNhj
+  tWWpys05YhRty+oDHm6vgumf
   -----END CERTIFICATE-----
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rscript
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: 
-email: james@r0bertson.co.uk
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -76,18 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: srscript
+summary: A Sinatra based web server used as a rscript proxy.
 test_files: []