rack-rscript 0.4.0 → 0.4.2

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.
Files changed (2) hide show
  1. data/lib/rack-rscript.rb +18 -17
  2. metadata +16 -7
data/lib/rack-rscript.rb CHANGED
@@ -25,7 +25,7 @@ class RackRscript
25
25
  default_routes(@params)
26
26
  end
27
27
 
28
- def call(env)
28
+ def call(env)
29
29
  request = env['REQUEST_URI'][/https?:\/\/[^\/]+(.*)/,1]
30
30
 
31
31
  log Time.now.to_s + ": " + request
@@ -34,24 +34,10 @@ class RackRscript
34
34
 
35
35
  content_type ||= 'text/html'
36
36
  status_code ||= 200
37
- [status_code, {"Content-Type" => content_type}, [content]]
38
- end
39
-
40
- private
41
-
42
- def default_routes(params)
43
-
44
- get '/do/:package/:job' do |package,job|
45
- run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params)
46
- end
47
-
48
- get '/do/:package/:job/*' do |package, job|
49
- raw_args = params[:splat]
50
- args = raw_args.join.split('/')[1..-1]
51
- run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
52
- end
37
+ [status_code, {"Content-Type" => content_type}, [content]]
53
38
  end
54
39
 
40
+
55
41
  def run_job(url, jobs, params={}, *qargs)
56
42
  if params[:splat] and params[:splat].length > 0 then
57
43
  h = params[:splat].first[1..-1].split('&').inject({}) do |r,x|
@@ -77,7 +63,22 @@ class RackRscript
77
63
  ($!).to_s
78
64
  end
79
65
  end
66
+
67
+ private
68
+
69
+ def default_routes(params)
80
70
 
71
+ get '/do/:package/:job' do |package,job|
72
+ run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params)
73
+ end
74
+
75
+ get '/do/:package/:job/*' do |package, job|
76
+ raw_args = params[:splat]
77
+ args = raw_args.join.split('/')[1..-1]
78
+ run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
79
+ end
80
+ end
81
+
81
82
  def log(msg)
82
83
  if @log == true then
83
84
  @logger.debug msg
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.0
5
+ version: 0.4.2
6
6
  platform: ruby
7
7
  authors:
8
8
  - James Robertson
@@ -10,11 +10,10 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2012-02-26 00:00:00 +00:00
14
- default_executable:
13
+ date: 2012-05-22 00:00:00 Z
15
14
  dependencies:
16
15
  - !ruby/object:Gem::Dependency
17
- name: app-routes
16
+ name: rack
18
17
  prerelease: false
19
18
  requirement: &id001 !ruby/object:Gem::Requirement
20
19
  none: false
@@ -25,7 +24,7 @@ dependencies:
25
24
  type: :runtime
26
25
  version_requirements: *id001
27
26
  - !ruby/object:Gem::Dependency
28
- name: rscript
27
+ name: app-routes
29
28
  prerelease: false
30
29
  requirement: &id002 !ruby/object:Gem::Requirement
31
30
  none: false
@@ -35,6 +34,17 @@ dependencies:
35
34
  version: "0"
36
35
  type: :runtime
37
36
  version_requirements: *id002
37
+ - !ruby/object:Gem::Dependency
38
+ name: rscript
39
+ prerelease: false
40
+ requirement: &id003 !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ">="
44
+ - !ruby/object:Gem::Version
45
+ version: "0"
46
+ type: :runtime
47
+ version_requirements: *id003
38
48
  description:
39
49
  email:
40
50
  executables: []
@@ -45,7 +55,6 @@ extra_rdoc_files: []
45
55
 
46
56
  files:
47
57
  - lib/rack-rscript.rb
48
- has_rdoc: true
49
58
  homepage:
50
59
  licenses: []
51
60
 
@@ -69,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
69
78
  requirements: []
70
79
 
71
80
  rubyforge_project:
72
- rubygems_version: 1.5.2
81
+ rubygems_version: 1.8.23
73
82
  signing_key:
74
83
  specification_version: 3
75
84
  summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.