dandelion_s1 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4a05e6e6bb8ae9266772efd9cb0acb112a9ea080
-  data.tar.gz: 96bc27d7c4d69e0c2d264270dd32f7be33ae27a9
+SHA256:
+  metadata.gz: 742f9d5aa097f2f2d5063ef9a719c393dbcb47d8d57631e766f0b6e021b842ea
+  data.tar.gz: 545c3ebdad0f17c382f64f81b849df7d4cbfeeafd9cbdcb67b84937d8324a871
 SHA512:
-  metadata.gz: 26d04e12c6e4c99b20112703fd461176499e73868b75ba86f208acd204cf69e044e33b8e18b4abf9db527dbae6477b5a904581ba5ebc0887d30e86d01947144d
-  data.tar.gz: 41ac1772805b24e868b916d36b5a54e9c2cfb5ed8931afc357098f17d7796677c1c2a2173627cc3b2c06a2192c406845f279429c3462e27dca565f8140cdf6e4
+  metadata.gz: 1ce3f848f51b192e2504def32c99981c540088517196d3b739fa425e608284d8867a0892e519b69e6d1857947da8c4da02716722bbc2bb09325989a02da20abb
+  data.tar.gz: 9bc34f279f800a4f5c57391ef866832fed6f02ee2268c0c44ab568f67c03f1e2dac17a9bc87707361b7f51ef56c8b76ae2abc3b32dd7ec5ed59a711b973d16ca

checksums.yaml.gz.sig

@@ -1,2 +1,4 @@
-�p���摜��S/����M�s-��ZI����J�F4F�"fO�G��'x�"}06Jˑ6z\9��Z�3'�y�W$љ�H�@Y�t��b-��#�sBZ*y�b���U����-�`�I܈��B��ކ�H���%�*�90Ψ<�J�~���{f��c�s�
-lU2�.G����A&�C;�� ��C­	�a���(#f����b̖R�
+���5ݿ]O�:�O(Ǜ5^o
+�a���_oHh�-��1�x�n �C�&zkz�Re	wþRI
+=k�����ɮ�
+�r��#��@h� _!$l@w(��d��S�A�,sg�I�H"�J(7�W��H�g9f�{�R�D�m_E;�����<��ve%]�����5��0��j��5��qB,�,���K�������3�a
,

data/lib/dandelion_s1.rb

@@ -32,12 +32,15 @@ class DandelionS1 < RackRscript
         .inject({}) {|r,x| r.merge(x => h[x])}
     
     super(h3)
+    @log.debug '@access_list: ' + @access_list.inspect if @log    
+    @log.debug 'end of initialize' if @log
     
   end
 
   def call(e)
 
     request = e['REQUEST_PATH']
+    @log.debug 'request: ' + request.inspect if @log
     
     return super(e) if request == '/login'
     r = @access_list.detect {|k,v| request =~ Regexp.new(k)} if @access_list
@@ -46,7 +49,9 @@ class DandelionS1 < RackRscript
     req = Rack::Request.new(e)
     user = req.session[:username]
 
-    return jumpto '/login' unless user
+    #@log.debug 'user: ' + user.inspect if @log
+    #@log.debug '@e: ' + e.inspect if @log
+    return jumpto '/login2?referer=' + e['PATH_INFO'] unless user
     
     if private_user.nil? then
       super(e)
@@ -63,10 +68,16 @@ class DandelionS1 < RackRscript
   
   def default_routes(env, params) 
     
-    get '/login' do
-      
-      login_form()
-      
+    log = @log
+    
+    get '/login2/*' do
+      params[:splat].inspect
+      redirect '/login' + params[:splat].first
+    end
+    
+    get '/login/*' do      
+      url = params[:splat].any? ? params[:splat][0][/(?<=referer=).*/] : '/'
+      login_form(referer: url)      
     end    
     
     post '/login' do
@@ -76,13 +87,15 @@ class DandelionS1 < RackRscript
       if @passwords[h['username']] == h['password'] then
         
         @req.session[:username] = h['username']
-        'you are now logged in as ' + h['username']
+        #'you are now logged in as ' + h['username']
+        redirect h['referer']
         
       else
         
         login_form('Invalid username or password, try again.',401)
         
       end
+
       
     end
         
@@ -119,7 +132,7 @@ class DandelionS1 < RackRscript
  
   end   
   
-  def login_form(msg='Log in to this site.', http_code=200)
+  def login_form(msg='Log in to this site.', http_code=200, referer: '/')
     
 s=<<EOF      
 p #{msg}
@@ -127,8 +140,9 @@ p #{msg}
 login
   username: [     ]
   password: [     ]
-
-  [login]('/login')
+  [! referer: #{referer}
+   ]
+  [login](/login)
 EOF
 
     [Martile.new(s).to_s, 'text/slim', http_code]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dandelion_s1
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   1N8hBgTHd/hcz/i08u1weglfL0QBkOx9HzswCq9Iuesya/Zb40PJIbW4/A2pKm0o
   eek=
   -----END CERTIFICATE-----
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-rscript
@@ -41,7 +41,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: simple-config
   requirement: !ruby/object:Gem::Requirement
@@ -78,20 +78,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.1.5
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -118,8 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A kind of Rack-Rscript web server which facilitates static files, cookie