roda 2.29.0 → 3.0.0

data/lib/roda/plugins/assets_preloading.rb

@@ -50,11 +50,6 @@ class Roda
         :js => 'script'.freeze,
       }.freeze
 
-      COMMA = ",".freeze
-      RodaPlugins.deprecate_constant(self, :COMMA)
-      NEWLINE= "\n".freeze
-      RodaPlugins.deprecate_constant(self, :NEWLINE)
-
       # Depend on the assets plugin, as we'll be calling some functions in it.
       def self.load_dependencies(app)
         app.plugin :assets

data/lib/roda/plugins/backtracking_array.rb

@@ -26,11 +26,6 @@ class Roda
     # and the match block yields.
     module BacktrackingArray
       module RequestMethods
-        PATH_INFO = "PATH_INFO".freeze
-        RodaPlugins.deprecate_constant(self, :PATH_INFO)
-        SCRIPT_NAME = "SCRIPT_NAME".freeze
-        RodaPlugins.deprecate_constant(self, :SCRIPT_NAME)
-
         private
 
         # When matching for a single array, after a successful

data/lib/roda/plugins/branch_locals.rb

@@ -7,13 +7,13 @@ class Roda
     # locals for specific branches and routes.
     #
     #   plugin :render
-    #   plugin :render_locals, :render=>{:footer=>'Default'}, :layout=>{:title=>'Main'}
+    #   plugin :render_locals, render: {footer: 'Default'}, layout: {title: 'Main'}
     #   plugin :branch_locals
     #
     #   route do |r|
     #     r.on "users" do
-    #       set_layout_locals :title=>'Users'
-    #       set_view_locals :footer=>'(c) Roda'
+    #       set_layout_locals title: 'Users'
+    #       set_view_locals footer: '(c) Roda'
     #     end
     #   end
     #

data/lib/roda/plugins/caching.rb

@@ -31,14 +31,14 @@ class Roda
     # response methods.  The +cache_control+ method sets the
     # Cache-Control header using the given hash:
     #
-    #   response.cache_control :public=>true, :max_age=>60
+    #   response.cache_control public: true, max_age: 60
     #   # Cache-Control: public, max-age=60
     # 
     # The +expires+ method is similar, but in addition
     # to setting the HTTP 1.1 Cache-Control header, it also sets
     # the HTTP 1.0 Expires header:
     #
-    #   response.expires 60, :public=>true
+    #   response.expires 60, public: true
     #   # Cache-Control: public, max-age=60
     #   # Expires: Mon, 29 Sep 2014 21:25:47 GMT
     #
@@ -69,25 +69,7 @@ class Roda
     # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     # OTHER DEALINGS IN THE SOFTWARE.
     module Caching
-      OPTS = {}.freeze
-      RodaPlugins.deprecate_constant(self, :OPTS)
-
       module RequestMethods
-        LAST_MODIFIED = 'Last-Modified'.freeze
-        RodaPlugins.deprecate_constant(self, :LAST_MODIFIED)
-        HTTP_IF_NONE_MATCH = 'HTTP_IF_NONE_MATCH'.freeze
-        RodaPlugins.deprecate_constant(self, :HTTP_IF_NONE_MATCH)
-        HTTP_IF_MATCH = 'HTTP_IF_MATCH'.freeze
-        RodaPlugins.deprecate_constant(self, :HTTP_IF_MATCH)
-        HTTP_IF_MODIFIED_SINCE = 'HTTP_IF_MODIFIED_SINCE'.freeze
-        RodaPlugins.deprecate_constant(self, :HTTP_IF_MODIFIED_SINCE)
-        HTTP_IF_UNMODIFIED_SINCE = 'HTTP_IF_UNMODIFIED_SINCE'.freeze
-        RodaPlugins.deprecate_constant(self, :HTTP_IF_UNMODIFIED_SINCE)
-        ETAG = 'ETag'.freeze
-        RodaPlugins.deprecate_constant(self, :ETAG)
-        STAR = '*'.freeze
-        RodaPlugins.deprecate_constant(self, :STAR)
-
         # Set the last modified time of the resource using the Last-Modified header.
         # The +time+ argument should be a Time instance.
         #
@@ -131,7 +113,7 @@ class Roda
         #
         # When the current request includes an If-Match header with a
         # etag that doesn't match, immediately returns a response with a 412 status.
-        def etag(value, opts=RodaPlugins::OPTS)
+        def etag(value, opts=OPTS)
           # Before touching this code, please double check RFC 2616 14.24 and 14.26.
           weak = opts[:weak]
           new_resource = opts.fetch(:new_resource){post?}
@@ -174,27 +156,12 @@ class Roda
       end
 
       module ResponseMethods
-        UNDERSCORE = '_'.freeze
-        RodaPlugins.deprecate_constant(self, :UNDERSCORE)
-        DASH = '-'.freeze
-        RodaPlugins.deprecate_constant(self, :DASH)
-        COMMA = ', '.freeze
-        RodaPlugins.deprecate_constant(self, :COMMA)
-        CACHE_CONTROL = 'Cache-Control'.freeze
-        RodaPlugins.deprecate_constant(self, :CACHE_CONTROL)
-        EXPIRES = 'Expires'.freeze
-        RodaPlugins.deprecate_constant(self, :EXPIRES)
-        CONTENT_TYPE = 'Content-Type'.freeze
-        RodaPlugins.deprecate_constant(self, :CONTENT_TYPE)
-        CONTENT_LENGTH = 'Content-Length'.freeze
-        RodaPlugins.deprecate_constant(self, :CONTENT_LENGTH)
-
         # Specify response freshness policy for using the Cache-Control header.
         # Options can can any non-value directives (:public, :private, :no_cache,
         # :no_store, :must_revalidate, :proxy_revalidate), with true as the value.
         # Options can also contain value directives (:max_age, :s_maxage).
         #
-        #   response.cache_control :public=>true, :max_age => 60
+        #   response.cache_control public: true, max_age: 60
         #   # => Cache-Control: public, max-age=60
         #
         # See RFC 2616 / 14.9 for more on standard cache control directives:
@@ -214,7 +181,7 @@ class Roda
         # be an integer number of seconds that the current request should be
         # cached for.  Also sets the Expires header, useful if you have
         # HTTP 1.0 clients (Cache-Control is an HTTP 1.1 header).
-        def expires(max_age, opts=RodaPlugins::OPTS)
+        def expires(max_age, opts=OPTS)
           cache_control(Hash[opts].merge!(:max_age=>max_age))
           self['Expires'] = (Time.now + max_age).httpdate
         end

data/lib/roda/plugins/chunked.rb

@@ -60,7 +60,7 @@ class Roda
     # If you want to chunk all responses, pass the :chunk_by_default option
     # when loading the plugin:
     #
-    #   plugin :chunked, :chunk_by_default => true
+    #   plugin :chunked, chunk_by_default: true
     #
     # then you can just use the normal view method:
     #
@@ -104,10 +104,10 @@ class Roda
     #   <% flush %><%= render(:subtemplate) %>
     #
     # If you want to use chunked encoding when rendering a template, but don't
-    # want to use a layout, pass the :layout=>false option to chunked.
+    # want to use a layout, pass the <tt>layout: false</tt> option to chunked.
     #
     #   r.root do
-    #     chunked(:index, :layout=>false)
+    #     chunked(:index, layout: false)
     #   end
     #
     # In order to handle errors in chunked responses, you can override the
@@ -133,7 +133,7 @@ class Roda
     # X-Accel-Buffering header.  To set this header or similar headers for
     # all chunked responses, pass a :headers option when loading the plugin:
     #
-    #   plugin :chunked, :headers=>{'X-Accel-Buffering'=>'no'}
+    #   plugin :chunked, headers: {'X-Accel-Buffering'=>'no'}
     #
     # The chunked plugin requires the render plugin, and only works for
     # template engines that store their template output variable in
@@ -145,26 +145,15 @@ class Roda
     # method is not called until template rendering, the flash may not be
     # rotated.
     module Chunked
-      OPTS = {}.freeze
-      RodaPlugins.deprecate_constant(self, :OPTS)
-      HTTP_VERSION = 'HTTP_VERSION'.freeze
-      RodaPlugins.deprecate_constant(self, :HTTP_VERSION)
-      HTTP11 = "HTTP/1.1".freeze
-      RodaPlugins.deprecate_constant(self, :HTTP11)
-      TRANSFER_ENCODING = 'Transfer-Encoding'.freeze
-      RodaPlugins.deprecate_constant(self, :TRANSFER_ENCODING)
-      CHUNKED = 'chunked'.freeze
-      RodaPlugins.deprecate_constant(self, :CHUNKED)
-
       # Depend on the render plugin
-      def self.load_dependencies(app, opts=RodaPlugins::OPTS)
+      def self.load_dependencies(app, opts=OPTS)
         app.plugin :render
       end
 
       # Set plugin specific options.  Options:
       # :chunk_by_default :: chunk all calls to view by default
       # :headers :: Set default additional headers to use when calling view
-      def self.configure(app, opts=RodaPlugins::OPTS)
+      def self.configure(app, opts=OPTS)
         app.opts[:chunk_by_default] = opts[:chunk_by_default]
         if opts[:headers]
           app.opts[:chunk_headers] = (app.opts[:chunk_headers] || {}).merge(opts[:headers]).freeze
@@ -173,13 +162,6 @@ class Roda
 
       # Rack response body instance for chunked responses
       class Body
-        CHUNK_SIZE = "%x\r\n".freeze
-        RodaPlugins.deprecate_constant(self, :CHUNK_SIZE)
-        CRLF = "\r\n".freeze
-        RodaPlugins.deprecate_constant(self, :CRLF)
-        FINISH = "0\r\n\r\n".freeze
-        RodaPlugins.deprecate_constant(self, :FINISH)
-
         # Save the scope of the current request handling.
         def initialize(scope)
           @scope = scope
@@ -221,7 +203,7 @@ class Roda
 
         # Render a response to the user in chunks.  See Chunked for
         # an overview.  If a block is given, it is passed to #delay.
-        def chunked(template, opts=RodaPlugins::OPTS, &block)
+        def chunked(template, opts=OPTS, &block)
           unless defined?(@_chunked)
             @_chunked = env['HTTP_VERSION'] == "HTTP/1.1"
           end

data/lib/roda/plugins/class_level_routing.rb

@@ -43,7 +43,7 @@ class Roda
     #     end
     #   end
     #
-    # When using the the class_level_routing plugin with nested routes, you may also want to use the
+    # When using the class_level_routing plugin with nested routes, you may also want to use the
     # delegate plugin to delegate certain instance methods to the request object, so you don't have
     # to continually use +request.+ in your routing blocks.
     #
@@ -90,7 +90,7 @@ class Roda
             super do |r|
               opts[:class_level_routes].each do |meth, args, blk|
                 req.instance_variable_set(:@remaining_path, rp)
-                r.send(meth, *args) do |*a|
+                r.public_send(meth, *args) do |*a|
                   instance_exec(*a, &blk)
                 end
               end

data/lib/roda/plugins/content_for.rb

@@ -28,23 +28,23 @@ class Roda
     #   <%= content_for :foo %>
     #
     # If content_for is used multiple times with the same key,
-    # by default, the last call will override previous calls.
-    # If you want to append to the content, pass the :append
-    # option when loading the plugin:
+    # by default, the last call will append previous calls.
+    # If you want to overwrite the previous content, pass the
+    # <tt>append: false</tt> option when loading the plugin:
     #
-    #   plugin :content_for, :append=>true
+    #   plugin :content_for, append: false
     module ContentFor
       # Depend on the render plugin, since this plugin only makes
       # sense when the render plugin is used.
-      def self.load_dependencies(app, _opts = {})
+      def self.load_dependencies(app, _opts = OPTS)
         app.plugin :render
       end
 
       # Configure whether to append or overwrite if content_for
       # is called multiple times to set data. Overwrite is default, use
       # the :append option to append.
-      def self.configure(app, opts = {})
-        app.opts[:append_content_for] = opts.fetch(:append, nil)
+      def self.configure(app, opts = OPTS)
+        app.opts[:append_content_for] = opts.fetch(:append, true)
       end
 
       module InstanceMethods
@@ -71,9 +71,6 @@ class Roda
             if append
               (@_content_for[key] ||= []) << value
             else
-              if @_content_for[key] && append.nil?
-                RodaPlugins.warn "Attempt to set content_for with same key.  This currently overwrites the existing content_for for #{key}.  In Roda 3, it will start appending to the existing content_for by default.  Use the :append => false option to the content_for plugin to keep the existing behavior."
-              end
               @_content_for[key] = value
             end
           elsif @_content_for && (value = @_content_for[key])

data/lib/roda/plugins/cookies.rb

@@ -14,7 +14,7 @@ class Roda
     # defaults for all cookies upon setting and deleting. This is particularly
     # useful for configuring the +domain+ and +path+ of all cookies.
     #
-    #   plugin :cookies, :domain=>'example.com', :path=>'/api'
+    #   plugin :cookies, domain: 'example.com', path: '/api'
     module Cookies
       # Allow setting default cookie options when loading the cookies plugin.
       def self.configure(app, opts={})
@@ -28,7 +28,7 @@ class Roda
         # Example:
         #
         #   response.delete_cookie('foo')
-        #   response.delete_cookie('foo', :domain=>'example.org')
+        #   response.delete_cookie('foo', domain: 'example.org')
         def delete_cookie(key, value = {})
           ::Rack::Utils.delete_cookie_header!(@headers, key, roda_class.opts[:cookies_opts].merge(value))
         end
@@ -36,7 +36,7 @@ class Roda
         # Set the cookie with the given key in the headers.
         #
         #   response.set_cookie('foo', 'bar')
-        #   response.set_cookie('foo', :value=>'bar', :domain=>'example.org')
+        #   response.set_cookie('foo', value: 'bar', domain: 'example.org')
         def set_cookie(key, value)
           value = { :value=>value } unless value.respond_to?(:keys)
           ::Rack::Utils.set_cookie_header!(@headers, key, roda_class.opts[:cookies_opts].merge(value))

data/lib/roda/plugins/csrf.rb

@@ -8,12 +8,12 @@ class Roda
     # some csrf helper methods to use in your views.  To use it, load
     # the plugin, with the options hash passed to Rack::Csrf:
     #
-    #   plugin :csrf, :raise=>true
+    #   plugin :csrf, raise: true
     #
     # Optionally you can choose not to setup rack_csrf middleware on the
     # roda app if you already have one configured:
     #
-    #   plugin :csrf, :skip_middleware=>true
+    #   plugin :csrf, skip_middleware: true
     #
     # This adds the following instance methods:
     #

data/lib/roda/plugins/delegate.rb

@@ -52,21 +52,21 @@ class Roda
         # Delegate the given methods to the class
         def class_delegate(*meths)
           meths.each do |meth|
-            define_method(meth){|*a, &block| self.class.send(meth, *a, &block)}
+            define_method(meth){|*a, &block| self.class.public_send(meth, *a, &block)}
           end
         end
 
         # Delegate the given methods to the request
         def request_delegate(*meths)
           meths.each do |meth|
-            define_method(meth){|*a, &block| @_request.send(meth, *a, &block)}
+            define_method(meth){|*a, &block| @_request.public_send(meth, *a, &block)}
           end
         end
 
         # Delegate the given methods to the response
         def response_delegate(*meths)
           meths.each do |meth|
-            define_method(meth){|*a, &block| @_response.send(meth, *a, &block)}
+            define_method(meth){|*a, &block| @_response.public_send(meth, *a, &block)}
           end
         end
       end

data/lib/roda/plugins/drop_body.rb

@@ -12,13 +12,6 @@ class Roda
       module ResponseMethods
         DROP_BODY_STATUSES = [100, 101, 102, 204, 205, 304].freeze
 
-        EMPTY_BODY = [].freeze
-        RodaPlugins.deprecate_constant(self, :EMPTY_BODY)
-        CONTENT_LENGTH = "Content-Length".freeze
-        RodaPlugins.deprecate_constant(self, :CONTENT_LENGTH)
-        CONTENT_TYPE = "Content-Type".freeze
-        RodaPlugins.deprecate_constant(self, :CONTENT_TYPE)
-
         # If the response status indicates a body should not be
         # returned, use an empty body and remove the Content-Length
         # and Content-Type headers.

data/lib/roda/plugins/empty_root.rb

@@ -31,9 +31,6 @@ class Roda
     # matches only when the current PATH_INFO is +/+ and not when
     # it is empty.
     module EmptyRoot
-      EMPTY_STRING = ''.freeze
-      RodaPlugins.deprecate_constant(self, :EMPTY_STRING)
-
       module RequestMethods
         # Match when the remaining path is the empty string,
         # in addition to the default behavior of matching when

data/lib/roda/plugins/error_email.rb

@@ -8,7 +8,7 @@ class Roda
     # send an email related to the exception.  This is most useful if you are
     # also using the error_handler plugin:
     #
-    #   plugin :error_email, :to=>'to@example.com', :from=>'from@example.com'
+    #   plugin :error_email, to: 'to@example.com', from: 'from@example.com'
     #   plugin :error_handler do |e|
     #     error_email(e)
     #     'Internal Server Error'
@@ -37,10 +37,8 @@ class Roda
     # for low traffic web applications.  For high traffic web applications,
     # use an error reporting service instead of this plugin.
     module ErrorEmail
-      OPTS = {}.freeze
-      RodaPlugins.deprecate_constant(self, :OPTS)
       DEFAULTS = {
-        :headers=>RodaPlugins::OPTS,
+        :headers=>OPTS,
         :host=>'localhost',
         # :nocov:
         :emailer=>lambda{|h| Net::SMTP.start(h[:host]){|s| s.send_message(h[:message], h[:from], h[:to])}},
@@ -95,10 +93,10 @@ END
 
           message
         end
-      }#.freeze # RODA3
+      }.freeze
 
       # Set default opts for plugin.  See ErrorEmail module RDoc for options.
-      def self.configure(app, opts=RodaPlugins::OPTS)
+      def self.configure(app, opts=OPTS)
         email_opts = app.opts[:error_email] ||= DEFAULTS
         email_opts = email_opts.merge(opts)
         email_opts[:headers] = email_opts[:headers].dup

data/lib/roda/plugins/error_handler.rb

@@ -30,12 +30,11 @@ class Roda
     # as well set headers and/or write to the body, just like a regular
     # request.
     #
-    #
     # By default, this plugin handles StandardError and ScriptError.
     # To override the exception classes it will handle, pass a :classes
     # option to the plugin:
     #
-    #   plugin :error_handler, :classes=>[StandardError, ScriptError, NoMemoryError]
+    #   plugin :error_handler, classes: [StandardError, ScriptError, NoMemoryError]
     module ErrorHandler
       DEFAULT_ERROR_HANDLER_CLASSES = [StandardError, ScriptError].freeze
 

data/lib/roda/plugins/error_mail.rb

@@ -8,7 +8,7 @@ class Roda
     # send an email related to the exception.  This is most useful if you are
     # also using the error_handler plugin:
     #
-    #   plugin :error_mail, :to=>'to@example.com', :from=>'from@example.com'
+    #   plugin :error_mail, to: 'to@example.com', from: 'from@example.com'
     #   plugin :error_handler do |e|
     #     error_mail(e)
     #     'Internal Server Error'
@@ -36,12 +36,9 @@ class Roda
     # for low traffic web applications.  For high traffic web applications,
     # use an error reporting service instead of this plugin.
     module ErrorMail
-      OPTS = {}.freeze
-      RodaPlugins.deprecate_constant(self, :OPTS)
-
       # Set default opts for plugin.  See ErrorEmail module RDoc for options.
-      def self.configure(app, opts=RodaPlugins::OPTS)
-        app.opts[:error_mail] = email_opts = (app.opts[:error_mail] || RodaPlugins::OPTS).merge(opts).freeze
+      def self.configure(app, opts=OPTS)
+        app.opts[:error_mail] = email_opts = (app.opts[:error_mail] || OPTS).merge(opts).freeze
         unless email_opts[:to] && email_opts[:from]
           raise RodaError, "must provide :to and :from options to error_mail plugin"
         end

data/lib/roda/plugins/flash.rb

@@ -36,10 +36,6 @@ class Roda
     #     flash['a'] # = >'b'
     #   end
     module Flash
-      # The internal session key used to store the flash.
-      KEY = :_flash
-      RodaPlugins.deprecate_constant(self, :KEY)
-
       # Simple flash hash, where assiging to the hash updates the flash
       # used in the following request.
       class FlashHash < DelegateClass(Hash)