rack-rscript 0.4.9 → 0.5.0
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.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/lib/rack-rscript.rb +17 -7
- data.tar.gz.sig +0 -0
- metadata +16 -2
- metadata.gz.sig +1 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 55972a208542517da8beba86637de37f933782c3
|
|
4
|
+
data.tar.gz: 9d61daaff9c6f99598ffbbe45b585bd3c3827584
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 264e35690081f7b5fab48af4447becf1d4b16e7168532575bd18687d1778fea16622c2ebedee888031b3a89d8b0ad149e717f7c42501d093a5a8638ce995b831
|
|
7
|
+
data.tar.gz: 506b439e1e559adfd235f391dbc8325cfa6e8ad298264efed408cb8160edd9c46e4a8a3d88494558f8dc3eb76256a2327471b39ee3a9155f287654821ebd2f9a
|
checksums.yaml.gz.sig
CHANGED
|
Binary file
|
data/lib/rack-rscript.rb
CHANGED
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
|
|
6
6
|
require 'rscript'
|
|
7
7
|
require 'app-routes'
|
|
8
|
-
require 'requestor'
|
|
9
8
|
require 'logger'
|
|
9
|
+
require 'haml'
|
|
10
10
|
|
|
11
11
|
class Redirect
|
|
12
12
|
attr_reader :to_url
|
|
@@ -34,7 +34,7 @@ class RackRscript
|
|
|
34
34
|
end
|
|
35
35
|
|
|
36
36
|
super() # required for app-routes initialize method to exectue
|
|
37
|
-
default_routes(@params)
|
|
37
|
+
default_routes(@env, @params)
|
|
38
38
|
end
|
|
39
39
|
|
|
40
40
|
def call(env)
|
|
@@ -43,6 +43,8 @@ class RackRscript
|
|
|
43
43
|
|
|
44
44
|
log "_: " + env.keys.inspect
|
|
45
45
|
log Time.now.to_s + "_: " + env.inspect
|
|
46
|
+
|
|
47
|
+
default_routes(env,@params)
|
|
46
48
|
content, content_type, status_code = run_route(request)
|
|
47
49
|
|
|
48
50
|
if content.is_a? Redirect then
|
|
@@ -57,9 +59,16 @@ class RackRscript
|
|
|
57
59
|
log(e) if e
|
|
58
60
|
content, status_code = "404: page not found", 404
|
|
59
61
|
end
|
|
62
|
+
|
|
63
|
+
haml_proc = lambda{|c, ct| [Haml::Engine.new(c).render, 'text/html']}
|
|
60
64
|
|
|
65
|
+
ct_list = {
|
|
66
|
+
'text/html' => lambda{|c, ct| [c,ct]},
|
|
67
|
+
'text/haml' => haml_proc, 'application/haml' => haml_proc
|
|
68
|
+
}
|
|
61
69
|
content_type ||= 'text/html'
|
|
62
|
-
status_code ||= 200
|
|
70
|
+
status_code ||= 200
|
|
71
|
+
content, content_type = ct_list[content_type].call(content, content_type)
|
|
63
72
|
|
|
64
73
|
[status_code, {"Content-Type" => content_type}, [content]]
|
|
65
74
|
end
|
|
@@ -67,7 +76,7 @@ class RackRscript
|
|
|
67
76
|
|
|
68
77
|
|
|
69
78
|
def run_job(url, jobs, params={}, *qargs)
|
|
70
|
-
|
|
79
|
+
|
|
71
80
|
if @params[:splat] then
|
|
72
81
|
@params.each do |k,v|
|
|
73
82
|
@params.delete k unless k == :splat or k == :package or k == :job or k == :captures
|
|
@@ -80,10 +89,11 @@ class RackRscript
|
|
|
80
89
|
v ? r.merge(k[/\w+$/].to_sym => v) : r
|
|
81
90
|
end
|
|
82
91
|
@params.merge! h
|
|
83
|
-
end
|
|
92
|
+
end
|
|
84
93
|
|
|
85
94
|
result, args = RScript.new.read([url, jobs.split(/\s/), \
|
|
86
95
|
qargs].flatten)
|
|
96
|
+
|
|
87
97
|
rws = self
|
|
88
98
|
|
|
89
99
|
begin
|
|
@@ -110,7 +120,7 @@ class RackRscript
|
|
|
110
120
|
|
|
111
121
|
private
|
|
112
122
|
|
|
113
|
-
def default_routes(params)
|
|
123
|
+
def default_routes(env, params)
|
|
114
124
|
|
|
115
125
|
get '/do/:package/:job' do |package,job|
|
|
116
126
|
run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params)
|
|
@@ -124,4 +134,4 @@ class RackRscript
|
|
|
124
134
|
|
|
125
135
|
end
|
|
126
136
|
|
|
127
|
-
end
|
|
137
|
+
end
|
data.tar.gz.sig
CHANGED
|
Binary file
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rack-rscript
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.5.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- James Robertson
|
|
@@ -29,7 +29,7 @@ cert_chain:
|
|
|
29
29
|
PrSIAHSciIEyWkxdvMiXuEOAU+cBA3uVHTfpn/QHpap2lC3rCNFDCt1jdNhsvPJW
|
|
30
30
|
P8hoKd8f6iDnTJw4mqinZSTTIweaDo1s
|
|
31
31
|
-----END CERTIFICATE-----
|
|
32
|
-
date: 2013-
|
|
32
|
+
date: 2013-08-17 00:00:00.000000000 Z
|
|
33
33
|
dependencies:
|
|
34
34
|
- !ruby/object:Gem::Dependency
|
|
35
35
|
name: rack
|
|
@@ -73,6 +73,20 @@ dependencies:
|
|
|
73
73
|
- - '>='
|
|
74
74
|
- !ruby/object:Gem::Version
|
|
75
75
|
version: '0'
|
|
76
|
+
- !ruby/object:Gem::Dependency
|
|
77
|
+
name: haml
|
|
78
|
+
requirement: !ruby/object:Gem::Requirement
|
|
79
|
+
requirements:
|
|
80
|
+
- - '>='
|
|
81
|
+
- !ruby/object:Gem::Version
|
|
82
|
+
version: '0'
|
|
83
|
+
type: :runtime
|
|
84
|
+
prerelease: false
|
|
85
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
86
|
+
requirements:
|
|
87
|
+
- - '>='
|
|
88
|
+
- !ruby/object:Gem::Version
|
|
89
|
+
version: '0'
|
|
76
90
|
description:
|
|
77
91
|
email: james@r0bertson.co.uk
|
|
78
92
|
executables: []
|
metadata.gz.sig
CHANGED
|
@@ -1,3 +1 @@
|
|
|
1
|
-
|
|
2
|
-
I�8�"� �����O�����?���hD�B O̭b��
|
|
3
|
-
�
|
|
1
|
+
[�d��PL ��0,� `C�� �g�?z7uG�~j1��.y�Z�xd�}�2�5+B;8/����k�� ���=v�@\�� �����#?�`��+e^�?�:���7���2W���(�W/\�Y0��ɧ>���ߧ<X5u�\�oW�>ҁ����U\��eB-�o-q�6T�k���ːN9���I]@���)�n#o����z�_@l� ��$
|