roda 3.33.0 → 3.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f9ede53406b16bff69c2115f7d35e808835e300ca866a5caadde9b9fad9d206
-  data.tar.gz: f78eb239a3d15e83879b8a7272f07959a00b6d94e93595f6871841144d3d718b
+  metadata.gz: 4ea0324d5667f9dcde48ff8fd1025b15e0e06861eea776019c0be9be8c46b097
+  data.tar.gz: 1712241233e21e7863101192227797976a79f6a3f0895da907a9e2b19242e1ed
 SHA512:
-  metadata.gz: 45e3020a3509bacc5f39107659fca5e64ba25c322c18af6a62b976308f5bac2ac44a18d54bc82d9b1d4260e260883208ce8210ac2fb660e09b63b65401abfed6
-  data.tar.gz: 5a00af14f4d6e01c472a23b59f5a51eec66fc55c2d8d34069de869d7ff487913ff6ab1d21023b8207f5fdf18ad6354f30520b3cf89d2491de4b330c1ae30f10a
+  metadata.gz: 6b8d1b37ed94ee40c0b1f12cc20ab9f734b276805044b059c9ea10375cc64d7d2cc8b0b36049bd21e29d3e45eeefcc8aeaffe0b4bbaf2d36043c16838270e2eb
+  data.tar.gz: 1670e3cde892c8cd42e2856d4e938e6da359d0818ee09f7c28e8ec5f4bc4bd627f3aaa8c48aeac8f6d03ab80994078a5cbce69d99595214f288eb9ab1f860c23

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 3.34.0 (2020-07-14)
+
+* Remove unnecessary conditionals (jeremyevans)
+
+* Allow loading the match_affix plugin with a single argument (jeremyevans)
+
+* Do not include pre/post context sections if empty in the exception_page plugin (jeremyevans)
+
 = 3.33.0 (2020-06-16)
 
 * Add :brotli option to public plugin to supplement it to serve brotli-compressed files like :gzip does for gzipped files (hmdne) (#194)

data/doc/release_notes/3.34.0.txt

@@ -0,0 +1,17 @@
+= Improvements
+
+* Multiple unneeded conditionals have been removed.
+
+* pre_content and post_context sections in backtraces are no longer
+  included in the exception_page plugin output if they would be
+  empty.
+
+* The match_affix plugin can be loaded again with a single argument.
+  It was originally designed to accept a single argument, but a bug
+  introduced in 2.29.0 made it require two arguments.
+
+* Core Roda and all plugins that ship with Roda now have 100% branch
+  coverage.
+
+* The sinatra_helpers plugin no longer emits statement not reached
+  warnings in verbose mode.

data/lib/roda/plugins/all_verbs.rb

@@ -34,7 +34,9 @@ class Roda
     module AllVerbs
       module RequestMethods
         %w'delete head options link patch put trace unlink'.each do |verb|
+          # :nocov:
           if ::Rack::Request.method_defined?("#{verb}?")
+          # :nocov:
             class_eval(<<-END, __FILE__, __LINE__+1)
               def #{verb}(*args, &block)
                 _verb(args, &block) if #{verb}?

data/lib/roda/plugins/backtracking_array.rb

@@ -33,9 +33,7 @@ class Roda
         # elements.  If the remaining elements could not be
         # matched, reset the state and continue to the next
         # entry in the array.
-        def _match_array(arg, rest=nil)
-          return super unless rest
-
+        def _match_array(arg, rest)
           path = @remaining_path
           captures = @captures
           caps = captures.dup

data/lib/roda/plugins/class_level_routing.rb

@@ -56,7 +56,6 @@ class Roda
       # currently have a routing block, setup an empty routing block so that things will still work if
       # a routing block isn't added.
       def self.configure(app)
-        app.route{} unless app.route_block
         app.opts[:class_level_routes] ||= []
       end
 

data/lib/roda/plugins/disallow_file_uploads.rb

@@ -1,6 +1,8 @@
 # frozen-string-literal: true
 
+# :nocov:
 raise LoadError, "disallow_file_uploads plugin not supported on Rack <1.6" if Rack.release < '1.6'
+# :nocov:
 
 #
 class Roda

data/lib/roda/plugins/exception_page.rb

@@ -252,11 +252,21 @@ END
                 begin
                   lineno -= 1
                   lines = ::File.readlines(filename)
-                  pre_lineno = frame[:pre_context_lineno] = [lineno-context, 0].max
-                  frame[:pre_context] = lines[pre_lineno...lineno]
-                  frame[:context_line] = lines[lineno].chomp
-                  post_lineno = frame[:post_context_lineno] = [lineno+context, lines.size].min
-                  frame[:post_context] = lines[lineno+1..post_lineno]
+                  if line = lines[lineno]
+                    pre_lineno = [lineno-context, 0].max
+                    if (pre_context = lines[pre_lineno...lineno]) && !pre_context.empty?
+                      frame[:pre_context_lineno] = pre_lineno
+                      frame[:pre_context] = pre_context
+                    end
+
+                    post_lineno = [lineno+context, lines.size].min
+                    if (post_context = lines[lineno+1..post_lineno]) && !post_context.empty?
+                      frame[:post_context_lineno] = post_lineno
+                      frame[:post_context] = post_context
+                    end
+
+                    frame[:context_line] = line.chomp
+                  end
                 rescue
                 end
 

data/lib/roda/plugins/match_affix.rb

@@ -28,7 +28,7 @@ class Roda
     #
     # This plugin automatically loads the placeholder_string_matchers plugin.
     module MatchAffix
-      def self.load_dependencies(app, _prefix, _suffix)
+      def self.load_dependencies(app, _prefix, _suffix=nil)
         app.plugin :placeholder_string_matchers
       end
 

data/lib/roda/plugins/not_allowed.rb

@@ -104,7 +104,9 @@ class Roda
         # arguments, record the verb used.  If given an argument, add an is
         # check with the arguments.
         %w'get post delete head options link patch put trace unlink'.each do |verb|
+          # :nocov:
           if ::Rack::Request.method_defined?("#{verb}?")
+          # :nocov:
             class_eval(<<-END, __FILE__, __LINE__+1)
               def #{verb}(*args, &block)
                 if (empty = args.empty?) && @_is_verbs

data/lib/roda/plugins/public.rb

@@ -110,9 +110,7 @@ class Roda
               headers = res[1]
 
               unless res[0] == 304
-                if mime_type = ::Rack::Mime.mime_type(::File.extname(path), 'text/plain')
-                  headers['Content-Type'] = mime_type
-                end
+                headers['Content-Type'] = ::Rack::Mime.mime_type(::File.extname(path), 'text/plain')
                 headers['Content-Encoding'] = encoding
               end
 

data/lib/roda/plugins/render.rb

@@ -287,7 +287,9 @@ class Roda
           false
         end
 
+        # :nocov:
         if COMPILED_METHOD_SUPPORT
+        # :nocov:
           # Compile a method in the given module with the given name that will
           # call the compiled template method, updating the compiled template method
           def define_compiled_method(roda_class, method_name, locals_keys=EMPTY_ARRAY)
@@ -337,7 +339,9 @@ class Roda
         def inherited(subclass)
           super
           opts = subclass.opts[:render] = subclass.opts[:render].dup
+          # :nocov:
           if COMPILED_METHOD_SUPPORT
+          # :nocov:
             opts[:template_method_cache] = (opts[:cache_class] || RodaCache).new
           end
           opts[:cache] = opts[:cache].dup

data/lib/roda/plugins/render_locals.rb

@@ -43,7 +43,9 @@ class Roda
       module InstanceMethods
         private
 
+        # :nocov:
         if Render::COMPILED_METHOD_SUPPORT
+        # :nocov:
           # Disable use of cached templates, since it assumes a render/view call with no
           # options will have no locals.
           def _cached_template_method(template)

data/lib/roda/plugins/sinatra_helpers.rb

@@ -374,7 +374,7 @@ class Roda
 
       module ResponseMethods
         # Set or retrieve the response status code.
-        def status(value = (return @status; nil))
+        def status(value = nil || (return @status))
           @status = value
         end
 
@@ -401,7 +401,7 @@ class Roda
 
         # Set multiple response headers with Hash, or return the headers if no
         # argument is given.
-        def headers(hash = (return @headers; nil))
+        def headers(hash = nil || (return @headers))
           @headers.merge!(hash)
         end
 
@@ -412,7 +412,7 @@ class Roda
 
         # Set the Content-Type of the response body given a media type or file
         # extension.  See plugin documentation for options.
-        def content_type(type = (return @headers["Content-Type"]; nil), opts = OPTS)
+        def content_type(type = nil || (return @headers["Content-Type"]), opts = OPTS)
           unless (mime_type = mime_type(type) || opts[:default])
             raise RodaError, "Unknown media type: #{type}"
           end
@@ -478,7 +478,7 @@ class Roda
         # If a type and value are given, set the value in Rack's MIME registry.
         # If only a type is given, lookup the type in Rack's MIME registry and
         # return it.
-        def mime_type(type=(return; nil), value = nil)
+        def mime_type(type=nil || (return), value = nil)
           return type.to_s if type.to_s.include?('/')
           type = ".#{type}" unless type.to_s[0] == ?.
           if value

data/lib/roda/plugins/typecast_params.rb

@@ -742,9 +742,7 @@ class Roda
             return
           end
 
-          if v = self[key]
-            v.subkey(keys, do_raise)
-          end
+          self[key].subkey(keys, do_raise)
         rescue => e
           handle_error(key, reason, e)
         end
@@ -808,10 +806,10 @@ class Roda
           @nested_params = nil
 
           if capturing_started
-            # Unset capturing if capturing was not already started.
+            # Unset capturing if capturing was already started.
             @capture = nil
           else
-            # If capturing was already started, update cached nested params
+            # If capturing was not already started, update cached nested params
             # before resetting symbolize setting. 
             @nested_params = nested_params
           end
@@ -878,7 +876,7 @@ class Roda
         def handle_error(key, reason, e, do_raise=false)
           case e
           when String
-            handle_error(key, reason, Error.new(e), do_raise=false)
+            handle_error(key, reason, Error.new(e), do_raise)
           when Error, ArgumentError
             if @capture && (le = @capture.last) && le == e
               raise e if do_raise

data/lib/roda/plugins/view_options.rb

@@ -126,7 +126,9 @@ class Roda
 
         private
 
+        # :nocov:
         if Render::COMPILED_METHOD_SUPPORT
+        # :nocov:
           # Return nil if using custom view or layout options.
           # If using a view subdir, prefix the template key with the subdir.
           def _cached_template_method_key(template)

data/lib/roda/request.rb

@@ -466,10 +466,8 @@ class Roda
           rp = @remaining_path
           if rp.getbyte(0) == 47
             if last = rp.index('/', 1)
-              if last > 1
-                @captures << rp[1, last-1]
-                @remaining_path = rp[last, rp.length]
-              end
+              @captures << rp[1, last-1]
+              @remaining_path = rp[last, rp.length]
             elsif rp.length > 1
               @captures << rp[1,rp.length]
               @remaining_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 = 33
+  RodaMinorVersion = 34
 
   # 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.33.0
+  version: 3.34.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -209,6 +209,7 @@ extra_rdoc_files:
 - doc/release_notes/3.31.0.txt
 - doc/release_notes/3.32.0.txt
 - doc/release_notes/3.33.0.txt
+- doc/release_notes/3.34.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -243,6 +244,7 @@ files:
 - doc/release_notes/3.31.0.txt
 - doc/release_notes/3.32.0.txt
 - doc/release_notes/3.33.0.txt
+- doc/release_notes/3.34.0.txt
 - doc/release_notes/3.4.0.txt
 - doc/release_notes/3.5.0.txt
 - doc/release_notes/3.6.0.txt