roda 3.29.0 → 3.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47d34c142084b4dc11049861f97621177bd1071744caff3b18ad113a79308139
-  data.tar.gz: 7021cfd179b0bd159f93ff31d86b9128686686d2f63c2068863b3ffc5150b44a
+  metadata.gz: 40d384d8a60174df9dcfdb645c5bf607232c44012827659d06691561666d2a74
+  data.tar.gz: 7f8cfedfb18a5125be0cbc7bb77cd60b45f2f869717ae163c9779be3bc054264
 SHA512:
-  metadata.gz: 48fa41c207a4e37aaa3deb8eb773480bd015875e8f2c9ef7d4489ef6b2538ad98001afa9ab1adf7555ebc100929a5cd0b7eb1b333cc331255818583c1d1dfb25
-  data.tar.gz: 4f7103b4730ed2f51309704c8f991c5c3f7fc3c865e07ba917219b54ef9019e0bafddbdeca280bd8343c8fd1e496ca5e3444e674eb59c93e98f5bdf7eab09647
+  metadata.gz: d5619d3e9ac99a426662057ba932ae8477d251e8252710f9fce7b33ffb5ccaec45673c3b933906d71e45ec1b4be6444467d5d7ad3be04df6123b66e19432ea4f
+  data.tar.gz: 0da11db1409e19bf6a11b5c2f9e88da573b9e00175de4bf753da1fab2d4877a1ef84013a5194d349237fbc362205efccbc03fd0b56ba800fc6e903583baf9cf1

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 3.30.0 (2020-03-13)
+
+* Support :relative_paths assets plugin option to use relative paths for the assets (jeremyevans)
+
+* Make run_append_slash and run_handler plugins work when used together (janko) (#185)
+
+* Make :header matcher in header_matchers plugin work for Content-Type and Content-Length (jeremyevans) (#184)
+
 = 3.29.0 (2020-02-14)
 
 * Remove specs and old release notes from the gem to reduce gem size by over 35% (jeremyevans)

data/README.rdoc

@@ -1107,7 +1107,7 @@ Roda's plugin system is based on the plugin system used by
 
 Roda fully supports the currently supported versions of Ruby (MRI) and JRuby.  It may
 support unsupported versions of Ruby or JRuby, but such support may be dropped in any
-minor version of keeping it becomes a support issue.  The minimum Ruby version
+minor version if keeping it becomes a support issue.  The minimum Ruby version
 required to run the current version of Roda is 1.9.2.
 
 == License

data/doc/release_notes/3.30.0.txt

@@ -0,0 +1,14 @@
+= New Features
+
+* A :relative_paths plugin option has been added to the assets
+  plugin.  This option makes the paths to the asset files in the
+  link and script tags relative paths instead of absolute paths.
+
+= Other Improvements
+
+* The :header matcher in the header_matchers plugin now works
+  correctly for the Content-Type and Content-Length headers, which
+  are not prefixed with HTTP_ in the rack environment.
+
+* The run_append_slash and run_handler plugins now work correctly
+  when used together.

data/lib/roda/plugins/assets.rb

@@ -291,6 +291,8 @@ class Roda
     #                 non-compiled mode, but will write the metadata to the file if compile_assets is called.
     # :public :: Path to your public folder, in which compiled files are placed (default: 'public').  Relative
     #            paths will be considered relative to the application's :root option.
+    # :relative_paths :: Use relative paths instead of absolute paths when setting up link and script tags for
+    #                    assets.
     # :sri :: Enables subresource integrity when setting up references to compiled assets. The value should be
     #         :sha256, :sha384, or :sha512 depending on which hash algorithm you want to use.  This changes the
     #         hash algorithm that Roda will use when naming compiled asset files. The default is :sha256, you
@@ -621,8 +623,10 @@ class Roda
           stype = ltype.to_s
 
           url_prefix = request.script_name if self.class.opts[:add_script_name]
+          relative_paths = o[:relative_paths]
 
-          if o[:compiled]
+          paths = if o[:compiled]
+            relative_paths = false if o[:compiled_asset_host]
             if ukey = _compiled_assets_hash(type, true)
               ["#{o[:compiled_asset_host]}#{url_prefix}/#{o[:"compiled_#{stype}_prefix"]}.#{ukey}.#{stype}"]
             else
@@ -642,6 +646,15 @@ class Roda
               "#{url_prefix}/#{o[:"#{stype}_prefix"]}#{mtime}#{prefix}#{f}#{o[:"#{stype}_suffix"]}"
             end
           end
+
+          if relative_paths && (slash_count = request.path.count('/')) >= 1
+            relative_prefix = "../" * (slash_count - 1)
+            paths.map! do |path|
+              "#{relative_prefix}#{path.slice(1,100000000)}"
+            end
+          end
+
+          paths
         end
 
         # Return a string containing html tags for the given asset type.

data/lib/roda/plugins/exception_page.rb

@@ -244,10 +244,10 @@ END
 
             frames = exception.backtrace.map.with_index do |line, i|
               frame = {:id=>i}
-              if line =~ /(.*?):(\d+)(:in `(.*)')?/
+              if line =~ /\A(.*?):(\d+)(?::in `(.*)')?\Z/
                 filename = frame[:filename] = $1
                 lineno = frame[:lineno] = $2.to_i
-                frame[:function] = $4
+                frame[:function] = $3
 
                 begin
                   lineno -= 1
@@ -261,8 +261,6 @@ END
                 end
 
                 frame
-              else
-                nil
               end
             end.compact
 

data/lib/roda/plugins/header_matchers.rb

@@ -51,7 +51,11 @@ class Roda
 
         # Match if the given uppercase key is present inside the environment.
         def match_header(key)
-          if v = @env["HTTP_#{key.upcase.tr("-","_")}"]
+          key = key.upcase.tr("-","_")
+          unless key == "CONTENT_TYPE" || key == "CONTENT_LENGTH"
+            key = "HTTP_#{key}"
+          end
+          if v = @env[key]
             @captures << v
           end
         end

data/lib/roda/plugins/run_append_slash.rb

@@ -33,7 +33,7 @@ class Roda
         # does not contain a trailing slash, a trailing slash is appended to the
         # path internally, or a redirect is issued when configured with
         # <tt>use_redirects: true</tt>.
-        def run(app)
+        def run(*)
           if remaining_path.empty?
             if scope.opts[:run_append_slash_redirect]
               redirect("#{path}/")

data/lib/roda/version.rb

@@ -4,7 +4,7 @@ class Roda
   RodaMajorVersion = 3
 
   # The minor version of Roda, updated for new feature releases of Roda.
-  RodaMinorVersion = 29
+  RodaMinorVersion = 30
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.29.0
+  version: 3.30.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -205,6 +205,7 @@ extra_rdoc_files:
 - doc/release_notes/3.27.0.txt
 - doc/release_notes/3.28.0.txt
 - doc/release_notes/3.29.0.txt
+- doc/release_notes/3.30.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -235,6 +236,7 @@ files:
 - doc/release_notes/3.28.0.txt
 - doc/release_notes/3.29.0.txt
 - doc/release_notes/3.3.0.txt
+- doc/release_notes/3.30.0.txt
 - doc/release_notes/3.4.0.txt
 - doc/release_notes/3.5.0.txt
 - doc/release_notes/3.6.0.txt