otto 1.1.0.pre.alpha2 → 1.1.0.pre.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23a54df729acf5a96e337f0d096aee18376e579771e85e0f3f02d9355b049baf
-  data.tar.gz: 871c1bebc912b19fda8f3730f905d29077f6aa5e88ab9a087a95be3ccf29d312
+  metadata.gz: e1ad2b9c043b3b58202eadcae63354ebead1b70178fd7723dc24820462a3831a
+  data.tar.gz: f95e243be8e6e59c5a17f7ec98d7a05d1a31599e0970e9e20763c569a65acfb8
 SHA512:
-  metadata.gz: 903a3264f15fdcf38b523c7c380dc3b6897f9670a1573c9a9a22edfc1e8e6d61f3f30f89fbb0e78b3db11dee2e824d423444d98d3010f03530e577410bade70c
-  data.tar.gz: c096b04cf99f7bf7d18c6441c625f4a304b1b98d8c04d83ee58f2a71f047196ea2dacae75abcfe04ad97324b40d169a952a1c1f4555e388c9c426e2d628e53a9
+  metadata.gz: 4ed91d559e7e339df4c5a28be0864ff2151e3e06e9dea577dedb346eaf4476e0d62adc84de508d3ff1ea1c55633789643b5f5bcee15d88bd6c8a43c6b7f04a59
+  data.tar.gz: 7d5f8bfb03f7e9ce91eebf632df7cc5ccf8b804beac9777662ef490507d1dba3a3ed1401d9e498ecb749617b8ab561a73c2226cb66c02f4796e18148b6afa479

data/Gemfile.lock

@@ -1,8 +1,16 @@
+PATH
+  remote: .
+  specs:
+    otto (1.1.0.pre.alpha3)
+      addressable (~> 2.2, < 3)
+      rack (~> 2.2, < 3.0)
+      rexml (>= 3.3.6)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
@@ -20,12 +28,12 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    public_suffix (5.0.5)
+    public_suffix (6.0.1)
     racc (1.7.3)
-    rack (3.0.10)
+    rack (2.2.9)
     rainbow (3.1.1)
     regexp_parser (2.9.0)
-    rexml (3.2.6)
+    rexml (3.3.7)
     rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -53,14 +61,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable
+  otto!
   pry-byebug
-  rack
   rubocop
   tryouts
 
-RUBY VERSION
-   ruby 3.2.0p0
-
 BUNDLED WITH
    2.5.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 :MAJOR: 1
 :MINOR: 1
 :PATCH: 0
-:PRE: alpha2
+:PRE: alpha4

data/lib/otto/route.rb

@@ -47,7 +47,7 @@ class Otto
       req.params.replace Otto::Static.indifferent_params(req.params)
       klass.extend Otto::Route::ClassMethods
       klass.otto = self.otto
-      Otto.logger.debug "Route class: #{klass}"
+
       case kind
       when :instance
         inst = klass.new req, res

data/lib/otto.rb

@@ -92,7 +92,23 @@ class Otto
     end
     path_info = Rack::Utils.unescape(env['PATH_INFO'])
     path_info = '/' if path_info.to_s.empty?
-    path_info_clean = path_info.gsub /\/$/, ''
+
+    begin
+      path_info_clean = path_info
+        .encode(
+          'UTF-8',           # Target encoding
+          invalid: :replace, # Replace invalid byte sequences
+          undef: :replace,   # Replace characters undefined in UTF-8
+          replace: ''        # Use empty string for replacement
+        )
+        .gsub(/\/$/, '')     # Remove trailing slash, if present
+    rescue ArgumentError => ex
+      # Log the error
+      Otto.logger.error "[Otto.call] Error cleaning `#{path_info}`: #{ex.message}"
+      # Set a default value or use the original path_info
+      path_info_clean = path_info
+    end
+
     base_path = File.split(path_info).first
     # Files in the root directory can refer to themselves
     base_path = path_info if base_path == '/'

data/otto.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ['>= 2.6.8', '< 4.0']
 
-  spec.add_runtime_dependency 'addressable', '~> 2.2', '>= 2.2.6'
-  spec.add_runtime_dependency 'rack', '~> 1.2', '>= 1.2.1'
+  # https://github.com/delano/otto/security/dependabot/5
+  spec.add_dependency 'rexml', '>= 3.3.6'
+
+  spec.add_runtime_dependency 'addressable', '~> 2.2', '< 3'
+  spec.add_runtime_dependency 'rack', '~> 2.2', '< 3.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: otto
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre.alpha2
+  version: 1.1.0.pre.alpha4
 platform: ruby
 authors:
 - Delano Mandelbaum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.6
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -17,9 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,29 +41,29 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
+        version: '2.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
+        version: '2.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '3.0'
 description: 'Otto: Auto-define your rack-apps in plaintext.'
 email: gems@solutious.com
 executables: []