rack-rscript 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67eaf987c95218ab325c90f6cdc5950a91d83ec4
-  data.tar.gz: b351e24514900fd5f9d9ac6db045e69799af0c75
+  metadata.gz: e6bf34f921036c9bb60b380fb41e64280db27289
+  data.tar.gz: 52f2d2b76ee05e29c1575d876b601c1ff2225a9f
 SHA512:
-  metadata.gz: 90139ab92d16f29258861fc9cfc11df3126aa4a59d41e511bcb5c9dd5fec15231dde62b287210a213da8452dd50604e4544727cb1772758274093f253c43fb7c
-  data.tar.gz: d220fbc8ee425c9e93bb61176eea4a51b5eb8176e5507e89559ff7df9deece05e90d32beacded05365e7a6bcebb86c253e86eff864802aa9313f9790d30cd67d
+  metadata.gz: a7a072f5034d81ab1ec3afeb2b803822f8c674f94784443e2fd068c6a85db5146c4363682619c8edbf07a200b796a8419eb89d22f9b519351031a6b80402f4bd
+  data.tar.gz: d8913dcf856a2e1b08c2c04352cdcb95a70d2745b146771c547bdcfe4abc2d8934f0ce6d7ca23489170ef76b0155afdd4d39cca0b79956aef3ed2bc00c22d205

data/lib/rack-rscript.rb

@@ -97,61 +97,7 @@ class RackRscript
       raw_request
     end
     
-    content, content_type, status_code = run_route(request, env['REQUEST_METHOD'])
-
-    if content.is_a? Redirect then
-      
-      redirectx = content
-      res = Rack::Response.new
-      res.redirect(redirectx.to_url)
-      res.finish      
-      
-    else
-
-      e = $!
-
-      if e then
-        content, status_code = e, 500
-        @log.debug 'RackRscript/call/error: ' + e if @log
-      elsif content.nil? then
-        content, status_code  = "404: page not found", 404             
-      end      
-
-      tilt_proc = lambda do |s, content_type| 
-        type = content_type[/[^\/]+$/]
-        s = [s,{}] unless s.is_a? Array
-        content, options = s
-        [Tilt[type].new() {|x| content}.render(self, options), 'text/html']
-      end
-      
-      passthru_proc = lambda{|c, ct| [c,ct]}
-      
-                              
-      
-      ct_list = {
-        'text/html' => passthru_proc,
-        'text/haml' => tilt_proc,
-        'text/slim' => tilt_proc,
-        'text/plain' => passthru_proc,
-        'text/xml' => passthru_proc,
-        'text/css' => passthru_proc,
-        'text/markdown' => passthru_proc,
-        'application/xml' => passthru_proc,
-        'application/xhtml' => passthru_proc,
-        'application/json' => passthru_proc,
-        'image/png' => passthru_proc,
-        'image/jpeg' => passthru_proc,
-        'image/svg+xml' => passthru_proc      
-      }
-      
-      content_type ||= 'text/html'
-      status_code ||= 200                  
-      proc = ct_list[content_type]
-      proc ||= passthru_proc
-      content, content_type = proc.call(content, content_type)      
-      
-      [status_code, {"Content-Type" => content_type}, [content]]
-    end
+    run_request(request)
 	end
 
   def clear_cache()
@@ -162,7 +108,8 @@ class RackRscript
 
     if @params[:splat] then
       @params.each do  |k,v|
-        @params.delete k unless k == :splat or k == :package or k == :job or k == :captures
+        @params.delete k unless k == :splat or k == :package \
+            or k == :job or k == :captures
       end
     end  
     
@@ -174,7 +121,7 @@ class RackRscript
       @params.merge! h
     end
     
-    @params.merge! @req_params
+    @params.merge! @req.params
     result, args = @rrscript.read([url, jobs.split(/\s/), \
       qargs].flatten)
 
@@ -225,7 +172,8 @@ class RackRscript
     end    
 
     get /\/(.*)\/do\/(\w+)\/(\w+)/ do |d, package,job|
-      run_job(("%s%s/%s.rsf" % [@url_base, d, package]), "//job:" + job, params) 
+      run_job(("%s%s/%s.rsf" % [@url_base, d, package]), 
+              "//job:" + job, params) 
     end    
 
     post '/do/:package/:job' do |package,job|
@@ -307,6 +255,67 @@ class RackRscript
     end
 
   end
+  
+  def run_request(request)
+    
+    content, content_type, status_code = run_route(request, 
+                                                   @env['REQUEST_METHOD'])    
+    
+    if content.is_a? Redirect then
+      
+      redirectx = content
+      res = Rack::Response.new
+      res.redirect(redirectx.to_url)
+      res.finish      
+      
+    else
+
+      e = $!
+
+      if e then
+        content, status_code = e, 500
+        @log.debug 'RackRscript/call/error: ' + e if @log
+      elsif content.nil? then
+        content, status_code  = "404: page not found", 404             
+      end      
+
+      tilt_proc = lambda do |s, content_type| 
+        type = content_type[/[^\/]+$/]
+        s = [s,{}] unless s.is_a? Array
+        content, options = s
+        [Tilt[type].new() {|x| content}.render(self, options), 'text/html']
+      end
+      
+      passthru_proc = lambda{|c, ct| [c,ct]}
+                                          
+      ct_list = {
+        'text/html' => passthru_proc,
+        'text/haml' => tilt_proc,
+        'text/slim' => tilt_proc,
+        'text/plain' => passthru_proc,
+        'text/xml' => passthru_proc,
+        'text/css' => passthru_proc,
+        'text/markdown' => passthru_proc,
+        'application/xml' => passthru_proc,
+        'application/xhtml' => passthru_proc,
+        'application/json' => passthru_proc,
+        'image/png' => passthru_proc,
+        'image/jpeg' => passthru_proc,
+        'image/svg+xml' => passthru_proc      
+      }
+      
+      content_type ||= 'text/html'
+      status_code ||= 200                  
+      proc = ct_list[content_type]
+      proc ||= passthru_proc
+      content, content_type = proc.call(content, content_type)      
+      
+      [status_code, {"Content-Type" => content_type}, [content]]
+    end    
+    
+  end
+  
+  alias jumpto run_request
 
   private
 
@@ -322,7 +331,7 @@ class RackRscript
     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]) }
+      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]}
@@ -335,10 +344,15 @@ class RackRscript
   end                  
 
   def tilt(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 = 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   vvLi4Y0qQy/Uz/kHVXzfeLcG657aNIu8ogA1I3Xnlz0sqlNoDhk5sSBd2BsfkVFS
   sTo/69YTrLx1zw==
   -----END CERTIFICATE-----
-date: 2018-07-22 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack

metadata.gz.sig

@@ -1 +1 @@
-T��ѝ`�G��g�.�PŦâ(e,�k^UU/L/���F�~`>�@@��4��h=[ad��|�YGC�c`li',U�חM��ؾ+(�j�xF ��=q�vM"sss O�:���.dpg�~10u+#�:K�="����3�*�4�Y�H��F����qv؜T�"fL�G�'��RqW�cj��&f��;�O�D���1<����ok�����v����ܧF%|��ܷX�9�P�%�>C*THt;`L�
+^��1��+�G��!/�h�2�+����V��r�o�b*p%���ל:�K��<�Zݠ�C���E�7O�QT�� 3㥲ĺg��JF�����	��C�,�J���NKt�{D�p��ʋ���c�D�xƿ.>��H@�)3$�L�	6^��v[r�D�.8��q�C���Vu�#U�E$�+ƛ���5fi;���锷���ݽw���-�������]�	9�h;���y�.@�ƾo%!�g�p��}���