rack-action 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 74a9bc8e160da02a0c53074936764abea3aced77
-  data.tar.gz: 42e75bc860a854914a38d83ae4c454afec68f523
+SHA256:
+  metadata.gz: 03a0d1b48c3ca9e035024d5dabf9c428149985a3e06505476ae3489f6c940f97
+  data.tar.gz: 033546be4fbd8556aaa176997d9233c85a042d893665369cbd14945a34aa6f59
 SHA512:
-  metadata.gz: af7fd47ad7dcf3a15edb51fa13a29430257aa5e654e58e61739ff43b9e84fcd782760df3ab61519ea00e6e7ee57ad961ca0d4eee08b2ddb76b193e770d5d597b
-  data.tar.gz: 89a5763a701c7e342f5f7c07976d40a51eb67c031a8cc8d5adeac29aa4946fc7334071cdec3ad22f4ff094627ecc466a054bfa34c26afe7afa4c67b4d921dd42
+  metadata.gz: d6600e20be07734a3630f3ca4f880fe70fe573ce824f09fbd18ad83011bcd84fad610b45cfad52afa9b5e4e0f0fad4a3842512ec894a46d3d11c56d23ba1d6ce
+  data.tar.gz: a4d754d4828cca5eab3fe8fdcb689e1598dbbc76997ec9fe27bfd8303920aa6807751f7893f80d12911ac6d47ae19e6614773ca99cce274aee891208b8f40499

data/.ruby-version

@@ -0,0 +1 @@
+2.6.6

data/README.md

@@ -18,10 +18,10 @@ Or install it yourself as:
 
 ## Usage
 
-Rack::Action provides functionality to generate a Rack response. To use Rack::Action, you should subclass Rack::Action and provide your own implementation of `respond`.  The simplest Rack action is
+Rack::Action provides functionality to generate a Rack response. To use Rack::Action, you should subclass Rack::Action and provide your own implementation of `respond`. The simplest Rack action is
 one that just returns a string from respond:
 
-``` ruby
+```ruby
 require 'rack/action'
 
 class MyAction < Rack::Action
@@ -38,7 +38,7 @@ rackup file. Rack::Action is meant to be used with one action per
 page/endpoint in your application, so it is typically used in conjuction
 with something like [Rack::Router][rack-router], which would look something like this:
 
-``` ruby
+```ruby
 require 'rack/action'
 require 'rack/router'
 
@@ -65,19 +65,29 @@ run router
 Rack::Action makes an instance of [Rack::Request][rack-req] and [Rack::Response][rack-res] available
 which can be used to set headers, cookies, etc.
 
-``` ruby
+```ruby
 class ArticleAction < Rack::Action
   def respond
     article = Article.find(params["id"])
-    response['Content-Type'] = "text/xml"
-    article.to_xml
+    response['Content-Type'] = "application/json"
+    article.to_json
+  end
+end
+```
+
+Because responding with JSON is so common, Rack::Action will automatically convert the response to JSON unless the response is a String or an Array. Therefore, the following code snippet provides the same result as the previous:
+
+```ruby
+class ArticleAction < Rack::Action
+  def respond
+    Article.find(params["id"])
   end
 end
 ```
 
 You can use before filters to do things before respond is called:
 
-``` ruby
+```ruby
 class AccountAction < Rack::Action
   before_filter :load_current_user
 
@@ -93,7 +103,7 @@ end
 
 and you can of course share functionality across actions with inheritance:
 
-``` ruby
+```ruby
 class ApplicationAction < Rack::Action
   before_filter :login_required
 
@@ -117,9 +127,9 @@ class PrivateAction < ApplicationAction
 end
 ```
 
-Before filters will execute in the order they are defined.  If a before
+Before filters will execute in the order they are defined. If a before
 filter writes to the response, subsequent filters will not be executed
-and the respond method will not be executed.  As long as no before filters
+and the respond method will not be executed. As long as no before filters
 write to the response, subsequent filters and the respond
 method will be called.
 
@@ -134,4 +144,4 @@ method will be called.
 [rack]: http://rack.github.com/
 [rack-req]: http://rubydoc.info/gems/rack/Rack/Request
 [rack-res]: http://rubydoc.info/gems/rack/Rack/Response
-[rack-router]: https://github.com/pjb3/rack-router
+[rack-router]: https://github.com/pjb3/rack-router

data/config.ru

@@ -1,8 +1,8 @@
-require 'rack-action'
+require_relative "lib/rack/action"
 
 app = Class.new(Rack::Action) do
   def respond
-    pretty_json env.except("rack.input", "rack.errors")
+    env.reject{|k, _| ["rack.input", "rack.errors"].include?(k) }
   end
 end
 

data/lib/rack-action.rb

@@ -1 +1 @@
-require 'rack/action'
+require "rack/action"

data/lib/rack/action.rb

@@ -1,215 +1,224 @@
-require 'time'
-require 'json'
-require 'rack'
-require 'rack/filters'
-
-module Rack
-  class Action
-    VERSION = '0.5.1'
-
-    extend Filters
-
-    # @private
-    RACK_ROUTE_PARAMS = 'rack.route_params'.freeze
-    # @private
-    CONTENT_TYPE = 'Content-Type'.freeze
-    # @private
-    HTTP_ACCEPT = 'HTTP_ACCEPT'.freeze
-    # @private
-    TEXT_HTML = 'text/html'.freeze
-    # @private
-    APPLICATION_JSON = 'application/json'.freeze
-    # @private
-    LOCATION = 'Location'.freeze
-    # @private
-    DEFAULT_RESPONSE = "Default Rack::Action Response"
-    # @private
-    RACK_INPUT = 'rack.input'.freeze
-
-    # This implements the Rack interface
-    #
-    # @param [Hash] env The Rack environment
-    # @return [Array<Numeric, Hash, #each>] A Rack response
-    def self.call(env)
-      new(env).call
-    end
+require "time"
+require "json"
+require "rack"
+require_relative "filters"
+
+class Rack::Action
+  VERSION = "0.7.0".freeze
+
+  extend Rack::Filters
+
+  # @private
+  RACK_ROUTE_PARAMS = "rack.route_params".freeze
+  # @private
+  CONTENT_TYPE = "Content-Type".freeze
+  # @private
+  HTTP_ACCEPT = "HTTP_ACCEPT".freeze
+  # @private
+  TEXT_HTML = "text/html".freeze
+  # @private
+  APPLICATION_JSON = "application/json".freeze
+  # @private
+  LOCATION = "Location".freeze
+  # @private
+  DEFAULT_RESPONSE = "Default Rack::Action Response".freeze
+  # @private
+  RACK_INPUT = "rack.input".freeze
+
+  # This implements the Rack interface
+  #
+  # @param [Hash] env The Rack environment
+  # @return [Array<Numeric, Hash, #each>] A Rack response
+  def self.call(env)
+    new(env).call
+  end
 
-    attr_accessor :env, :request, :response, :params
+  attr_accessor :env
+  attr_writer :request, :response, :params
 
-    def initialize(env)
-      @env = env
-    end
+  def initialize(env)
+    @env = env
+  end
 
-    def request
-      @request ||= Rack::Request.new(env)
-    end
+  def request
+    @request ||= Rack::Request.new(env)
+  end
 
-    def response
-      @response ||= Rack::Response.new
-    end
+  def response
+    @response ||= Rack::Response.new
+  end
 
-    def params
-      @params ||= begin
-        p = request.params.merge(env[RACK_ROUTE_PARAMS] || {})
-        if request.content_type.to_s.include?(APPLICATION_JSON)
-          body = env[RACK_INPUT].read
-          env[RACK_INPUT].rewind
-          p.merge!(self.class.json_serializer.load(body)) if body.present?
-        end
-        p.respond_to?(:with_indifferent_access) ? p.with_indifferent_access : p
+  def params
+    @params ||= begin
+      p = request.params.merge(env[RACK_ROUTE_PARAMS] || {})
+      if request.content_type.to_s.include?(APPLICATION_JSON)
+        body = env[RACK_INPUT].read
+        env[RACK_INPUT].rewind
+        p.merge!(self.class.json_serializer.load(body)) if body.present?
       end
+      p.respond_to?(:with_indifferent_access) ? p.with_indifferent_access : p
     end
+  end
 
-    def format
-      if params[:format]
-        params[:format]
-      elsif env[HTTP_ACCEPT] == APPLICATION_JSON
-        "json"
-      else
-        "html"
-      end
+  def format
+    if params[:format]
+      params[:format]
+    elsif env[HTTP_ACCEPT] == APPLICATION_JSON
+      "json"
+    else
+      "html"
     end
+  end
 
-    # This is the main method responsible for generating a Rack response.
-    # You typically won't need to override this method or call it directly.
-    # First this will run the before filters for this action.
-    # If none of the before filters generate a response, this will call
-    # {#respond} to generate a response.
-    # All after filters for this action are called once the response
-    # is genenated.  Finally the response is returned.
-    #
-    # @return [Array<Numeric, Hash, #each>] A Rack response
-    def call
-      log_call
-      set_default_headers
-      run_before_filters
-      run_respond
-      run_after_filters
-      finish_response
-    end
+  # This is the main method responsible for generating a Rack response.
+  # You typically won't need to override this method or call it directly.
+  # First this will run the before filters for this action.
+  # If none of the before filters generate a response, this will call
+  # {#respond} to generate a response.
+  # All after filters for this action are called once the response
+  # is genenated.  Finally the response is returned.
+  #
+  # @return [Array<Numeric, Hash, #each>] A Rack response
+  def call
+    log_call
+    set_default_headers
+    run_before_filters
+    run_respond
+    run_after_filters
+    finish_response
+  end
 
-    # This is the main method that you should override in your action.
-    # You can either write to the response during this method, or simply
-    # return a string, which will be written to the response if the
-    # response is still empty after this is called.
-    #
-    # @return [String] The Rack response or a String
-    def respond
-      DEFAULT_RESPONSE
-    end
+  # This is the main method that you should override in your action.
+  # You can either write to the response during this method, or simply
+  # return a string, which will be written to the response if the
+  # response is still empty after this is called.
+  #
+  # @return [String] The Rack response or a String
+  def respond
+    DEFAULT_RESPONSE
+  end
 
-    # This is a convenience method that sets the Content-Type headers
-    # and writes the JSON String to the response.
-    #
-    # @param [Hash] data The data
-    # @param [Hash] options The options
-    # @option options [Fixnum] :status The response status code
-    # @return [String] The JSON
-    def json(data={}, options={})
-      response[CONTENT_TYPE] = APPLICATION_JSON
-      response.status = options[:status] if options.has_key?(:status)
-      response.write self.class.json_serializer.dump(data)
-    end
+  # This is a convenience method that sets the Content-Type headers
+  # and writes the JSON String to the response.
+  #
+  # @param [Hash] data The data
+  # @param [Hash] options The options
+  # @option options [Fixnum] :status The response status code
+  # @return [String] The JSON
+  def json(data={}, options={})
+    response[CONTENT_TYPE] = APPLICATION_JSON
+    response.status = options[:status] if options.has_key?(:status)
+    response.write self.class.json_serializer.dump(data)
+  end
 
-    # This is a convenience method that forms an absolute URL based on the
-    # url parameter, which can be a relative or absolute URL, and then
-    # sets the headers and the body appropriately to do a 302 redirect.
-    #
-    # @see #absolute_url
-    # @return [String] The absolute url
-    def redirect_to(url, options={})
-      full_url = absolute_url(url, options)
-      response[LOCATION] = full_url
-      respond_with 302
-      full_url
-    end
+  # This is a convenience method that forms an absolute URL based on the
+  # url parameter, which can be a relative or absolute URL, and then
+  # sets the headers and the body appropriately to do a 302 redirect.
+  #
+  # @see #absolute_url
+  # @return [String] The absolute url
+  def redirect_to(url, options={})
+    full_url = absolute_url(url, options)
+    response[LOCATION] = full_url
+    respond_with 302
+    full_url
+  end
 
-    # Convenience method to return a 404
-    def not_found
-      respond_with 404
-    end
+  # Convenience method to return a 404
+  def not_found
+    respond_with 404
+  end
 
-    # Convenience method to return a 403
-    def forbidden
-      respond_with 403
-    end
+  # Convenience method to return a 403
+  def forbidden
+    respond_with 403
+  end
 
-    # This is a convenience method to set the response code and
-    # set the response so that it stops respond process.
-    #
-    # @param [Fixnum] status_code The HTTP status code to use in the response
-    def respond_with(status_code)
-      response.status = status_code
-      response.write ''
-      nil
-    end
+  # This is a convenience method to set the response code and
+  # set the response so that it stops respond process.
+  #
+  # @param [Fixnum] status_code The HTTP status code to use in the response
+  def respond_with(status_code)
+    response.status = status_code
+    response.write ""
+    nil
+  end
 
-    # Generate an absolute url from the url.  If the url is already
-    # an absolute url, this will return it unchanged.
-    #
-    # @param [String] url The URL
-    # @param [Hash] options The options to use to generate the absolute URL
-    # @option options [true, false] :https If https should be used,
-    #   uses rack.url_scheme from the Rack env to determine the default
-    # @option options [String] :host The host to use,
-    #   uses SERVER_NAME form the Rack env for the default
-    # @option options [String, Numeric] :port The port to use,
-    #   users SERVER_PORT from the Rack env for the default
-    # @return [String] The absolute url
-    def absolute_url(url, options={})
-      URL.new(env, url, options).to_absolute
-    end
+  # Generate an absolute url from the url.  If the url is already
+  # an absolute url, this will return it unchanged.
+  #
+  # @param [String] url The URL
+  # @param [Hash] options The options to use to generate the absolute URL
+  # @option options [true, false] :https If https should be used,
+  #   uses rack.url_scheme from the Rack env to determine the default
+  # @option options [String] :host The host to use,
+  #   uses SERVER_NAME form the Rack env for the default
+  # @option options [String, Numeric] :port The port to use,
+  #   users SERVER_PORT from the Rack env for the default
+  # @return [String] The absolute url
+  def absolute_url(url, options={})
+    URL.new(env, url, options).to_absolute
+  end
 
-    protected
-    def log_call
-      if logger
-        logger.debug do
-          "#{self.class} #{request.env["REQUEST_METHOD"]} format: #{format.inspect}, params: #{params.inspect}"
-        end
-      end
-    end
+  protected
 
-    def set_default_headers
-      response[CONTENT_TYPE] = TEXT_HTML
+  def log_call
+    logger&.debug do
+      "#{self.class} #{request.env["REQUEST_METHOD"]} format: #{format.inspect}, params: #{params.inspect}"
     end
+  end
+
+  def set_default_headers
+    response[CONTENT_TYPE] = TEXT_HTML
+  end
 
-    def run_before_filters
-      self.class.before_filters.each do |filter|
-        logger.debug "Running #{filter} before filter" if logger
-        send(filter)
-        unless response.empty?
-          logger.debug "#{filter} responded, halting filter chain" if logger
-          return
-        end
+  def run_before_filters
+    self.class.before_filters.each do |filter|
+      logger&.debug "Running #{filter} before filter"
+      send(filter)
+      unless response.empty?
+        logger&.debug "#{filter} responded, halting filter chain"
+        return
       end
     end
+  end
+
+  def run_respond
+    return unless response.empty?
 
-    def run_respond
-      return if !response.empty?
-      body = respond
-      if response.empty?
+    body = respond
+
+    if response.empty?
+      if body.is_a?(String) || body.is_a?(Array)
         response.write body
       else
-        body
+        json body
       end
+    else
+      body
     end
+  end
 
-    def run_after_filters
-      self.class.after_filters.each do |filter|
-        logger.debug "Running #{filter} after filter" if logger
-        send(filter)
-      end
+  def run_after_filters
+    self.class.after_filters.each do |filter|
+      logger&.debug "Running #{filter} after filter"
+      send(filter)
     end
+  end
 
-    def finish_response
-      response.finish
-    end
+  def finish_response
+    response.finish
+  end
 
-    def logger
-      self.class.logger
-    end
+  def logger
+    self.class.logger
+  end
 
-    def self.logger
+  class << self
+    attr_writer :logger
+    attr_writer :json_serializer
+
+    def logger
       if defined? @logger
         @logger
       else
@@ -217,68 +226,60 @@ module Rack
       end
     end
 
-    def self.logger=(logger)
-      @logger = logger
-    end
-
-    def self.json_serializer
+    def json_serializer
       if defined? @json_serializer
         @json_serializer
       else
-        @json_serializer = if superclass.respond_to?(:json_serializer)
-          superclass.json_serializer
-        else
-          JSON
-        end
+        @json_serializer =
+          if superclass.respond_to?(:json_serializer)
+            superclass.json_serializer
+          else
+            JSON
+          end
       end
     end
+  end
 
-    def self.json_serializer=(json_serializer)
-      @json_serializer = json_serializer
+  # @private
+  class URL
+    HTTPS = "https".freeze
+    HTTP_PREFIX = "http://".freeze
+    HTTPS_PREFIX = "https://".freeze
+    ABSOLUTE_URL_REGEX = %r{\Ahttps?://}.freeze
+    RACK_URL_SCHEME = "rack.url_scheme".freeze
+    SERVER_NAME = "SERVER_NAME".freeze
+    SERVER_PORT = "SERVER_PORT".freeze
+    DEFAULT_HTTP_PORT = 80
+    DEFAULT_HTTPS_PORT = 443
+
+    attr_accessor :env, :url, :https, :host, :port
+
+    def initialize(env, url, options={})
+      @env = env
+      @url = url.to_s
+      @options = options || {}
+      @https = options.fetch(:https, env[RACK_URL_SCHEME] == HTTPS)
+      @host = options.fetch(:host, env[SERVER_NAME])
+      @port = Integer(options.fetch(:port, env[SERVER_PORT]))
     end
 
-    # @private
-    class URL
-      HTTPS = 'https'.freeze
-      HTTP_PREFIX = 'http://'.freeze
-      HTTPS_PREFIX = 'https://'.freeze
-      ABSOLUTE_URL_REGEX = /\Ahttps?:\/\//
-      RACK_URL_SCHEME = 'rack.url_scheme'
-      SERVER_NAME = 'SERVER_NAME'.freeze
-      SERVER_PORT = 'SERVER_PORT'.freeze
-      DEFAULT_HTTP_PORT = 80
-      DEFAULT_HTTPS_PORT = 443
-
-      attr_accessor :env, :url, :https, :host, :port
-
-      def initialize(env, url, options={})
-        @env = env
-        @url = url.to_s
-        @options = options || {}
-        @https = options.fetch(:https, env[RACK_URL_SCHEME] == HTTPS)
-        @host = options.fetch(:host, env[SERVER_NAME])
-        @port = Integer(options.fetch(:port, env[SERVER_PORT]))
-      end
-
-      def to_absolute
-        if url =~ ABSOLUTE_URL_REGEX
-          url
-        else
-          absolute_url = [prefix]
-          absolute_url << (port == default_port ? host : "#{host}:#{port}")
-          absolute_url << url
-          ::File.join(*absolute_url)
-        end
-      end
-
-      def prefix
-        https ? HTTPS_PREFIX : HTTP_PREFIX
+    def to_absolute
+      if url =~ ABSOLUTE_URL_REGEX
+        url
+      else
+        absolute_url = [prefix]
+        absolute_url << (port == default_port ? host : "#{host}:#{port}")
+        absolute_url << url
+        ::File.join(*absolute_url)
       end
+    end
 
-      def default_port
-        https ? DEFAULT_HTTPS_PORT : DEFAULT_HTTP_PORT
-      end
+    def prefix
+      https ? HTTPS_PREFIX : HTTP_PREFIX
     end
 
+    def default_port
+      https ? DEFAULT_HTTPS_PORT : DEFAULT_HTTP_PORT
+    end
   end
 end

data/lib/rack/filters.rb

@@ -1,40 +1,39 @@
-module Rack
-  module Filters
-    def before_filters
-      @before_filters ||= if superclass.respond_to?(:before_filters)
+module Rack::Filters
+  def before_filters
+    @before_filters ||=
+      if superclass.respond_to?(:before_filters)
         superclass.before_filters.dup
       else
         []
       end
-    end
+  end
 
-    def before_filter(method)
-      unless before_filters.include?(method)
-        before_filters << method
-      end
+  def before_filter(method)
+    unless before_filters.include?(method)
+      before_filters << method
     end
+  end
 
-    def skip_before_filter(method)
-      before_filters.delete(method)
-    end
+  def skip_before_filter(method)
+    before_filters.delete(method)
+  end
 
-    def after_filters
-      @after_filters ||= if superclass.respond_to?(:after_filters)
+  def after_filters
+    @after_filters ||=
+      if superclass.respond_to?(:after_filters)
         superclass.after_filters.dup
       else
         []
       end
-    end
+  end
 
-    def after_filter(method)
-      unless after_filters.include?(method)
-        after_filters << method
-      end
+  def after_filter(method)
+    unless after_filters.include?(method)
+      after_filters << method
     end
+  end
 
-    def skip_after_filter(method)
-      after_filters.delete(method)
-    end
+  def skip_after_filter(method)
+    after_filters.delete(method)
   end
 end
-

data/lib/rack_action.rb

@@ -1 +1 @@
-require 'rack/action'
+require "rack/action"

data/rack-action.gemspec

@@ -1,18 +1,16 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |gem|
   gem.authors       = ["Paul Barry"]
-  gem.email         = ["mail@paulbarry.com"]
-  gem.description   = %q{a small, simple framework for generating Rack responses}
-  gem.summary       = %q{a small, simple framework for generating Rack responses}
+  gem.email         = ["pauljbarry3@gmail.com"]
+  gem.description   = "a small, simple framework for generating Rack responses"
+  gem.summary       = "a small, simple framework for generating Rack responses"
   gem.homepage      = "http://github.com/pjb3/rack-action"
 
-  gem.files         = `git ls-files`.split($\)
+  gem.files         = `git ls-files`.split($ORS)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "rack-action"
   gem.require_paths = ["lib"]
-  gem.version       = "0.5.1"
+  gem.version       = "0.7.0"
 
   gem.add_runtime_dependency "rack"
 end

data/test/rack/action_test.rb

@@ -1,15 +1,13 @@
-require 'rack_action'
-require 'rack_test'
+require "rack_action"
+require "rack_test"
 
 class Rack::ActionTest < RackTest
-
   def test_default_respond
     app = Class.new(Rack::Action)
 
     response = get app, "/"
     assert_equal 200, response.status
-    assert_equal Rack::Action::DEFAULT_RESPONSE.length, response.length
-    assert_equal 'text/html', response["Content-Type"]
+    assert_equal "text/html", response["Content-Type"]
     assert_equal [Rack::Action::DEFAULT_RESPONSE], response.body
   end
 
@@ -23,24 +21,22 @@ class Rack::ActionTest < RackTest
     response = get app, "/"
 
     assert_equal 200, response.status
-    assert_equal 7, response.length
-    assert_equal 'text/html', response["Content-Type"]
-    assert_equal ['bananas'], response.body
+    assert_equal "text/html", response["Content-Type"]
+    assert_equal ["bananas"], response.body
   end
 
   def test_json_respond
     app = Class.new(Rack::Action) do
       def respond
-        json :hello => "world"
+        { hello: "world" }
       end
     end
-    expected = %{{"hello":"world"}}
+    expected = %({"hello":"world"})
 
     response = get app, "/"
 
     assert_equal 200, response.status
-    assert_equal expected.length, response.length
-    assert_equal 'application/json', response["Content-Type"]
+    assert_equal "application/json", response["Content-Type"]
     assert_equal [expected], response.body
   end
 
@@ -50,31 +46,12 @@ class Rack::ActionTest < RackTest
         json({:hello => "world"}, :status => 420)
       end
     end
-    expected = %{{"hello":"world"}}
+    expected = %({"hello":"world"})
 
     response = get app, "/"
 
     assert_equal 420, response.status
-    assert_equal expected.length, response.length
-    assert_equal 'application/json', response["Content-Type"]
-    assert_equal [expected], response.body
-  end
-
-  def test_pretty_json_respond
-    app = Class.new(Rack::Action) do
-      def respond
-        pretty_json :hello => "world"
-      end
-    end
-    expected = %{{
-  "hello": "world"
-}}
-
-    response = get app, "/"
-
-    assert_equal 200, response.status
-    assert_equal expected.length.to_s, response["Content-Length"]
-    assert_equal 'application/json', response["Content-Type"]
+    assert_equal "application/json", response["Content-Type"]
     assert_equal [expected], response.body
   end
 
@@ -99,7 +76,7 @@ class Rack::ActionTest < RackTest
   def test_before_filter_set_response
     app = Class.new(Rack::Action) do
       def respond
-        fail "respond should not be called if a before filter sets the response"
+        raise "respond should not be called if a before filter sets the response"
       end
 
       def set_response
@@ -117,7 +94,7 @@ class Rack::ActionTest < RackTest
   def test_redirect
     app = Class.new(Rack::Action) do
       def respond
-        fail "respond should not be called if a before filter sets the response"
+        raise "respond should not be called if a before filter sets the response"
       end
 
       def login_required
@@ -135,7 +112,7 @@ class Rack::ActionTest < RackTest
   def test_redirect_non_default_port
     app = Class.new(Rack::Action) do
       def respond
-        fail "respond should not be called if a before filter sets the response"
+        raise "respond should not be called if a before filter sets the response"
       end
 
       def login_required
@@ -153,7 +130,7 @@ class Rack::ActionTest < RackTest
   def test_redirect_non_default_port_option
     app = Class.new(Rack::Action) do
       def respond
-        fail "respond should not be called if a before filter sets the response"
+        raise "respond should not be called if a before filter sets the response"
       end
 
       def login_required
@@ -171,7 +148,7 @@ class Rack::ActionTest < RackTest
   def test_secure_redirect
     app = Class.new(Rack::Action) do
       def respond
-        fail "respond should not be called if a before filter sets the response"
+        raise "respond should not be called if a before filter sets the response"
       end
 
       def login_required
@@ -189,7 +166,7 @@ class Rack::ActionTest < RackTest
   def test_redirect_absolute_url
     app = Class.new(Rack::Action) do
       def respond
-        fail "respond should not be called if a before filter sets the response"
+        raise "respond should not be called if a before filter sets the response"
       end
 
       def login_required
@@ -203,5 +180,4 @@ class Rack::ActionTest < RackTest
     assert_equal 302, response.status
     assert_equal "http://test.com/login", response["Location"]
   end
-
 end

data/test/rack_test.rb

@@ -1,18 +1,17 @@
-require 'test/unit'
-require 'stringio'
-require 'logger'
-require 'fileutils'
+require "test/unit"
+require "stringio"
+require "logger"
+require "fileutils"
 
-if ENV['RACK_ACTION_TEST_LOGGER'].to_s.downcase == 'stdout'
+if ENV["RACK_ACTION_TEST_LOGGER"].to_s.downcase == "stdout"
   Rack::Action.logger = Logger.new(STDOUT)
-elsif ENV['RACK_ACTION_TEST_LOGGER']
-  log_file = File.expand_path(ENV['RACK_ACTION_TEST_LOGGER'])
+elsif ENV["RACK_ACTION_TEST_LOGGER"]
+  log_file = File.expand_path(ENV["RACK_ACTION_TEST_LOGGER"])
   FileUtils.mkdir_p File.dirname(log_file)
   Rack::Action.logger = Logger.new(log_file)
 end
 
 class RackTest < Test::Unit::TestCase
-
   DEFAULT_HOST = "example.com".freeze
   DEFAULT_PORT = 80
 
@@ -35,7 +34,9 @@ class RackTest < Test::Unit::TestCase
     resp = app.call(DEFAULT_ENV.merge({
       "REQUEST_METHOD" => method.to_s.upcase,
       "PATH_INFO" => path
-    }.merge(env)))
+    }.merge(env)
+                                     )
+                   )
     resp.is_a?(Rack::Response) ? resp : Rack::Response.new(resp[2], resp[0], resp[1])
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-action
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Paul Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2020-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -26,13 +26,13 @@ dependencies:
         version: '0'
 description: a small, simple framework for generating Rack responses
 email:
-- mail@paulbarry.com
+- pauljbarry3@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rvmrc"
+- ".ruby-version"
 - ".yardopts"
 - Gemfile
 - LICENSE
@@ -64,8 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: a small, simple framework for generating Rack responses

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.3@rack-action --create