scorched 1.0.2 → 1.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 867ade7529bcd2c1aef6c5ae9ec3898078f1aedc65e190d29fd03781f7fbaabb
-  data.tar.gz: 7275bd4b007d91441a06cd2a90e58fac6e49ea598fa146964fb074cc03af2f37
+  metadata.gz: 5df1a902354207de82c8dcb0a6f00c68d9455d20edc05b3e70a5ef2c806a229a
+  data.tar.gz: 2bd5dac53da50545d9d6f0d832e7928aeefb07ebfcbbd1749c300b0fd71355e4
 SHA512:
-  metadata.gz: 0a0b3feb7e16e82571277ec4c97f8555b268013cbb8172e464a3d30fd4639e66c3ff817b9f165e5f4a2b4ef7b1470d28aaad4568dda1bad4cb56c390bf4a9cce
-  data.tar.gz: 9dbfa1171f29c6037c173ece4f584a828c073671896c2f6b40dcc49dd37269ac5ad096909ec4d77bfdb88b212c0d4278c39206d370a30fc37aa9a836c77a73dc
+  metadata.gz: 3becda9a8c64fd085500003132cd5bd982d3ba6b67c33c5cabe9d4011377df4072f76e79baedd34a2544ee1546c105305e506dd1b2c5347844fd3742abf396a4
+  data.tar.gz: 51988a63c584113976d5a99080174d0d008e08f91f1f1aac17d74b25d353e514e54a7a1a1ea95385a96fdba187846a543be82b933721936387fd9b439ceef849

data/CHANGES.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+### v1.1.0.pre
+* Updated dependancies
+* Now compatible with (and requires) Rack 3.x
+* No longer escapes "+" into space characters
+### v1.0.3
+* Fixed issue where routes with a `media_type` condition were prioritised over those without for HTTP requests accepting "*/*"
 ### v1.0.2
 * Now requiring CGI instead of URI library as per v1.0.1 deprecation fixes.
 ### v1.0.1

data/Gemfile

@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gemspec
+gemspec

data/lib/scorched/controller.rb

@@ -377,7 +377,8 @@ module Scorched
           priority = m.mapping[:priority] || 0
           media_type_rank = [*m.mapping[:conditions][:media_type]].map { |type|
             env['scorched.accept'][:accept].rank(type, true)
-          }.max || 0
+          }.max
+          media_type_rank ||= env['scorched.accept'][:accept].rank('*/*', true) || 0 # Default to "*/*" if no media type condition specified.
           order = -idx
           [priority, media_type_rank, order]
         end.reverse

data/lib/scorched/request.rb

@@ -33,7 +33,7 @@ module Scorched
     # The unescaped URL, excluding the escaped forward-slash and percent. The resulting string will always be safe
     # to unescape again in situations where the forward-slash or percent are expected and valid characters. 
     def unescaped_path
-      path_info.split(/(%25|%2F)/i).each_slice(2).map { |v, m| CGI.unescape(v) << (m || '') }.join('')
+      path_info.split(/(%25|%2F|\+)/i).each_slice(2).map { |v, m| CGI.unescape(v) << (m || '') }.join('')
     end
     
   private

data/lib/scorched/response.rb

@@ -5,10 +5,10 @@ module Scorched
     def merge!(response)
       return self if response == self
       if Rack::Response === response
-        response = [response.status, response.header, response]
+        response = [response.status, response.headers, response]
       end
       self.status, self.body = response[0], response[2]
-      self.header.merge!(response[1])
+      self.headers.merge!(response[1])
       self
     end
 
@@ -24,12 +24,12 @@ module Scorched
       self['Content-Type'] ||= 'text/html;charset=utf-8'
       @block = block if block
       if [204, 205, 304].include?(status.to_i)
-        header.delete "Content-Type"
-        header.delete "Content-Length"
+        delete_header "Content-Type"
+        delete_header "Content-Length"
         close
-        [status.to_i, header, []]
+        [status.to_i, headers, []]
       else
-        [status.to_i, header, body]
+        [status.to_i, headers, body]
       end
     end
 

data/lib/scorched/static.rb

@@ -12,7 +12,7 @@ module Scorched
   protected
 
     def file_server
-      @file_server ||= Rack::File.new(@dir)
+      @file_server ||= Rack::Files.new(@dir)
     end
   end
 end

data/lib/scorched/version.rb

@@ -1,3 +1,3 @@
 module Scorched
-  VERSION = '1.0.2'
+  VERSION = '1.1.0.pre'
 end

data/lib/scorched.rb

@@ -2,6 +2,7 @@ ENV['APP_ENV'] ||= ENV['RACK_ENV'] || 'development'
 
 # Gems
 require 'rack'
+require 'rack/session'
 require 'rack/accept'
 require 'scorched/accept'
 require 'tilt'

data/scorched.gemspec

@@ -13,7 +13,8 @@ Gem::Specification.new 'scorched', Scorched::VERSION do |s|
 
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_dependency 'rack', '~> 2.0'
+  s.add_dependency 'rack', '~> 3.0'
+  s.add_dependency 'rack-session', '~> 2.1'
   s.add_dependency 'rack-accept', '~> 0.4' # Used for Accept-Charset, Accept-Encoding and Accept-Language headers.
   s.add_dependency 'scorched-accept', '~> 0.1' # Used for Accept header.
   s.add_dependency 'tilt', '~> 2.0'

data/spec/controller_spec.rb

@@ -1,4 +1,5 @@
 require_relative './helper.rb'
+require 'securerandom'
 
 module Scorched
   describe Controller do
@@ -72,7 +73,7 @@ module Scorched
         response.status.should == 200
       end
 
-      it "unescapes all characters except for the forward-slash and percent sign" do
+      it "unescapes all characters except for the forward-slash, percent sign and plus" do
         app.map pattern: '/a (quite) big fish', target: generic_handler
         rt.get('/a%20%28quite%29%20big%20fish').status.should == 200
         app.map pattern: '/article/100%25 big%2Fsmall', target: generic_handler
@@ -80,6 +81,13 @@ module Scorched
         app.map pattern: '/*$', target: generic_handler
         rt.get('/page%2Fabout').status.should == 200
         rt.get('/page/about').status.should == 404
+
+        app.get('/foo/*') { |x| x }
+        app.map pattern: '/bar', target: Class.new(Scorched::Controller) {
+          get('/*') { |x| x }
+        }
+        rt.get('/foo/hello%2Bworld').body.should == 'hello+world'
+        rt.get('/bar/hello%2Bworld').body.should == 'hello+world'
       end
 
       it "unmatched path doesn't always begin with a forward slash" do
@@ -342,7 +350,7 @@ module Scorched
         inner_env['SCRIPT_NAME'].should == '/article'
         inner_env['PATH_INFO'].should == '/name'
       end
-
+      
       example "PATH_INFO and SCRIPT_NAME joined, should produce a full path" do
         app.controller '/article/' do
           get '/name' do
@@ -962,14 +970,14 @@ module Scorched
         app.get('/') { rack_session = session }
         rt.get('/')
         rack_session.should be_nil
-        app.middleware << proc { use Rack::Session::Cookie, secret: 'test' }
+        app.middleware << proc { use Rack::Session::Cookie, secret: SecureRandom.gen_random(64) }
         rt.get('/')
         rack_session.should be_a(Rack::Session::Abstract::SessionHash)
       end
 
       describe "flash" do
         before(:each) do
-          app.middleware << proc { use Rack::Session::Cookie, secret: 'test' }
+          app.middleware << proc { use Rack::Session::Cookie, secret: SecureRandom.gen_random(64) }
         end
 
         it "keeps session variables that live for one page load" do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: scorched
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0.pre
 platform: ruby
 authors:
 - Tom Wardrop
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rack-session
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rack-accept
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +188,6 @@ homepage: http://scorchedrb.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -190,8 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Light-weight, DRY as a desert, web framework for Ruby
 test_files: