roda 3.9.0 → 3.10.0

data/spec/plugin/typecast_params_spec.rb

@@ -274,6 +274,17 @@ describe "typecast_params plugin" do
     tp.array!(:Integer, 'b').must_equal [2, 3]
     lambda{tp.array!(:Integer, 'd')}.must_raise @tp_error
     lambda{tp.array!(:Integer, 'g')}.must_raise @tp_error
+
+    a = 1
+    @app.plugin :hooks
+    @app.before do
+      request.define_singleton_method(:params){{'a'=>a}}
+    end
+    tp.Integer('a').must_equal 1
+    a = 1.0
+    tp.Integer('a').must_equal 1
+    a = 1.1
+    lambda{tp.Integer('a')}.must_raise @tp_error
   end
 
   it "#float should convert to float" do

data/spec/session_middleware_spec.rb

@@ -0,0 +1,129 @@
+require_relative "spec_helper"
+
+if RUBY_VERSION >= '2'
+require 'roda/session_middleware'
+
+describe "RodaSessionMiddleware" do 
+  include CookieJar
+
+  it "operates like a session middleware" do
+    sess = nil
+    env = nil
+
+    app(:bare) do
+      use RodaSessionMiddleware, :secret=>'1'*64
+
+      route do |r|
+        r.get('s', String, String){|k, v| session[k.to_sym] = v}
+        r.get('g',  String){|k| session[k.to_sym].to_s}
+        r.get('c'){|k| session.clear; ''}
+        r.get('sh'){|k| env = r.env; sess = session; ''}
+        ''
+      end
+    end
+
+    _, h, b = req('/')
+    h['Set-Cookie'].must_be_nil
+    b.must_equal ['']
+
+    _, h, b = req('/s/foo/bar')
+    h['Set-Cookie'].must_match(/\Aroda\.session=(.*); path=\/; HttpOnly(; SameSite=Lax)?\z/m)
+    b.must_equal ['bar']
+    body('/s/foo/bar').must_equal 'bar'
+    body('/g/foo').must_equal 'bar'
+
+    body('/s/foo/baz').must_equal 'baz'
+    body('/g/foo').must_equal 'baz'
+
+    body("/s/foo/\u1234").must_equal "\u1234"
+    body("/g/foo").must_equal "\u1234"
+
+    body("/c").must_equal ""
+    body("/g/foo").must_equal ""
+
+    body('/s/foo/bar')
+    body("/sh").must_equal ""
+
+    sess.must_be_kind_of RodaSessionMiddleware::SessionHash
+    sess.req.must_be_kind_of Roda::RodaRequest
+    sess.data.must_be_nil
+    sess.options[:secret].must_equal('1'*64)
+    sess.inspect.must_include "not yet loaded"
+    sess.loaded?.must_equal false
+
+    a = []
+    sess.each{|k, v| a << k << v}
+    a.must_equal %w'foo bar'
+    sess.data.must_equal("foo"=>"bar")
+    sess.inspect.must_equal '{"foo"=>"bar"}'
+    sess.loaded?.must_equal true
+
+    sess[:foo].must_equal "bar"
+    sess['foo'].must_equal "bar"
+
+    sess.fetch(:foo).must_equal "bar"
+    sess.fetch('foo').must_equal "bar"
+    proc{sess.fetch('foo2')}.must_raise KeyError
+    sess.fetch(:foo, "baz").must_equal "bar"
+    sess.fetch('foo', "baz").must_equal "bar"
+    sess.fetch('foo2', "baz").must_equal "baz"
+
+    sess.has_key?(:foo).must_equal true
+    sess.has_key?("foo").must_equal true
+    sess.has_key?("bar").must_equal false
+    sess.key?("foo").must_equal true
+    sess.key?("bar").must_equal false
+    sess.include?("foo").must_equal true
+    sess.include?("bar").must_equal false
+    
+    sess[:foo2] = "bar2"
+    sess['foo2'].must_equal "bar2"
+    sess.store('foo3', "bar3").must_equal "bar3"
+    sess['foo3'].must_equal "bar3"
+
+    env['roda.session.created_at'] = true
+    env['roda.session.updated_at'] = true
+    sess.clear.must_equal({})
+    sess.data.must_equal({})
+    env['roda.session.created_at'].must_be_nil
+    env['roda.session.updated_at'].must_be_nil
+
+    sess['a'] = 'b'
+    env['roda.session.created_at'] = true
+    env['roda.session.updated_at'] = true
+    sess.destroy.must_equal({})
+    sess.data.must_equal({})
+    env['roda.session.created_at'].must_be_nil
+    env['roda.session.updated_at'].must_be_nil
+
+    sess[:foo] = "bar"
+    sess.to_hash.must_equal("foo"=>"bar")
+    sess.to_hash.wont_be_same_as(sess.data)
+
+    sess.update("foo2"=>"bar2", :foo=>"bar3").must_equal("foo"=>"bar3", "foo2"=>"bar2")
+    sess.data.must_equal("foo"=>"bar3", "foo2"=>"bar2")
+    sess.merge!("foo2"=>"bar4").must_equal("foo"=>"bar3", "foo2"=>"bar4")
+
+    sess.replace("foo2"=>"bar5", :foo3=>"bar").must_equal("foo3"=>"bar", "foo2"=>"bar5")
+    sess.data.must_equal("foo3"=>"bar", "foo2"=>"bar5")
+
+    sess.delete(:foo3).must_equal("bar")
+    sess.data.must_equal("foo2"=>"bar5")
+    sess.delete("foo2").must_equal("bar5")
+    sess.data.must_equal({})
+
+    sess.exists?.must_equal true
+    env.delete('roda.session.serialized')
+    sess.exists?.must_equal false
+
+    sess.empty?.must_equal true
+    sess[:foo] = "bar"
+    sess.empty?.must_equal false
+    sess.keys.must_equal ["foo"]
+    sess.values.must_equal ["bar"]
+
+    
+    
+  end
+end
+end

data/spec/session_spec.rb

@@ -12,10 +12,10 @@ describe "session handling" do
       end
     end
 
-    body.must_match(/use Rack::Session::Cookie/)
+    body.must_match("You're missing a session handler, try using the sessions plugin.")
   end
 
-  it "should return session if available" do
+  it "should return session if rack session middleware is used" do
     app(:bare) do
       use Rack::Session::Cookie, :secret=>'1'
 

data/spec/spec_helper.rb

@@ -36,6 +36,15 @@ def (Roda::RodaPlugins).warn(s)
   puts caller.grep(/_spec\.rb:\d+:/)
 end
 
+if ENV['RODA_RACK_SESSION_COOKIE'] != '1'
+  require_relative '../lib/roda/session_middleware'
+  DEFAULT_SESSION_MIDDLEWARE_ARGS =  [RodaSessionMiddleware, :secret=>'1'*64]
+  DEFAULT_SESSION_ARGS = [:plugin, :sessions, :secret=>'1'*64]
+else
+  DEFAULT_SESSION_MIDDLEWARE_ARGS = [Rack::Session::Cookie, :secret=>'1']
+  DEFAULT_SESSION_ARGS = [:use, Rack::Session::Cookie, :secret=>'1']
+end
+
 module CookieJar
   def req(path='/', env={})
     if path.is_a?(Hash)
@@ -47,7 +56,7 @@ module CookieJar
 
     a = super(env)
     if set = a[1]['Set-Cookie']
-      @cookie = set.sub("; path=/; HttpOnly", '')
+      @cookie = set.sub(/(; path=\/)?(; secure)?; HttpOnly/, '')
     end
     a
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -205,6 +205,7 @@ extra_rdoc_files:
 - doc/release_notes/3.6.0.txt
 - doc/release_notes/3.8.0.txt
 - doc/release_notes/3.9.0.txt
+- doc/release_notes/3.10.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -248,6 +249,7 @@ files:
 - doc/release_notes/2.9.0.txt
 - doc/release_notes/3.0.0.txt
 - doc/release_notes/3.1.0.txt
+- doc/release_notes/3.10.0.txt
 - doc/release_notes/3.2.0.txt
 - doc/release_notes/3.3.0.txt
 - doc/release_notes/3.4.0.txt
@@ -327,6 +329,7 @@ files:
 - lib/roda/plugins/route_csrf.rb
 - lib/roda/plugins/run_append_slash.rb
 - lib/roda/plugins/run_handler.rb
+- lib/roda/plugins/sessions.rb
 - lib/roda/plugins/shared_vars.rb
 - lib/roda/plugins/sinatra_helpers.rb
 - lib/roda/plugins/slash_path_empty.rb
@@ -344,6 +347,7 @@ files:
 - lib/roda/plugins/typecast_params.rb
 - lib/roda/plugins/unescape_path.rb
 - lib/roda/plugins/view_options.rb
+- lib/roda/session_middleware.rb
 - lib/roda/version.rb
 - spec/all.rb
 - spec/assets/css/app.scss
@@ -425,6 +429,7 @@ files:
 - spec/plugin/route_csrf_spec.rb
 - spec/plugin/run_append_slash_spec.rb
 - spec/plugin/run_handler_spec.rb
+- spec/plugin/sessions_spec.rb
 - spec/plugin/shared_vars_spec.rb
 - spec/plugin/sinatra_helpers_spec.rb
 - spec/plugin/slash_path_empty_spec.rb
@@ -446,6 +451,7 @@ files:
 - spec/redirect_spec.rb
 - spec/request_spec.rb
 - spec/response_spec.rb
+- spec/session_middleware_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb
@@ -488,7 +494,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 3.0.0.beta1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Routing tree web toolkit