roda 2.29.0 → 3.0.0

data/spec/plugin/assets_preloading_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 run_tests = true
 begin

data/spec/plugin/assets_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 require 'fileutils'
 
 run_tests = true
@@ -283,10 +283,10 @@ if run_tests
       app.compile_assets
       html = body('/test')
       html.scan(/<link/).length.must_equal 1
-      html =~ %r{href="(/assets/app\.[a-f0-9]{40}\.css)"}
+      html =~ %r{href="(/assets/app\.[a-f0-9]{64}\.css)"}
       css = body($1)
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       css.must_match(/color: ?red/)
       css.must_match(/color: ?blue/)
@@ -294,7 +294,7 @@ if run_tests
     end
 
     [[:sha256, 64, 44], [:sha384, 96, 64], [:sha512, 128, 88]].each do |algo, hex_length, base64_length|
-      it "should handle :sri option for subresource integrity for #{algo} when compiling assets" do
+      it "should handle :sri option for subresource integrity #{algo} when compiling assets" do
         app.plugin :assets, :sri=>algo
         app.compile_assets
         html = body('/test')
@@ -318,14 +318,30 @@ if run_tests
       end
     end
 
+    it "should handle :sri=>nil option for to disable subresource integrity when compiling assets" do
+      app.plugin :assets, :sri=>nil
+      app.compile_assets
+      html = body('/test')
+      html.scan(/<link/).length.must_equal 1
+      html.scan(/<script/).length.must_equal 1
+      html.wont_match %r|et" integrity="|
+      html =~ %r|href="(/assets/app\.[a-f0-9]{64}\.css)"|
+      css = body($1)
+      html =~ %r|src="(/assets/app\.head\.[a-f0-9]{64}\.js)"|
+      js = body($1)
+      css.must_match(/color: ?red/)
+      css.must_match(/color: ?blue/)
+      js.must_include('console.log')
+    end
+
     it 'should handle linking to compiled assets when a compiled asset host is used' do
       app.plugin :assets, :compiled_asset_host=>'https://cdn.example.com'
       app.compile_assets
       html = body('/test')
       html.scan(/<link/).length.must_equal 1
-      html.must_match %r{href="https://cdn\.example\.com/assets/app\.[a-f0-9]{40}\.css"}
+      html.must_match %r{href="https://cdn\.example\.com/assets/app\.[a-f0-9]{64}\.css"}
       html.scan(/<script/).length.must_equal 1
-      html.must_match %r{src="https://cdn\.example\.com/assets/app\.head\.[a-f0-9]{40}\.js"}
+      html.must_match %r{src="https://cdn\.example\.com/assets/app\.head\.[a-f0-9]{64}\.js"}
     end
 
     it 'should handle compiling assets, linking to them, and accepting requests for them when :gzip is set' do
@@ -333,10 +349,10 @@ if run_tests
       app.compile_assets
       html = body('/test')
       html.scan(/<link/).length.must_equal 1
-      html =~ %r{href="(/assets/app\.[a-f0-9]{40}\.css)"}
+      html =~ %r{href="(/assets/app\.[a-f0-9]{64}\.css)"}
       css_path = $1
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{64}\.js)"}
       js_path = $1
 
       css = body(css_path)
@@ -357,10 +373,10 @@ if run_tests
       app.plugin :assets
       app.compile_assets
       html = body('/test', 'SCRIPT_NAME'=>'/foo')
-      html =~ %r{href="/foo(/assets/app\.[a-f0-9]{40}\.css)"}
+      html =~ %r{href="/foo(/assets/app\.[a-f0-9]{64}\.css)"}
       css = body($1)
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="/foo(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="/foo(/assets/app\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       css.must_match(/color: ?red/)
       css.must_match(/color: ?blue/)
@@ -373,10 +389,10 @@ if run_tests
       app.compile_assets
       html = body('/test')
       html.scan(/<link/).length.must_equal 1
-      html =~ %r{href="(/a/bar/app\.[a-f0-9]{40}\.css)"}
+      html =~ %r{href="(/a/bar/app\.[a-f0-9]{64}\.css)"}
       css = body($1)
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="(/a/foo/app\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="(/a/foo/app\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       css.must_match(/color: ?red/)
       css.must_match(/color: ?blue/)
@@ -395,10 +411,10 @@ if run_tests
       end
       html = body('/test')
       html.scan(/<link/).length.must_equal 1
-      html =~ %r{href="(/assets/app\.assets\.css\.[a-f0-9]{40}\.css)"}
+      html =~ %r{href="(/assets/app\.assets\.css\.[a-f0-9]{64}\.css)"}
       css = body($1)
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="(/assets/app\.assets\.js\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="(/assets/app\.assets\.js\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       css.must_match(/color: ?red/)
       css.must_match(/color: ?blue/)
@@ -418,10 +434,10 @@ if run_tests
       end
       html = body('/test', 'SCRIPT_NAME'=>'/foo')
       html.scan(/<link/).length.must_equal 1
-      html =~ %r{href="/foo(/assets/app\.assets\.css\.[a-f0-9]{40}\.css)"}
+      html =~ %r{href="/foo(/assets/app\.assets\.css\.[a-f0-9]{64}\.css)"}
       css = body($1)
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="/foo(/assets/app\.assets\.js\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="/foo(/assets/app\.assets\.js\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       css.must_match(/color: ?red/)
       css.must_match(/color: ?blue/)
@@ -440,10 +456,10 @@ if run_tests
       end
       html = body('/test')
       html.scan(/<link/).length.must_equal 1
-      html =~ %r{href="(/assets/app\.assets\.css\.[a-f0-9]{40}\.css)"}
+      html =~ %r{href="(/assets/app\.assets\.css\.[a-f0-9]{64}\.css)"}
       css = body($1)
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="(/assets/app\.assets\.js\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="(/assets/app\.assets\.js\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       css.must_match(/color: ?red/)
       css.must_match(/color: ?blue/)
@@ -455,10 +471,10 @@ if run_tests
       app.compile_assets
       html = body('/test')
       html.scan(/<link/).length.must_equal 1
-      html =~ %r{href="(/assets/app\.[a-f0-9]{40}\.css)"}
+      html =~ %r{href="(/assets/app\.[a-f0-9]{64}\.css)"}
       css = body($1)
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       css.must_match(/color: ?red/)
       css.must_match(/color: ?blue/)
@@ -469,7 +485,7 @@ if run_tests
       app.compile_assets(:css)
       html = body('/test')
       html.scan(/<link/).length.must_equal 1
-      html =~ %r{href="(/assets/app\.[a-f0-9]{40}\.css)"}
+      html =~ %r{href="(/assets/app\.[a-f0-9]{64}\.css)"}
       css = body($1)
       html.scan(/<script/).length.must_equal 0
       css.must_match(/color: ?red/)
@@ -481,7 +497,7 @@ if run_tests
       html = body('/test')
       html.scan(/<link/).length.must_equal 0
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       js.must_include('console.log')
     end
@@ -491,7 +507,7 @@ if run_tests
       html = body('/test')
       html.scan(/<link/).length.must_equal 0
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       js.must_include('console.log')
     end
@@ -502,7 +518,7 @@ if run_tests
       html = body('/test')
       html.scan(/<link/).length.must_equal 0
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       js.must_include('console.log')
     end
@@ -513,7 +529,7 @@ if run_tests
       html = body('/test')
       html.scan(/<link/).length.must_equal 0
       html.scan(/<script/).length.must_equal 1
-      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      html =~ %r{src="(/assets/app\.head\.[a-f0-9]{64}\.js)"}
       js = body($1)
       js.must_include('console.log')
     end
@@ -612,13 +628,13 @@ if run_tests
 
       app.compile_assets
       File.exist?(metadata_file).must_equal true
-      app.allocate.assets([:js, :head]).must_match %r{src="(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      app.allocate.assets([:js, :head]).must_match %r{src="(/assets/app\.head\.[a-f0-9]{64}\.js)"}
 
       app.plugin :assets, :compiled=>false, :precompiled=>false
       app.allocate.assets([:js, :head]).must_equal '<script type="text/javascript"  src="/assets/js/head/app.js"></script>'
 
       app.plugin :assets, :precompiled=>metadata_file
-      app.allocate.assets([:js, :head]).must_match %r{src="(/assets/app\.head\.[a-f0-9]{40}\.js)"}
+      app.allocate.assets([:js, :head]).must_match %r{src="(/assets/app\.head\.[a-f0-9]{64}\.js)"}
     end
 
     it 'should work correctly with json plugin when r.assets is the last method called' do

data/spec/plugin/backtracking_array_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "backtracking_array plugin" do 
   it "backtracks to next entry in array if later matcher fails" do

data/spec/plugin/branch_locals_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'

data/spec/plugin/caching_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe 'response.cache_control' do
   it 'sets the Cache-Control header' do

data/spec/plugin/chunked_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'

data/spec/plugin/class_level_routing_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "class_level_routing plugin" do 
   before do

data/spec/plugin/class_matchers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 require 'date'
 
 describe "class_matchers plugin" do 

data/spec/plugin/content_for_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'
@@ -52,18 +52,13 @@ describe "content_for plugin with multiple calls to the same key" do
     end
   end
 
-  deprecated "should replace with multiple calls to the same key by default" do
-    body.strip.must_equal "bar baz"
-  end
-
   it "should replace with multiple calls to the same key if :append=>false plugin option is used" do
     app.plugin :content_for, :append => false
     body.strip.must_equal "bar baz"
   end
 
-  # RODA3: Make default behavior
   it "should append with multiple calls to the same key if :append=>true plugin option is used" do
-    app.plugin :content_for, :append => true
+    app.plugin :content_for
     body.strip.must_equal "bar foobaz"
   end
 end

data/spec/plugin/cookies_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "cookies plugin" do 
   it "should set cookies on response" do

data/spec/plugin/csrf_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'rack/csrf'

data/spec/plugin/default_headers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "default_headers plugin" do 
   it "sets the default headers to use for the response" do

data/spec/plugin/default_status_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "default_status plugin" do
   it "sets the default response status to use for the response" do

data/spec/plugin/delay_build_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "delay_build plugin" do 
   it "does not build rack app until app is called" do

data/spec/plugin/delegate_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "delegate plugin" do 
   it "adds request_delegate and response_delegate class methods for delegating" do

data/spec/plugin/delete_empty_headers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "delete_empty_headers plugin" do 
   it "automatically deletes headers that are empty" do

data/spec/plugin/disallow_file_uploads_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 if Rack.release < '1.6'
   warn "Rack #{Rack.release} used, skipping disallow_file_uploads plugin test"  
@@ -6,7 +6,7 @@ else
 describe "disallow_file_uploads plugin" do 
   it "disallows the uploading of files" do
     app do |r|
-      r['foo'][:tempfile].read
+      r.params['foo'][:tempfile].read
     end
 
     request_body = StringIO.new("------WebKitFormBoundarymwHIM9XjTTVHn3YP\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"bar.txt\"\r\nContent-Type: text/plain\r\n\r\nfoo\n\r\n------WebKitFormBoundarymwHIM9XjTTVHn3YP--\r\n")

data/spec/plugin/drop_body_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "drop_body plugin" do 
   it "automatically drops body and Content-Type/Content-Length headers for responses without a body" do

data/spec/plugin/empty_root_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "empty_root plugin" do 
   it "makes root match on emtpy path" do

data/spec/plugin/environments_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "environments plugin" do 
   before do

data/spec/plugin/error_email_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "error_email plugin" do 
   def app(opts={})

data/spec/plugin/error_handler_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "error_handler plugin" do 
   it "executes only if error raised" do

data/spec/plugin/error_mail_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'mail'
@@ -11,7 +11,7 @@ end
 
 describe "error_mail plugin" do 
   def app(opts={})
-    @emails = emails = [] unless defined?(@emails)
+    @emails = [] unless defined?(@emails)
     @app ||= super(:bare) do
       plugin :error_mail, {:to=>'t', :from=>'f'}.merge(opts)
 

data/spec/plugin/flash_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "flash plugin" do 
   it "flash.now[] sets flash for current page" do

data/spec/plugin/h_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "h plugin" do 
   it "adds h method for html escaping" do

data/spec/plugin/halt_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "halt plugin" do
   it "should still have halt return rack response as argument given it as argument" do
@@ -109,7 +109,7 @@ describe "halt plugin" do
     proc{req}.must_raise(Roda::RodaError)
   end
 
-  deprecated "should raise an error for single argument not integer, String, or Array" do
+  it "should raise an error for single argument not integer, String, or Array" do
     app(:halt) do |r|
       r.halt('a'=>'b')
     end

data/spec/plugin/hash_matcher_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "hash_matcher plugin" do 
   it "should enable the handling of arbitrary hash keys" do

data/spec/plugin/head_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "head plugin" do 
   it "considers HEAD requests as GET requests which return no body" do

data/spec/plugin/header_matchers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "accept matcher" do
   it "should accept mimetypes and set response Content-Type" do
@@ -14,10 +14,9 @@ describe "accept matcher" do
 end
 
 describe "header matcher" do
-  # RODA3: undeprecate, and switch http-accept to accept
-  deprecated "should match if header present" do
+  it "should match if header present" do
     app(:header_matchers) do |r|
-      r.on :header=>"http-accept" do
+      r.on :header=>"accept" do
         "bar"
       end
     end
@@ -38,22 +37,6 @@ describe "header matcher" do
     body("HTTP_ACCEPT" => "application/xml").must_equal  "bar-application/xml"
     status.must_equal 404
   end
-
-  # RODA3: Remove
-  it "should automatically use HTTP prefix for headers if :header_matcher_prefix is set" do
-    app(:bare) do
-      plugin :header_matchers
-      opts[:header_matcher_prefix] = true
-      route do |r|
-        r.on :header=>"accept" do |v|
-          "bar-#{v}"
-        end
-      end
-    end
-
-    body("HTTP_ACCEPT" => "application/xml").must_equal  "bar-application/xml"
-    status("ACCEPT"=>"application/xml").must_equal 404
-  end
 end
 
 describe "host matcher" do
@@ -68,8 +51,7 @@ describe "host matcher" do
     status("HTTP_HOST" => "foo.com").must_equal 404
   end
 
-  # RODA3: switch deprecated to it
-  deprecated "should match a host with a regexp" do
+  it "should match a host with a regexp" do
     app(:header_matchers) do |r|
       r.on :host=>/example/ do
         "worked"
@@ -90,17 +72,6 @@ describe "host matcher" do
     body("HTTP_HOST" => "example.com").must_equal '0'
   end
 
-  deprecated "doesn't yield host if passed a regexp" do
-    app(:header_matchers) do |r|
-      r.on :host=>/\A(.*)\.example\.com\z/ do |*m|
-        m.empty? ? '0' : m[0]
-      end
-    end
-
-    body("HTTP_HOST" => "foo.example.com").must_equal '0'
-  end
-
-  # RODA3: Remove :host_matcher_captures setting
   it "yields host if passed a regexp and opts[:host_matcher_captures] is set" do
     app(:header_matchers) do |r|
       r.on :host=>/\A(.*)\.example\.com\z/ do |*m|
@@ -108,22 +79,8 @@ describe "host matcher" do
       end
     end
 
-    app.opts[:host_matcher_captures] = true
     body("HTTP_HOST" => "foo.example.com").must_equal 'foo'
   end
-
-  # RODA3: Remove
-  it "doesn't yields host if passed a string and opts[:host_matcher_captures] is set" do
-    app(:header_matchers) do |r|
-      r.on :host=>'example.com' do |*m|
-        m.empty? ? '0' : m[0]
-      end
-    end
-
-    body("HTTP_HOST" => "example.com").must_equal '0'
-    app.opts[:host_matcher_captures] = true
-    body("HTTP_HOST" => "example.com").must_equal '0'
-  end
 end
 
 describe "user_agent matcher" do