roda 2.29.0 → 3.0.0

data/spec/plugin_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(__FILE__))
+require_relative "spec_helper"
 
 describe "plugins" do
   it "should be able to override class, instance, response, and request methods, and execute configure method" do

data/spec/redirect_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(__FILE__))
+require_relative "spec_helper"
 
 describe "redirects" do
   it "should be immediately processed" do

data/spec/request_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(__FILE__))
+require_relative "spec_helper"
 
 describe "request.path, .remaining_path, and .matched_path" do
   it "should return the script name and path_info as a string" do

data/spec/response_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(__FILE__))
+require_relative "spec_helper"
 
 describe "response #[] and #[]=" do
   it "should get/set headers" do

data/spec/session_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(__FILE__))
+require_relative "spec_helper"
 
 describe "session handling" do
   it "should give a warning if session variable is not available" do

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
 $:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 
-require "rubygems"
-
 if ENV['WARNING']
   require 'warning'
   Warning.ignore([:missing_ivar, :method_redefined, :not_reached], File.dirname(File.dirname(__FILE__)))
@@ -24,7 +22,7 @@ if ENV['COVERAGE']
   SimpleCov.roda_coverage
 end
 
-require "roda"
+require_relative "../lib/roda"
 require "stringio"
 gem 'minitest'
 require "minitest/autorun"

data/spec/version_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(__FILE__))
+require_relative "spec_helper"
 
 describe "Roda version constants" do
   it "RodaVersion should be a string in x.y.z integer format" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 2.29.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +195,7 @@ extra_rdoc_files:
 - doc/release_notes/2.27.0.txt
 - doc/release_notes/2.28.0.txt
 - doc/release_notes/2.29.0.txt
+- doc/release_notes/3.0.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -250,8 +237,8 @@ files:
 - doc/release_notes/2.7.0.txt
 - doc/release_notes/2.8.0.txt
 - doc/release_notes/2.9.0.txt
+- doc/release_notes/3.0.0.txt
 - lib/roda.rb
-- lib/roda/plugins/_erubis_escaping.rb
 - lib/roda/plugins/_symbol_regexp_matchers.rb
 - lib/roda/plugins/all_verbs.rb
 - lib/roda/plugins/assets.rb
@@ -307,7 +294,6 @@ files:
 - lib/roda/plugins/path.rb
 - lib/roda/plugins/path_matchers.rb
 - lib/roda/plugins/path_rewriter.rb
-- lib/roda/plugins/per_thread_caching.rb
 - lib/roda/plugins/placeholder_string_matchers.rb
 - lib/roda/plugins/precompile_templates.rb
 - lib/roda/plugins/public.rb
@@ -322,7 +308,6 @@ files:
 - lib/roda/plugins/sinatra_helpers.rb
 - lib/roda/plugins/slash_path_empty.rb
 - lib/roda/plugins/static.rb
-- lib/roda/plugins/static_path_info.rb
 - lib/roda/plugins/static_routing.rb
 - lib/roda/plugins/status_303.rb
 - lib/roda/plugins/status_handler.rb
@@ -334,8 +319,6 @@ files:
 - lib/roda/plugins/type_routing.rb
 - lib/roda/plugins/unescape_path.rb
 - lib/roda/plugins/view_options.rb
-- lib/roda/plugins/view_subdirs.rb
-- lib/roda/plugins/websockets.rb
 - lib/roda/version.rb
 - spec/all.rb
 - spec/assets/css/app.scss
@@ -348,7 +331,6 @@ files:
 - spec/integration_spec.rb
 - spec/matchers_spec.rb
 - spec/opts_spec.rb
-- spec/plugin/_erubis_escaping_spec.rb
 - spec/plugin/all_verbs_spec.rb
 - spec/plugin/assets_preloading_spec.rb
 - spec/plugin/assets_spec.rb
@@ -403,7 +385,6 @@ files:
 - spec/plugin/path_matchers_spec.rb
 - spec/plugin/path_rewriter_spec.rb
 - spec/plugin/path_spec.rb
-- spec/plugin/per_thread_caching_spec.rb
 - spec/plugin/placeholder_string_matchers_spec.rb
 - spec/plugin/precompile_templates_spec.rb
 - spec/plugin/public_spec.rb
@@ -429,7 +410,6 @@ files:
 - spec/plugin/type_routing_spec.rb
 - spec/plugin/unescape_path_spec.rb
 - spec/plugin/view_options_spec.rb
-- spec/plugin/websockets_spec.rb
 - spec/plugin_spec.rb
 - spec/redirect_spec.rb
 - spec/request_spec.rb
@@ -465,7 +445,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -473,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Routing tree web toolkit

data/lib/roda/plugins/_erubis_escaping.rb

@@ -1,59 +0,0 @@
-# frozen-string-literal: true
-
-require 'erubis'
-
-class Roda
-  module RodaPlugins
-    warn 'Using the render plugin :escape option for Erubis escaping support is deprecated.  In Roda 3, the :escape option will use Erubi escaping support.  You can turn on the Roda 3 behavior by using :escape=>:erubi.'
-
-    # The _erubis_escaping plugin handles escaping of <tt><%= %></tt> inside
-    # ERB templates.  It is an internal plugin that should not be loaded
-    # directlyn by user code.
-    module ErubisEscaping
-      # Escaper which escapes by default, but does not escape instances of
-      # classes marked as safe.
-      class UnsafeClassEscaper
-        # Default escaper if the string needs to be escaped.
-        Escaper = Erubis::XmlHelper
-
-        # Record the classes to consider safe.
-        def initialize(safe_classes)
-          @safe_classes = Array(safe_classes).freeze
-          freeze
-        end
-
-        # If the string given is not an instance of one of the safe
-        # classes, escape it, otherwise return it verbatim.  If the
-        # given object is not already a string, convert it to a string first.
-        def escape_xml(string)
-          unless string.is_a?(String)
-            string = string.to_s
-          end
-
-          if @safe_classes.any?{|c| string.is_a?(c)}
-            string
-          else
-            Escaper.escape_xml(string)
-          end
-        end
-      end
-
-      # Subclass that works with specified escaper, also handling
-      # postfix conditionals inside <tt><%= %></tt> tags.
-      class Eruby < Erubis::EscapedEruby
-        # Set escaping object to a local variable
-        def convert_input(codebuf, input)
-          codebuf << '_erubis_escaper = render_opts[:escaper];'
-          super
-        end
-
-        # Use escaping object to escape the code, and handle postfix conditionals.
-        def add_expr_escaped(src, code)
-          src << " " << @bufvar << " << _erubis_escaper.escape_xml((" <<  code << "));"
-        end
-      end
-    end
-
-    register_plugin(:_erubis_escaping, ErubisEscaping)
-  end
-end

data/lib/roda/plugins/per_thread_caching.rb

@@ -1,71 +0,0 @@
-# frozen-string-literal: true
-
-#
-class Roda
-  module RodaPlugins
-    warn "The per_thread_caching plugin is deprecated and will be removed in Roda 3.  Consider maintaining the plugin as a separate gem if you would like to keep using it."
-
-    # The per_thread_caching plugin changes the default cache
-    # from being a shared thread safe cache to a separate cache per
-    # thread.  This means getting or setting values no longer
-    # needs a mutex, which may be faster when using a thread pool.
-    # However, since the caches are no longer shared, this will
-    # take up more memory.
-    #
-    # Using this plugin changes the matcher regexp cache to use
-    # per-thread caches, and changes the default for future
-    # thread-safe caches to use per-thread caches.
-    #
-    # If you want the render plugin's template cache to use
-    # per-thread caches, you should load this plugin before the
-    # render plugin.
-    module PerThreadCaching
-      def self.configure(app)
-        app::RodaRequest.match_pattern_cache = app.thread_safe_cache
-      end
-
-      class Cache
-        # Mutex used to ensure multiple per-thread caches
-        # don't use the same key
-        MUTEX = ::Mutex.new
-
-        n = 0
-        # Auto incrementing number proc used to make sure
-        # multiple thread-thread caches don't use the same key.
-        N = lambda{MUTEX.synchronize{n += 1}}
-
-        # Store unique symbol used to look up in the per
-        # thread caches.
-        def initialize
-          @o = :"roda_per_thread_cache_#{N.call}"
-        end
-
-        # Return the current thread's cached value.
-        def [](key)
-          _hash[key]
-        end
-
-        # Set the current thread's cached value.
-        def []=(key, value)
-          _hash[key] = value
-        end
-
-        private
-
-        # The current thread's cache.
-        def _hash
-          ::Thread.current[@o] ||= {}
-        end
-      end
-
-      module ClassMethods
-        # Use the per-thread cache instead of the default cache.
-        def thread_safe_cache
-          Cache.new
-        end
-      end
-    end
-
-    register_plugin(:per_thread_caching, PerThreadCaching)
-  end
-end

data/lib/roda/plugins/static_path_info.rb

@@ -1,12 +0,0 @@
-class Roda
-  module RodaPlugins
-    warn 'The static_path_info plugin is deprecated and will be removed in Roda 3.  It has been a no-op since Roda 2, and can just be removed from the application.'
-
-    module StaticPathInfo
-    end
-
-    # For backwards compatibilty, don't raise an error
-    # if trying to load the plugin
-    register_plugin(:static_path_info, StaticPathInfo)
-  end
-end

data/lib/roda/plugins/view_subdirs.rb

@@ -1,7 +0,0 @@
-# View options is a superset of the view_subdirs plugin,
-# which no longer exists.  For backwards compatibility,
-# make attempts to load the view_subdirs plugin load the
-# view_options plugin instead.
-require 'roda/plugins/view_options'
-Roda::RodaPlugins.warn "The view_subdirs plugin is a deprecated alias for the view_options plugin that will be removed in Roda 3.  Use the view_options plugin instead."
-Roda::RodaPlugins.register_plugin(:view_subdirs, Roda::RodaPlugins::ViewOptions)

data/lib/roda/plugins/websockets.rb

@@ -1,107 +0,0 @@
-# frozen-string-literal: true
-
-require 'faye/websocket'
-
-class Roda
-  module RodaPlugins
-    warn "The websockets plugin is deprecated and will be removed in Roda 3.  Consider maintaining the plugin as a separate gem if you would like to keep using it."
-
-    # The websocket plugin adds integration support for websockets.
-    # Currently, only 'faye-websocket' is supported, so eventmachine
-    # is required for websockets.  See the
-    # {faye-websocket documentation}[https://github.com/faye/faye-websocket-ruby] 
-    # for details on the faye-websocket API. Note that faye-websocket
-    # is only supported on ruby 1.9.3+, so the websockets plugin only works
-    # on ruby 1.9.3+.
-    #
-    # Here's a simplified example for a basic multi-user,
-    # multi-room chat server, where a message from any user in a room
-    # is sent to all other users in the same room, using a websocket
-    # per room:
-    #
-    #   plugin :websockets, :adapter=>:thin, :ping=>45
-    #
-    #   MUTEX = Mutex.new
-    #   ROOMS = {}
-    #
-    #   def sync
-    #     MUTEX.synchronize{yield}
-    #   end
-    #
-    #   route do |r|
-    #     r.get "room", Integer do |room_id|
-    #       room = sync{ROOMS[room_id] ||= []}
-    #
-    #       r.websocket do |ws|
-    #         # Routing block taken if request is a websocket request,
-    #         # yields a Faye::WebSocket instance
-    #
-    #         ws.on(:message) do |event|
-    #           sync{room.dup}.each{|user| user.send(event.data)}
-    #         end
-    #
-    #         ws.on(:close) do |event|
-    #           sync{room.delete(ws)}
-    #           sync{room.dup}.each{|user| user.send("Someone left")}
-    #         end
-    #
-    #         sync{room.dup}.each{|user| user.send("Someone joined")}
-    #         sync{room.push(ws)}
-    #       end
-    #
-    #       # If the request is not a websocket request, execution
-    #       # continues, similar to how routing in general works.
-    #       view 'room'
-    #     end
-    #   end
-    module Websockets
-      WebSocket = ::Faye::WebSocket
-      OPTS = {}.freeze
-
-      # Add default opions used for websockets.  These options are
-      # passed to Faye:WebSocket.new, except that the following
-      # options are handled separately.
-      #
-      # :adapter :: Calls Faye::WebSocket.load adapter with the given
-      #             value, used to set the adapter to load, if Faye
-      #             requires an adapter to work with the webserver.
-      #             Possible options: :thin, :rainbows, :goliath
-      #
-      # See RequestMethods#websocket for additional supported options.
-      def self.configure(app, opts=OPTS)
-        opts = app.opts[:websockets_opts] = (app.opts[:websockets_opts] || {}).merge(opts || {})
-        if adapter = opts.delete(:adapter)
-          WebSocket.load_adapter(adapter.to_s)
-        end
-        opts.freeze
-      end
-
-      module RequestMethods
-        # True if this request is a websocket request, false otherwise.
-        def websocket?
-          WebSocket.websocket?(env)
-        end
-
-        # If the request is a websocket request, yield a websocket to the
-        # block, and return the appropriate rack response after the block
-        # returns.  +opts+ is an options hash used when creating the
-        # websocket, except the following options are handled specially:
-        #
-        # :protocols :: Set the protocols to accept, should be an array
-        #               of strings.
-        def websocket(opts=OPTS)
-          if websocket?
-            always do
-              opts = Hash[roda_class.opts[:websockets_opts]].merge!(opts)
-              ws = WebSocket.new(env, opts.delete(:protocols), opts)
-              yield ws
-              halt ws.rack_response
-            end
-          end
-        end
-      end
-    end
-
-    register_plugin(:websockets, Websockets)
-  end
-end

data/spec/plugin/_erubis_escaping_spec.rb

@@ -1,97 +0,0 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
-
-begin
-  require 'erubis'
-  require 'tilt'
-  require 'tilt/erb'
-  begin
-    require 'tilt/erubis'
-  rescue LoadError
-    # Tilt 1 support
-  end
-rescue LoadError
-  warn "tilt or erubis not installed, skipping _erubis_escaping plugin test"  
-else
-describe "_erubis_escaping plugin" do
-  before do
-    if defined?(Tilt::ErubisTemplate) && ::Tilt['erb'] != Tilt::ErubisTemplate
-      # Set erubis as default erb template handler
-      Tilt.register(Tilt::ErubisTemplate, 'erb')
-    end
-  end
-
-  deprecated "should escape inside <%= %> and not inside <%== %>, and handle postfix conditionals" do
-    app(:bare) do
-      plugin :render, :escape=>true
-
-      route do |r|
-        render(:inline=>'<%= "<>" %> <%== "<>" %><%= "<>" if false %>')
-      end
-    end
-
-    body.must_equal '&lt;&gt; <>'
-  end
-
-  deprecated "should consider classes in :escape_safe_classes as safe" do
-    c = Class.new(String)
-    c2 = Class.new(String)
-    app(:bare) do
-      plugin :render, :escape=>true, :escape_safe_classes=>c
-
-      route do |r|
-        @c, @c2 = c, c2
-        render(:inline=>'<%= @c2.new("<>") %> <%= @c.new("<>") %>')
-      end
-    end
-
-    body.must_equal '&lt;&gt; <>'
-  end
-
-  deprecated "should covnert arguments to strings when escaping with safe classes" do
-    app(:bare) do
-      plugin :render, :escape=>true, :escape_safe_classes=>[]
-
-      route do |r|
-        render(:inline=>'<%= :"<>" %> <%== :"<>" %><%= :"<>" if false %>')
-      end
-    end
-
-    body.must_equal '&lt;&gt; <>'
-  end
-
-  deprecated "should allow use of custom :escaper" do
-    escaper = Object.new
-    def escaper.escape_xml(s)
-      s.gsub("'", "''")
-    end
-    app(:bare) do
-      plugin :render, :escape=>true, :escaper=>escaper
-
-      route do |r|
-        render(:inline=>'<%= "ab\'1" %> <%== "ab\'1" %>')
-      end
-    end
-
-    body.must_equal "ab''1 ab'1"
-  end
-
-  deprecated "should allow for per-branch escaping via set_view options" do
-    app(:bare) do
-      plugin :render, :escape=>true
-      plugin :view_options
-
-      route do |r|
-        set_view_options :template_opts=>{:engine_class=>nil}
-        r.is 'a' do
-          set_view_options :template_opts=>{:engine_class=>render_opts[:template_opts][:engine_class]}
-          render(:inline=>'<%= "<>" %>')
-        end
-        render(:inline=>'<%= "<>" %>')
-      end
-    end
-
-    body('/a').must_equal '&lt;&gt;'
-    body.must_equal '<>'
-  end
-end
-end