roda 3.28.0 → 3.29.0

data/spec/route_spec.rb

@@ -1,39 +0,0 @@
-require_relative "spec_helper"
-
-describe "Roda.route" do
-  it "should set the route block" do
-    pr = proc{'123'}
-    app.route(&pr)
-    app.route_block.must_equal pr
-    body.must_equal '123'
-  end
-
-  it "should work if called in subclass and parent class later frozen" do
-    a = app
-    @app = Class.new(a)
-    @app.route{|r| "OK"}
-    body.must_equal "OK"
-    a.freeze
-    body.must_equal "OK"
-    app.freeze
-    body.must_equal "OK"
-  end
-
-  deprecated "should support #call being overridden" do
-    app.class_eval do
-      def call; super end
-    end
-    app.route{'123'}
-    body.must_equal '123'
-  end
-
-  deprecated "should support #_call" do
-    pr = proc{env['PATH_INFO']}
-    app{_call(&pr)}
-    body.must_equal '/'
-  end
-
-  deprecated "should be callable without a block" do
-    app.route.must_be_nil
-  end
-end

data/spec/session_middleware_spec.rb

@@ -1,129 +0,0 @@
-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

@@ -1,37 +0,0 @@
-require_relative "spec_helper"
-
-describe "session handling" do
-  include CookieJar
-
-  it "should give a warning if session variable is not available" do
-    app do |r|
-      begin
-        session
-      rescue Exception => e
-        e.message
-      end
-    end
-
-    body.must_match("You're missing a session handler, try using the sessions plugin.")
-  end
-
-  it "should return session if rack session middleware is used" do
-    app(:bare) do
-      use Rack::Session::Cookie, :secret=>'1'
-
-      route do |r|
-        r.on do
-          (session[1] ||= 'a'.dup) << 'b'
-          session[1]
-        end
-      end
-    end
-
-    _, _, b = req
-    b.join.must_equal 'ab'
-    _, _, b = req
-    b.join.must_equal 'abb'
-    _, _, b = req
-    b.join.must_equal 'abbb'
-  end
-end

data/spec/spec_helper.rb

@@ -1,137 +0,0 @@
-$:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
-
-if ENV['WARNING']
-  require 'warning'
-  Warning.ignore([:missing_ivar, :method_redefined, :not_reached], File.dirname(File.dirname(__FILE__)))
-end
-
-if ENV['COVERAGE']
-  require 'coverage'
-  require 'simplecov'
-
-  def SimpleCov.roda_coverage(opts = {})
-    start do
-      enable_coverage :branch if ENV['BRANCH_COVERAGE']
-      add_filter "/spec/"
-      add_group('Missing'){|src| src.covered_percent < 100}
-      add_group('Covered'){|src| src.covered_percent == 100}
-      yield self if block_given?
-    end
-  end
-
-  ENV.delete('COVERAGE')
-  SimpleCov.roda_coverage
-end
-
-require_relative "../lib/roda"
-require "stringio"
-
-ENV['MT_NO_PLUGINS'] = '1' # Work around stupid autoloading of plugins
-gem 'minitest'
-require "minitest/global_expectations/autorun"
-
-$RODA_WARN = true
-def (Roda::RodaPlugins).warn(s)
-  return unless $RODA_WARN
-  $stderr.puts 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)
-      env = path
-    else
-      env['PATH_INFO'] = path.dup
-    end
-    env['HTTP_COOKIE'] = @cookie if @cookie
-
-    a = super(env)
-    if set = a[1]['Set-Cookie']
-      @cookie = set.sub(/(; path=\/)?(; secure)?; HttpOnly/, '')
-    end
-    a
-  end
-end
-
-class Minitest::Spec
-  def self.deprecated(a, &block)
-    it("#{a} (deprecated)") do
-      begin
-        $RODA_WARN = false
-        instance_exec(&block)
-      ensure
-        $RODA_WARN = true
-      end
-    end
-  end
-
-  def app(type=nil, &block)
-    case type
-    when :new
-      @app = _app{route(&block) if block}
-    when :bare
-      @app = _app(&block)
-    when Symbol
-      @app = _app do
-        plugin type
-        route(&block)
-      end
-    else
-      if block
-        @app = _app{route(&block)}
-      else
-        @app ||= _app{}
-      end
-    end
-  end
-
-  def req(path='/', env={})
-    if path.is_a?(Hash)
-      env = path
-    else
-      env['PATH_INFO'] = path.dup
-    end
-
-    env = {"REQUEST_METHOD" => "GET", "PATH_INFO" => "/", "SCRIPT_NAME" => ""}.merge(env)
-    @app.call(env)
-  end
-  
-  def status(path='/', env={})
-    req(path, env)[0]
-  end
-
-  def header(name, path='/', env={})
-    req(path, env)[1][name]
-  end
-
-  def body(path='/', env={})
-    s = String.new
-    b = req(path, env)[2]
-    b.each{|x| s << x}
-    b.close if b.respond_to?(:close)
-    s
-  end
-
-  def _app(&block)
-    c = Class.new(Roda)
-    c.class_eval(&block)
-    c
-  end
-
-  def with_rack_env(env)
-    ENV['RACK_ENV'] = env
-    yield
-  ensure
-    ENV.delete('RACK_ENV')
-  end
-end

data/spec/version_spec.rb

@@ -1,14 +0,0 @@
-require_relative "spec_helper"
-
-describe "Roda version constants" do
-  it "RodaVersion should be a string in x.y.z integer format" do
-    Roda::RodaVersion.must_match(/\A\d+\.\d+\.\d+\z/)
-  end
-
-  it "Roda*Version and RodaVersionNumber should be integers" do
-    Roda::RodaMajorVersion.must_be_kind_of(Integer)
-    Roda::RodaMinorVersion.must_be_kind_of(Integer)
-    Roda::RodaPatchVersion.must_be_kind_of(Integer)
-    Roda::RodaVersionNumber.must_be_kind_of(Integer)
-  end
-end

data/spec/views/_test.erb

@@ -1 +0,0 @@
-<h1><%= title %></h1>

data/spec/views/a.erb

@@ -1 +0,0 @@
-a

data/spec/views/a.rdoc

@@ -1,2 +0,0 @@
-# a
-# * b

data/spec/views/about.erb

@@ -1 +0,0 @@
-<h1><%= title %></h1>

data/spec/views/about.str

@@ -1 +0,0 @@
-<h1>#{title}</h1>

data/spec/views/about/_test.erb

@@ -1 +0,0 @@
-<h1>Subdir: <%= title %></h1>

data/spec/views/about/comp_test.erb

@@ -1 +0,0 @@
-about-ct

data/spec/views/b.erb

@@ -1 +0,0 @@
-b

data/spec/views/c.erb

@@ -1 +0,0 @@
-c

data/spec/views/comp_layout.erb

@@ -1 +0,0 @@
-a<%= yield %>b

data/spec/views/comp_test.erb

@@ -1 +0,0 @@
-ct

data/spec/views/content-yield.erb

@@ -1 +0,0 @@
-This is the actual content.

data/spec/views/each.str

@@ -1 +0,0 @@
-r-#{each if local_variables.include?(:each)}-#{foo if local_variables.include?(:foo)}

data/spec/views/home.erb

@@ -1,2 +0,0 @@
-<h1>Home</h1>
-<p>Hello <%= name %></p>

data/spec/views/home.str

@@ -1,2 +0,0 @@
-<h1>Home</h1>
-<p>Hello #{name}</p>

data/spec/views/iv.erb

@@ -1 +0,0 @@
-<%= @a %>

data/spec/views/layout-alternative.erb

@@ -1,2 +0,0 @@
-<title>Alternative Layout: <%= title %></title>
-<%= yield %>

data/spec/views/layout-yield.erb

@@ -1,3 +0,0 @@
-Header
-<%= yield %>
-Footer

data/spec/views/layout.erb

@@ -1,2 +0,0 @@
-<title>Roda: <%= title %></title>
-<%= yield %>

data/spec/views/layout.str

@@ -1,2 +0,0 @@
-<title>Roda: #{ title }</title>
-#{ yield }

data/spec/views/multiple-layout.erb

@@ -1 +0,0 @@
-<%= title %>:<%= a %>::<%= yield %>

data/spec/views/multiple.erb

@@ -1 +0,0 @@
-<%= title %>:<%= b %>