rack-rscript 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 875cbf1083ade035659604b1213379e3805e3aa0
-  data.tar.gz: cc138f396e38d7d4a516d3e7354594a41467646d
+  metadata.gz: b667f493e91891962a5c7faf606bd8c2aedcc5fe
+  data.tar.gz: 9edf50304adf17122603d4faa2d1466a3bd34cd8
 SHA512:
-  metadata.gz: 32b39e8bf085b27df48f84e90dcb6717640de45fd125e4fe0c8c04bfe1d93008f2017fef41cb5f0179cdc274c8a5fa6a996db93bfb2925f00d017c632f0f40ad
-  data.tar.gz: cc844b85081fdced5c58be772b76fd3e699f6a5109be4888bd2211806f395ec5817757f9b25c20b1f10e3d2cf638fc758a92cc3ea007a2313d2274d863d6e9d7
+  metadata.gz: eef3cc82c16906d5befc5b00f7142af99c24be094a29a95b6eb55a6d87185d0f4ce4774b18f45e3d2570ec831ef89c558546d8bee57615732c702662041f4095
+  data.tar.gz: a82bee559a6e1340fdfcd9752dc024ab05f9fdb305ee1f88106330b50b0811885f97cf68f4c2adde4bb6b38c493448050d8cae735f80089ae394faf2e4459293

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-D�h*"����<�Z����ā�Ł,�^�����L��爋��r<&��ư��l�0�$�\�2I~ӛ��ћZ�"o��|Se�8�hQ2�)��W�j�
-+H/4�5Fr��v�*8#~�]�?�����P� ��R�x���1x/Z�0������T��ҫ��Θ�H�
+Ơ� cY%�)�O��u!����B������x��w
+l.G��T/�j$�%Ѿ��b>�He�r�[���a�-���#ŝ׹ey]��B�?����,@�3��h{B�vb���կ��m��̣��%�M�`�
������C�8d����K��R��<R��QR��]A�]���d��h���ᝯ��1́�����9H��3���E[n�hD��lf�qЄ�:�a$�m�o�H�Cd%w���M<��Y� �CB�\$����;��y
+�˛������!�

data/lib/rack-rscript.rb

@@ -9,7 +9,7 @@ require 'logger'
 require 'haml'
 require 'slim'
 require 'tilt'
-require 'websocket-eventmachine-client'
+
 
 class Redirect
   attr_reader :to_url
@@ -25,16 +25,15 @@ end
 class RackRscript
   include AppRoutes
 
-  attr_reader :ws
 
   def initialize(raw_opts={})
+    
     @params = {}
     @templates = {}
     
     @rrscript = RScript.new
     
-    opts = {logfile: '', logrotate: 'daily', pkg_src: '', sps_port: 59000}\
-      .merge(raw_opts)
+    opts = {logfile: '', logrotate: 'daily', pkg_src: ''}.merge(raw_opts)
     @url_base = opts[:pkg_src] # web server serving the RSF files
     @url_base += '/' unless @url_base[-1] == '/'
     
@@ -48,36 +47,10 @@ class RackRscript
     super() # required for app-routes initialize method to exectue
     default_routes(@env, @params)
 
-    if opts[:sps_address] then
-
-      c = WebSocket::EventMachine::Client
-
-      Thread.new do   
-
-        EM.run do
-
-          @ws = c.connect(uri: "ws://%s:%s" % [opts[:sps_address], opts[:sps_port]])
-
-          @ws.onopen do
-            #puts "Client connected"          
-          end
-
-          @ws.onclose do
-            #puts "Client disconnected"
-          end
-
-          EventMachine.error_handler{ |e|
-            #puts "Error raised during event loop: #{e.message}"
-          
-          }
-      
-        end
-       
-      end
-    end  
   end
 
-        def call(env)
+  def call(env)
+    
     @env = env
     request = env['REQUEST_URI'][/https?:\/\/[^\/]+(.*)/,1]
 
@@ -90,10 +63,12 @@ class RackRscript
     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 = $!
@@ -222,8 +197,19 @@ class RackRscript
     end    
 
      get '/source/:package' do |package,job|
+       
        url = "%s%s.rsf" % [@url_base, package]
-       [open(url,'User-Agent' => 'Rack-Rscript'){|x| x.read },'text/plain']
+       
+       begin
+         
+        [RXFHelper.read(url).first,'text/plain']
+        
+       rescue
+         
+        ['url: ' + url + '; ' + ($!).inspect + \
+            'couldn\'t find that package', 'text/plain']
+       end
+
     end    
     
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MDIxMTE4NDI0M1oXDTE1MDIxMTE4NDI0M1owSDESMBAG
+  8ixkARkWAmV1MB4XDTE1MDkxNzA5NDcwM1oXDTE2MDkxNjA5NDcwM1owSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAKrmZWUHCJqXvmbZM19hQCrprAw5qj4gDIQC1cr18BMcn95FSPqWvF5kjVkf
-  hPXJJx6SACMZOxCClzmZiCHRBYkPqc1S0lyqaeheu8L0Iwym/q1X9NFpBVdvaC+B
-  rmWp7mXWz0N7PW5LYOqtI68KClbwOF/CdI4jVPPxDM9xsKe2jlBH+vFIEi4BHbPk
-  V4EO4Aftu4OCkmn6LwxxQYZlp2MlMVYO6XlOlGbf/1m+N733xd3sQnl4gXllzt9z
-  VG+s+QYeCnclRFnf5hQnQF+n6n22OaJ9THOOPShehmr6YT1RBPtvryIKqZrZ7Kyx
-  vF8K+90Oe0Def19G8Vt9PWdRFfUCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUlTif++QeRscsUvPUY+qPCD9igIowJgYDVR0RBB8w
+  ggEBALGcfGgWzgzBat6hON+dQd5WREffbge7u+Qz/e8hL+UEGC4R9RtzJkKhF/Bl
+  sJ+Uo3Uso+4ZX+ZJv8jVdrvQEKmX7sNy1nONCctO8yO51Ur/nvctOArqA86QQQ5x
+  hPN7rNz/2gVL87AzPo4GSetaYU7hn0uCrZc30t6m53x5xflJe+XCbV1HKFXG638k
+  wtYPPFlBwIDc7NiWe1+SYOLdZsMwCUn6fdUDuebB8NSvm+NeDWTK7GdzhZ5gBxXU
+  KHl0bWt7B18hkr12KFePmNGo8QpIFrxogu1uFBZCsnJ70qrMFITQf+u+NmL22D5K
+  lPvj0iRKp0H0tqKdar3YdTGLqOkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUN9PHeADXfPzEBjETz0w0kMepukIwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAXcDgSbqc
-  q7Oi4nJpHWV240DDvOItE3WY+RcWX20phdyjlesE0CmB1jgYw38EAGdIY9t1UOei
-  bBdzB4ddfFmXt40TQhSC2GFJwpiY/eh6WrT3LmKoz4lnu/EFMh3akPd+PlShDu32
-  WHbqw/wYHI2YVxEGwZsP3HjgZn4gxjWEhhSALJD8PLlf6Zzvyv+XVQyd1jD2sOEu
-  8/kNM9qjSYVjJKgXJzkLVi24Qqerj9Gqd33waxTIddWE6LjJ7TRqE9LvBoduUTcZ
-  oGNzP1rxjANUGW/2lTKop1erzGf0J+T5D99GqIMDOgY0isR8aE/vL7wcicJB/4tg
-  3HU/e1wiHvcI6A==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAOSi6uxfQ
+  nTkXo+jMmRZQLOiXwK2sfsZtGDU8AqWblBYaMRfzUlQkJcAdmgOMORv0eeTCtxrg
+  lu3+8OgcSv3xMBZFgvhGNKlkeWFkXBXHqFIQOddKG42q0gpYk7NPRYp2v0rVGDgO
+  EO0cEsMO6WXyfjitRBTKtNGbeHlFFab754ei13JKTGOD+/43sPY0FT1Olpgg9qzA
+  0eklCyS4jdItOETxkH2f5Fg8RwJVgbAQMj9jrs7rabd5wV5BHVVxQDPGjhAANyni
+  SPldGmxByaKACzPfwVD1OWtnfTgqGsJzquNqO244CsVqGhH2zKMpfEJWX9h/FVqy
+  XUT2A0hr22sJdA==
   -----END CERTIFICATE-----
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -79,20 +79,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.25
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.25
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -153,26 +153,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
-- !ruby/object:Gem::Dependency
-  name: websocket-eventmachine-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -200,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.