rack-canonical-host 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60b35e0827776d7a2e063e985a5239bd479314bcf9c5f4e14f36d68ee995c850
-  data.tar.gz: 71463943b6c8707eb4a73db1f2f2e43f73539c5beddd03fd677112a13a26126b
+  metadata.gz: 8d04ccdf68037f3995ea1a93a9f7858d5363fa9e4eae2797d6b35eb14b00e0f2
+  data.tar.gz: 30f80af7f437c52e4bdbe61b3a95ee560bba6250546a4b02153d11565e0a9bc6
 SHA512:
-  metadata.gz: a34e6a6850579a3d8f0cdd1244468b5cc5b392912879ba9733b0a76e4895eedae167f2b2219fdabc3abf8450bb60ced81141842e3ed1418ce84e6926dfd6adb1
-  data.tar.gz: b8256000841f0bf5798f400e642b3f93e46abec2ae3a344306b5ad84f475cefb74c38cb0499965c2dd028d7f08391c9c38de3c7a5110167b25c7e7a1d27d7a1d
+  metadata.gz: 78b807b256f6683f3a8864e0f422208475cb03e4baa4bbce50a998000958f98b43f41deead8f400cb0ae78b9ee6b57b0bbb6d3d0504e9faf6b31db3ad13faccc
+  data.tar.gz: 3a7186d72cea3a465fece9c11d2e178f1e6f09fa29e39463b58b92440fba32ecc56f2ff42742f5ad1a9359f17a4bff8a2ad3344c47308fd16a71bc2abb540230

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.0 (2023-04-14)
+
+  * Add support for Rack 3.0 ([Vinny Diehl][vinnydiehl])
+  * Remove unneeded gem directives ([Olle Jonsson][olleolleolle])
+
 ## 1.1.0 (2021-11-10)
 
   * Support lambda/proc on `:if` and `:ignore` options ([Sean Huber][shuber])
@@ -27,7 +32,7 @@
   * Remove `:force_ssl` option in favor of using [rack-ssl][rack-ssl]
     ([Nathaniel Bibler][nbibler])
 
-[rack-ssl]: http://rubygems.org/gems/rack-ssl
+[rack-ssl]: https://rubygems.org/gems/rack-ssl
 
 ## 0.1.0 (2014-04-16)
 
@@ -74,16 +79,18 @@
 
   * Initial release ([Tyler Hunt][tylerhunt])
 
-[Aupajo]: http://github.com/Aupajo
-[finack]: http://github.com/finack
-[firedev]: http://github.com/firedev
-[jcarbo]: http://github.com/jcarbo
-[jellybob]: http://github.com/jellybob
-[jschuur]: http://github.com/jschuur
-[nbibler]: http://github.com/nbibler
-[rubymaverick]: http://github.com/ericallam
-[shuber]: http://github.com/shuber
-[squaresurf]: https://github.com/squaresurf
-[tma]: http://github.com/tma
-[tylerhunt]: http://github.com/tylerhunt
-[zoso10]: http://github.com/zoso10
+[Aupajo]: https://github.com/Aupajo
+[finack]: https://github.com/finack
+[firedev]: https://github.com/firedev
+[jcarbo]: https://github.com/jcarbo
+[jellybob]: https://github.com/jellybob
+[jschuur]: https://github.com/jschuur
+[nbibler]: https://github.com/nbibler
+[rubymaverick]: https://github.com/ericallam
+[shuber]: https://github.com/shuber
+[squaresurf]: httpss://github.com/squaresurf
+[tma]: https://github.com/tma
+[tylerhunt]: https://github.com/tylerhunt
+[zoso10]: https://github.com/zoso10
+[olleolleolle]: https://github.com/olleolleolle
+[vinnydiehl]: https://github.com/vinnydiehl

data/README.md

@@ -145,6 +145,6 @@ suggestions:
 
 ## Copyright
 
-Copyright © 2009-2021 Tyler Hunt.
+Copyright © 2009 Tyler Hunt.
 
 Released under the terms of the MIT license. See LICENSE for details.

data/lib/rack/canonical_host/redirect.rb

@@ -55,9 +55,9 @@ module Rack
 
       def headers
         {
-          'Cache-Control' => cache_control,
-          'Content-Type' => 'text/html',
-          'Location' => new_url,
+          'cache-control' => cache_control,
+          'content-type' => 'text/html',
+          'location' => new_url,
         }.reject { |_, value| !value }
       end
 

data/lib/rack/canonical_host/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class CanonicalHost
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-canonical-host
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tyler Hunt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -68,16 +68,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -92,39 +92,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".rspec"
-- Appraisals
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- gemfiles/rack_1.5.gemfile
-- gemfiles/rack_1.6.gemfile
-- gemfiles/rack_2.0.gemfile
-- gemfiles/rack_2.1.gemfile
-- gemfiles/rack_2.2.gemfile
 - lib/rack-canonical-host.rb
 - lib/rack/canonical_host.rb
 - lib/rack/canonical_host/redirect.rb
 - lib/rack/canonical_host/version.rb
-- rack-canonical-host.gemspec
-- spec/rack/canonical_host_spec.rb
-- spec/spec_helper.rb
-- spec/support/matchers/have_header.rb
-- spec/support/matchers/redirect_to.rb
 homepage: https://github.com/tylerhunt/rack-canonical-host
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,12 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Rack middleware for defining a canonical host name.
-test_files:
-- spec/rack/canonical_host_spec.rb
-- spec/spec_helper.rb
-- spec/support/matchers/have_header.rb
-- spec/support/matchers/redirect_to.rb
+test_files: []

data/.github/workflows/ci.yml

@@ -1,30 +0,0 @@
-name: CI
-on:
-  - push
-  - pull_request
-jobs:
-  test:
-    name: Ruby ${{ matrix.ruby }} & Rack ${{ matrix.rack }}
-    runs-on: 'ubuntu-latest'
-    strategy:
-      matrix:
-        ruby:
-          - '3.0'
-          - '2.7'
-          - '2.6'
-        rack:
-          - '1.5'
-          - '1.6'
-          - '2.0'
-          - '2.1'
-          - '2.2'
-      fail-fast: false
-    env:
-      BUNDLE_GEMFILE: "gemfiles/rack_${{ matrix.rack }}.gemfile"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - run: bundle install
-      - run: bundle exec rake

data/.gitignore

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.rvmrc
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc
-gemfiles/*.lock
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.rspec

@@ -1,3 +0,0 @@
---color
---warnings
---require spec_helper

data/Appraisals

@@ -1,19 +0,0 @@
-appraise 'rack-1.5' do
-  gem 'rack', '~> 1.5.0'
-end
-
-appraise 'rack-1.6' do
-  gem 'rack', '~> 1.6.0'
-end
-
-appraise 'rack-2.0' do
-  gem 'rack', '~> 2.0.0'
-end
-
-appraise 'rack-2.1' do
-  gem 'rack', '~> 2.1.0'
-end
-
-appraise 'rack-2.2' do
-  gem 'rack', '~> 2.2.0'
-end

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Rakefile

@@ -1,8 +0,0 @@
-#!/usr/bin/env rake
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/gemfiles/rack_1.5.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack", "~> 1.5.0"
-
-gemspec path: "../"

data/gemfiles/rack_1.6.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack", "~> 1.6.0"
-
-gemspec path: "../"

data/gemfiles/rack_2.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack", "~> 2.0.0"
-
-gemspec path: "../"

data/gemfiles/rack_2.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack", "~> 2.1.0"
-
-gemspec path: "../"

data/gemfiles/rack_2.2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack", "~> 2.2.0"
-
-gemspec path: "../"

data/rack-canonical-host.gemspec

@@ -1,20 +0,0 @@
-require './lib/rack/canonical_host/version'
-
-Gem::Specification.new do |gem|
-  gem.name = 'rack-canonical-host'
-  gem.version = Rack::CanonicalHost::VERSION
-  gem.summary = 'Rack middleware for defining a canonical host name.'
-  gem.homepage = 'https://github.com/tylerhunt/rack-canonical-host'
-  gem.author = 'Tyler Hunt'
-
-  gem.add_dependency 'addressable', '> 0', '< 3'
-  gem.add_dependency 'rack', ['>= 1.0.0', '< 3']
-  gem.add_development_dependency 'appraisal', '~> 2.2'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 3.0'
-
-  gem.files = `git ls-files`.split($\)
-  gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ['lib']
-end

data/spec/rack/canonical_host_spec.rb

@@ -1,275 +0,0 @@
-RSpec.describe Rack::CanonicalHost do
-  let(:app_response) { [200, { 'Content-Type' => 'text/plain' }, %w(OK)] }
-  let(:inner_app) { ->(env) { response } }
-
-  before do
-    allow(inner_app)
-      .to receive(:call)
-      .with(env)
-      .and_return(app_response)
-  end
-
-  def build_app(host=nil, options={}, inner_app=inner_app(), &block)
-    Rack::Builder.new do
-      use Rack::Lint
-      use Rack::CanonicalHost, host, options, &block
-      run inner_app
-    end
-  end
-
-  shared_context 'a matching request' do
-    context 'with a request to a matching host' do
-      let(:url) { 'http://example.com/full/path' }
-
-      it { should_not be_redirect }
-
-      it 'calls the inner app' do
-        expect(inner_app).to receive(:call).with(env)
-        call_app
-      end
-    end
-  end
-
-  shared_context 'a non-matching request' do
-    context 'with a request to a non-matching host' do
-      let(:url) { 'http://www.example.com/full/path' }
-
-      it { should redirect_to('http://example.com/full/path') }
-
-      it 'does not call the inner app' do
-        expect(inner_app).to_not receive(:call)
-        call_app
-      end
-
-      it { expect(response).to_not have_header('Cache-Control') }
-    end
-  end
-
-  shared_context 'matching and non-matching requests' do
-    include_context 'a matching request'
-    include_context 'a non-matching request'
-  end
-
-  context '#call' do
-    let(:headers) { {} }
-
-    let(:app) { build_app('example.com') }
-    let(:env) { Rack::MockRequest.env_for(url, headers) }
-
-    def call_app
-      app.call(env)
-    end
-
-    subject(:response) { call_app }
-
-    include_context 'a matching request'
-    include_context 'a non-matching request'
-
-    context 'when the request has a pipe in the URL' do
-      let(:url) { 'https://example.com/full/path?value=withPIPE' }
-
-      before { env['QUERY_STRING'].sub!('PIPE', '|') }
-
-      it { expect { call_app }.to_not raise_error }
-    end
-
-    context 'when the request has JavaScript in the URL' do
-      let(:url) { 'http://www.example.com/full/path' }
-
-      let(:headers) {
-        { 'QUERY_STRING' => '"><script>alert(73541);</script>' }
-      }
-
-      let(:app) { build_app('example.com') }
-
-      it 'escapes the JavaScript' do
-        expect(response)
-          .to redirect_to('http://example.com/full/path?%22%3E%3Cscript%3Ealert(73541)%3B%3C/script%3E')
-      end
-    end
-
-    context 'with an X-Forwarded-Host' do
-      let(:url) { 'http://proxy.test/full/path' }
-
-      context 'which matches the canonical host' do
-        let(:headers) { { 'HTTP_X_FORWARDED_HOST' => 'example.com:80' } }
-
-        include_context 'a matching request'
-      end
-
-      context 'which does not match the canonical host' do
-        let(:headers) { { 'HTTP_X_FORWARDED_HOST' => 'www.example.com:80' } }
-
-        include_context 'a non-matching request'
-      end
-    end
-
-    context 'without a host' do
-      let(:app) { build_app(nil) }
-
-      include_context 'a matching request'
-    end
-
-    context 'with :ignore option' do
-      context 'with lambda/proc' do
-        let(:app) {
-          build_app(
-            'example.com',
-            ignore: ->(uri) { uri.host == 'example.net' }
-          )
-        }
-
-        include_context 'a matching request'
-        include_context 'a non-matching request'
-
-        context 'with a request to an ignored host' do
-          let(:url) { 'http://example.net/full/path' }
-
-          it { should_not be_redirect }
-
-          it 'calls the inner app' do
-            expect(inner_app).to receive(:call).with(env)
-            call_app
-          end
-        end
-      end
-
-      context 'with string' do
-        let(:app) { build_app('example.com', ignore: 'example.net') }
-
-        include_context 'a matching request'
-        include_context 'a non-matching request'
-
-        context 'with a request to an ignored host' do
-          let(:url) { 'http://example.net/full/path' }
-
-          it { should_not be_redirect }
-
-          it 'calls the inner app' do
-            expect(inner_app).to receive(:call).with(env)
-            call_app
-          end
-        end
-      end
-
-      context 'with regular expression' do
-        let(:app) { build_app('example.com', ignore: /ex.*\.net/) }
-
-        include_context 'a matching request'
-        include_context 'a non-matching request'
-
-        context 'with a request to an ignored host' do
-          let(:url) { 'http://example.net/full/path' }
-
-          it { should_not be_redirect }
-
-          it 'calls the inner app' do
-            expect(inner_app).to receive(:call).with(env)
-            call_app
-          end
-        end
-      end
-    end
-
-    context 'with :if option' do
-      context 'with a lambda/proc' do
-        let(:app) {
-          build_app(
-            'www.example.com',
-            if: ->(uri) { uri.host == 'example.com' }
-          )
-        }
-
-        context 'with a request to a matching host' do
-          let(:url) { 'http://example.com/full/path' }
-
-          it { should redirect_to('http://www.example.com/full/path') }
-        end
-
-        context 'with a request to a non-matching host' do
-          let(:url) { 'http://api.example.com/full/path' }
-
-          it { should_not be_redirect }
-        end
-      end
-
-      context 'with string' do
-        let(:app) { build_app('www.example.com', if: 'example.com') }
-
-        context 'with a request to a matching host' do
-          let(:url) { 'http://example.com/full/path' }
-
-          it { should redirect_to('http://www.example.com/full/path') }
-        end
-
-        context 'with a request to a non-matching host' do
-          let(:url) { 'http://api.example.com/full/path' }
-
-          it { should_not be_redirect }
-        end
-      end
-
-      context 'with a regular expression' do
-        let(:app) { build_app('example.com', if: '.*\.example\.com') }
-
-        context 'with a request to a matching host' do
-          let(:url) { 'http://www.example.com/full/path' }
-
-          it { should_not redirect_to('http://example.com/full/path') }
-        end
-
-        context 'with a request to a non-matching host' do
-          let(:url) { 'http://www.example.net/full/path' }
-
-          it { should_not be_redirect }
-        end
-      end
-    end
-
-    context 'with a :cache_control option' do
-      let(:url) { 'http://subdomain.example.net/full/path' }
-
-      context 'with a max-age value' do
-        let(:app) {
-          build_app('example.com', cache_control: 'max-age=3600')
-        }
-
-        it {
-          expect(response).to have_header('Cache-Control').with('max-age=3600')
-        }
-      end
-
-      context 'with a no-cache value' do
-        let(:app) { build_app('example.com', cache_control: 'no-cache') }
-
-        it { expect(subject).to have_header('Cache-Control').with('no-cache') }
-      end
-
-      context 'with a false value' do
-        let(:app) { build_app('example.com', cache_control: false) }
-
-        it { expect(subject).to_not have_header('Cache-Control') }
-      end
-
-      context 'with a nil value' do
-        let(:app) { build_app('example.com', cache_control: false) }
-
-        it { expect(subject).to_not have_header('Cache-Control') }
-      end
-    end
-
-    context 'with a block' do
-      let(:app) { build_app { 'example.com' } }
-
-      include_context 'a matching request'
-      include_context 'a non-matching request'
-
-      context 'that returns nil' do
-        let(:app) { build_app('example.com') { nil } }
-
-        include_context 'a matching request'
-        include_context 'a non-matching request'
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,26 +0,0 @@
-require 'rack/canonical_host'
-
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
-  require(file)
-end
-
-RSpec.configure do |config|
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  config.order = :random
-  Kernel.srand config.seed
-
-  if config.files_to_run.one?
-    config.default_formatter = 'doc'
-  end
-
-  config.expect_with :rspec do |expectations|
-    expectations.syntax = :expect
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.syntax = :expect
-    mocks.verify_partial_doubles = true
-  end
-end

data/spec/support/matchers/have_header.rb

@@ -1,56 +0,0 @@
-module HaveHeader
-  class Matcher
-    def initialize(expected_header)
-      self.expected_header = expected_header
-    end
-
-    def matches?(response)
-      _, self.actual_headers, _ = response
-
-      if expected_value
-        actual_header == expected_value
-      else
-        actual_header
-      end
-    end
-
-    def with(expected_value)
-      self.expected_value = expected_value
-      self
-    end
-
-    def description
-      sentence = "have header #{expected_header.inspect}"
-      sentence << " with #{expected_value.inspect}" if expected_value
-      sentence
-    end
-
-    def failure_message
-      "Expected response to #{description}"
-    end
-
-    def failure_message_when_negated
-      "Did not expect response to #{description}"
-    end
-
-  protected
-
-    attr_accessor :actual_headers
-    attr_accessor :expected_header
-    attr_accessor :expected_value
-
-  private
-
-    def actual_header
-      actual_headers[expected_header]
-    end
-  end
-
-  def have_header(name)
-    Matcher.new(name)
-  end
-end
-
-RSpec.configure do |config|
-  config.include HaveHeader
-end

data/spec/support/matchers/redirect_to.rb

@@ -1,81 +0,0 @@
-module RedirectTo
-  class Matcher
-    def initialize(expected_location)
-      self.expected_location = expected_location
-      self.expected_status_code = STATUS
-    end
-
-    def matches?(response)
-      self.actual_status_code, self.actual_headers, _ = response
-
-      status_code_matches? && location_matches?
-    end
-
-    def via(expected_status_code)
-      self.expected_status_code = expected_status_code
-      self
-    end
-
-    def description
-      if expected_status_code && expected_location
-        "redirect to #{expected_location.inspect} via #{expected_status_code}"
-      elsif expected_status_code
-        "redirect via #{expected_status_code}"
-      elsif expected_location
-        "redirect to #{expected_location.inspect}"
-      else
-        'be a redirect'
-      end
-    end
-
-    def failure_message
-      "Expected response to #{description}"
-    end
-
-    def failure_message_when_negated
-      "Did not expect response to #{description}"
-    end
-
-  protected
-
-    attr_accessor :actual_headers
-    attr_accessor :actual_status_code
-    attr_accessor :expected_location
-    attr_accessor :expected_status_code
-
-  private
-
-    LOCATION = 'Location'
-    STATUS = 301
-
-    def actual_location
-      actual_headers[LOCATION]
-    end
-
-    def status_code_matches?
-      if expected_status_code
-        actual_status_code == expected_status_code
-      else
-        actual_status_code.to_s =~ /^30[1237]$/
-      end
-    end
-
-    def location_matches?
-      if expected_location
-        expected_location == actual_location
-      end
-    end
-  end
-
-  def redirect_to(location)
-    Matcher.new(location)
-  end
-
-  def be_redirect
-    Matcher.new(nil).via(nil)
-  end
-end
-
-RSpec.configure do |config|
-  config.include RedirectTo
-end