rack-rscript 0.4.4 → 0.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/rack-rscript.rb +8 -4
- metadata +2 -2
data/lib/rack-rscript.rb
CHANGED
|
@@ -47,22 +47,26 @@ class RackRscript
|
|
|
47
47
|
|
|
48
48
|
def run_job(url, jobs, params={}, *qargs)
|
|
49
49
|
|
|
50
|
+
if @params[:splat] then
|
|
51
|
+
@params.each do |k,v|
|
|
52
|
+
@params.delete k unless k == :splat or k == :package or k == :job or k == :captures
|
|
53
|
+
end
|
|
54
|
+
end
|
|
55
|
+
|
|
50
56
|
if @params[:splat] and @params[:splat].length > 0 then
|
|
51
57
|
h = @params[:splat].first[1..-1].split('&').inject({}) do |r,x|
|
|
52
58
|
k, v = x.split('=')
|
|
53
|
-
r.merge(k.to_sym => v)
|
|
59
|
+
r.merge(k[/\w+$/].to_sym => v)
|
|
54
60
|
end
|
|
55
61
|
@params.merge! h
|
|
56
62
|
end
|
|
57
63
|
|
|
58
|
-
|
|
59
64
|
result, args = RScript.new.read([url, jobs.split(/\s/), \
|
|
60
65
|
qargs].flatten)
|
|
61
66
|
rws = self
|
|
62
67
|
|
|
63
68
|
begin
|
|
64
69
|
r = eval result
|
|
65
|
-
#@params = {}
|
|
66
70
|
return r
|
|
67
71
|
|
|
68
72
|
rescue Exception => e
|
|
@@ -89,7 +93,7 @@ class RackRscript
|
|
|
89
93
|
|
|
90
94
|
get '/do/:package/:job/*' do |package, job|
|
|
91
95
|
raw_args = params[:splat]
|
|
92
|
-
args = raw_args.
|
|
96
|
+
args = raw_args.first[1..-1][/.[\/\w]+/].split('/')
|
|
93
97
|
run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
|
|
94
98
|
end
|
|
95
99
|
end
|
metadata
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
name: rack-rscript
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
4
|
prerelease:
|
|
5
|
-
version: 0.4.
|
|
5
|
+
version: 0.4.5
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
8
8
|
- James Robertson
|
|
@@ -10,7 +10,7 @@ autorequire:
|
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
12
|
|
|
13
|
-
date: 2012-
|
|
13
|
+
date: 2012-08-01 00:00:00 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rack
|