sinatra-subdomain 0.1.1 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 2f8c53e74401f55a751115abc8e9100a54a5610e8ce6560e796885841e86b8e0
+  data.tar.gz: a4c173180de33d07cd060c566c4d4cff7f83174b31e0e61f3b71386c5a12cab5
+SHA512:
+  metadata.gz: 49bfccce1571b7ea19670bac0aee42959efc3ec6af384a47a949c19d46e2f08f2aaca3ae82dff3c0092d2af7a92d9e60577ce41d3b5311502da509ec8ed9d9ad
+  data.tar.gz: a51325cf941367814569bdf4700f665b90ec54d42e521e49384763049a17db48026298ecaed11986355065f1db54fce195d11964a1c90513670ea8b058f009db

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+---
+github: [fnando]
+custom: ["https://www.paypal.me/nandovieira/🍕"]

data/.gitignore

@@ -1 +1,3 @@
-pkg
+pkg
+*.lock
+coverage

data/.rubocop.yml

@@ -0,0 +1,23 @@
+---
+inherit_gem:
+  rubocop-fnando: .rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.7
+  NewCops: enable
+
+Naming/FileName:
+  Exclude:
+    - lib/sinatra-subdomain.rb
+
+Style/OptionalBooleanParameter:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+cache: bundler
+sudo: false
+
+notifications:
+  email: false
+
+rvm:
+  - 2.7.1
+  - 2.6.5
+
+gemfile:
+  - gemfiles/sinatra_2_1.gemfile
+  - gemfiles/sinatra_2_0.gemfile
+  - gemfiles/sinatra_1_4.gemfile
+
+env:
+  global:
+    secure: Zq3YrKeSaVI0U5bcYDDnCOxbQDHPpPmTrNGe0M2qtVwN1tibpULIdZVMGOjJ4C4Ulk8OXqpI63aLkWm7fKIT0bQXvGK+w3bksUIHk2jODHfKb/ZDDfAoKhfU1APXnxcGbw06/FDyihWJFYdxrLZBilnvDmcqVz47DvmFBAlPuQ4=

data/Gemfile

@@ -1,2 +1,5 @@
-source :rubygems
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
 gemspec

data/README.md

@@ -0,0 +1,124 @@
+# Sinatra Subdomain
+
+[![Travis-CI](https://travis-ci.org/fnando/sinatra-subdomain.svg)](https://travis-ci.org/fnando/sinatra-subdomain)
+[![Code Climate](https://codeclimate.com/github/fnando/sinatra-subdomain/badges/gpa.svg)](https://codeclimate.com/github/fnando/sinatra-subdomain)
+[![Gem](https://img.shields.io/gem/v/sinatra-subdomain.svg)](https://rubygems.org/gems/sinatra-subdomain)
+[![Gem](https://img.shields.io/gem/dt/sinatra-subdomain.svg)](https://rubygems.org/gems/sinatra-subdomain)
+
+## Installation
+
+```
+gem install sinatra-subdomain
+```
+
+## Usage
+
+```ruby
+require "sinatra"
+require "sinatra/subdomain"
+
+# Specify which subdomain you want
+subdomain :foo do
+  get "/" do
+    "render page for FOO"
+  end
+end
+
+# If any subdomain is set
+subdomain do
+  get "/" do
+    "render page for #{subdomain} subdomain"
+  end
+end
+```
+
+If you're not building a classic app, make sure to register Sinatra::Subdomain
+yourself:
+
+```ruby
+require "sinatra"
+require "sinatra/subdomain"
+
+# Specify which subdomain you want
+class MyApp < Sinatra::Base
+  register Sinatra::Subdomain
+
+  subdomain :foo do
+    get "/" do
+      "render page for FOO"
+    end
+  end
+
+  # If any subdomain is set
+  subdomain do
+    get "/" do
+      "render page for #{subdomain} subdomain"
+    end
+  end
+end
+```
+
+You can also pass an array, regular expressions to match subdomains, or a proc:
+
+```ruby
+class MyApp < Sinatra::Base
+  register Sinatra::Subdomain
+
+  subdomain [:foo, :bar, :zaz] do
+    get "/" do
+      "render page for #{subdomain}"
+    end
+  end
+
+  # Matches www, www1, www2, etc.
+  subdomain /\Awww\d*\z/ do
+    get "/" do
+      "render page for #{subdomain} subdomain"
+    end
+  end
+
+  app_matcher = lambda do |subdomain|
+    App.where(subdomain: actual_subdomain).exist?
+  end
+
+  subdomain(app_matcher) do
+    get "/" do
+      "render page for #{subdomain} app"
+    end
+  end
+end
+```
+
+By default, sinatra-subdomain will consider 1 TLD as in <tt>example.com</tt>.
+You can specify your TLD size for domains like <tt>example.com.br</tt> or
+<tt>example.co.uk</tt>.
+
+```ruby
+require "sinatra"
+require "sinatra/subdomain"
+
+set :tld_size, 2
+```
+
+# License
+
+(The MIT License)
+
+Copyright © 2010 - Nando Vieira (http://nandovieira.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the ‘Software’), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,11 +1,15 @@
-require "bundler"
-Bundler::GemHelper.install_tasks
-
-desc "Run tests"
-task :test do
-  # Hack needed: some tests failed when using different Rack apps
-  # with rake/testtask
-  %w[ subdomain_test.rb multiple_tlds_test.rb ].each do |file|
-    system "ruby -rubygems -Ilib -Itest test/#{file}"
-  end
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rake/testtask"
+require "rubocop/rake_task"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/**/*_test.rb"]
+  t.warning = false
 end
+
+RuboCop::RakeTask.new
+
+task default: %i[test rubocop]

data/gemfiles/sinatra_1_4.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "sinatra", "~> 1.4", ">= 1.4.7"

data/gemfiles/sinatra_2_0.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "sinatra", "~> 2.0.0"

data/gemfiles/sinatra_2_1.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "sinatra", "~> 2.1.0"

data/lib/sinatra/subdomain.rb

@@ -1,29 +1,97 @@
+# frozen_string_literal: true
+
 require "sinatra/base"
 require "uri"
+require "resolv"
 
 module Sinatra
   module Subdomain
+    class << self
+      attr_accessor :app, :subdomain
+    end
+
+    SINATRA_V2 = Gem::Requirement.create([">=2.0"]).satisfied_by?(
+      Gem::Version.create(Sinatra::VERSION)
+    )
+
     module Helpers
       def subdomain
-        uri = URI.parse("http://#{request.env["HTTP_HOST"]}")
+        uri = URI.parse("http://#{request.env['HTTP_HOST']}")
+        return if Sinatra::Subdomain.ip_address?(uri.host)
+
         parts = uri.host.split(".")
         parts.pop(settings.tld_size + 1)
-        parts.first
+
+        parts.empty? ? nil : parts.join(".")
+      end
+    end
+
+    # This is how this works:
+    #
+    # 1. Whenever you call `subdomain(&block)`, this is the method that's going
+    #    to be executed.
+    # 2. For each `subdomain` block, we set the app and subdomain condition as
+    #    `Sinatra::Subdomain.app` and `Sinatra::Subdomain.subdomain`.
+    # 3. Then, we yield the block, which will add the routes as needed.
+    # 4. After each route is added, Sinatra triggers a hook called
+    #    `:route_added`, handled by the `routed_added` method below.
+    # 5. The `routed_added` method will hijack the routes, adding the subdomain
+    #    condition.
+    def subdomain(expected_subdomain = true)
+      ::Sinatra::Subdomain.tap do |mod|
+        mod.app = self
+        mod.subdomain = expected_subdomain
+      end
+
+      yield
+
+      ::Sinatra::Subdomain.tap do |mod|
+        mod.app = nil
+        mod.subdomain = nil
       end
     end
 
-    def subdomain(expected_subdomain = nil, &block)
-      condition do
-        if expected_subdomain
-          expected_subdomain.to_s == subdomain
-        elsif subdomain
-          true
+    def self.ip_address?(host)
+      host =~ Resolv::IPv4::Regex || host =~ Resolv::IPv6::Regex
+    end
+
+    def self.match_subdomain?(expected, actual)
+      expected.any? do |expected_subdomain|
+        case expected_subdomain
+        when true
+          !actual.nil?
+        when Symbol
+          actual.to_s == expected_subdomain.to_s
         else
-          false
+          expected_subdomain === actual # rubocop:disable Style/CaseEquality
         end
       end
+    end
 
-      yield
+    def self.route_added(verb, _path, _block)
+      return unless subdomain && app
+
+      routes = app.instance_variable_get("@routes")
+      last_route = routes[verb].last
+      expected = [subdomain].flatten.compact
+
+      condition = app.instance_eval do
+        generate_method :subdomain_matcher do
+          ::Sinatra::Subdomain.match_subdomain?(expected, subdomain)
+        end
+      end
+
+      add_condition(last_route, condition)
+    end
+
+    if SINATRA_V2
+      def self.add_condition(last_route, condition)
+        last_route[1] << condition
+      end
+    else
+      def self.add_condition(last_route, condition)
+        last_route[2] << condition
+      end
     end
 
     def self.registered(app)

data/lib/sinatra/subdomain/version.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Sinatra
   module Subdomain
     module Version
       MAJOR = 0
-      MINOR = 1
-      PATCH = 1
+      MINOR = 4
+      PATCH = 0
       STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     end
   end
-end
+end

data/sinatra-subdomain.gemspec

@@ -1,6 +1,6 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "sinatra/subdomain/version"
+# frozen_string_literal: true
+
+require "./lib/sinatra/subdomain/version"
 
 Gem::Specification.new do |s|
   s.name        = "sinatra-subdomain"
@@ -10,15 +10,23 @@ Gem::Specification.new do |s|
   s.email       = ["fnando.vieira@gmail.com"]
   s.homepage    = "http://rubygems.org/gems/sinatra-subdomain"
   s.summary     = "Separate routes for subdomains on Sinatra"
+  s.license     = "MIT"
   s.description = s.summary
+  s.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`
+                    .split("\n")
+                    .map {|f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_dependency "sinatra"
-  s.add_development_dependency "rake"
+  s.add_development_dependency "minitest-utils"
+  s.add_development_dependency "pry-meta"
   s.add_development_dependency "rack-test"
-  s.add_development_dependency "capybara"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rubocop"
+  s.add_development_dependency "rubocop-fnando"
+  s.add_development_dependency "simplecov"
 end

data/test/sinatra-subdomain/ip_address_test.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class IpAddressTest < Minitest::Test
+  def app
+    App
+  end
+
+  test "renders no subdomain root page" do
+    header "HOST", "127.0.0.1"
+    get "/"
+
+    assert_equal "root", last_response.body
+  end
+
+  test "renders no subdomain about page" do
+    header "HOST", "127.0.0.1"
+    get "/about"
+
+    assert_equal "about", last_response.body
+  end
+end

data/test/sinatra-subdomain/multiple_subdomain_test.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class MultipleSubdomainTest < Minitest::Test
+  include SubdomainTests
+  let(:tld) { ".com" }
+end

data/test/sinatra-subdomain/multiple_tlds_test.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class MultipleTldsTest < Minitest::Test
+  include SubdomainTests
+  let(:tld) { ".com.br" }
+end

data/test/sinatra-subdomain/single_tld_test.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SingleTldTest < Minitest::Test
+  include SubdomainTests
+  let(:tld) { ".org" }
+end

data/test/sinatra-subdomain/subdomains_test.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SubdomainsTest < Minitest::Test
+  def app
+    App
+  end
+
+  test "renders listed subdomain (a)" do
+    header "HOST", "a.example.com"
+    get "/"
+
+    assert_equal "array: a", last_response.body
+  end
+
+  test "renders listed subdomain (b)" do
+    header "HOST", "b.example.com"
+    get "/"
+
+    assert_equal "array: b", last_response.body
+  end
+
+  test "renders matched subdomain (c)" do
+    header "HOST", "c.example.com"
+    get "/"
+
+    assert_equal "regex: c", last_response.body
+  end
+
+  test "renders matched subdomain (d)" do
+    header "HOST", "d.example.com"
+    get "/"
+
+    assert_equal "regex: d", last_response.body
+  end
+
+  test "renders matched subdomain (e)" do
+    header "HOST", "e.example.com"
+    get "/"
+
+    assert_equal "proc: e", last_response.body
+  end
+end

data/test/support/app.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class App < Sinatra::Base
+  register Sinatra::Subdomain
+
+  subdomain :foo do
+    get("/") { "set: #{subdomain}" }
+    get("/about") { "set: about #{subdomain}" }
+  end
+
+  subdomain "foo.bar" do
+    get("/") { "multiple: #{subdomain}" }
+    get("/about") { "multiple: about #{subdomain}" }
+  end
+
+  subdomain [:a, :b] do
+    get("/") { "array: #{subdomain}" }
+  end
+
+  subdomain(/\A(c|d)\z/) do
+    get("/") { "regex: #{subdomain}" }
+  end
+
+  subdomain(->(actual) { actual == "e" }) do
+    get("/") { "proc: #{subdomain}" }
+  end
+
+  subdomain do
+    get("/") { "any: #{subdomain}" }
+    get("/about") { "any: about #{subdomain}" }
+  end
+
+  get("/") { "root" }
+  get("/about") { "about" }
+end

data/test/support/subdomain_tests.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module SubdomainTests
+  def app
+    current_tld = tld
+
+    Class.new(App) do
+      set :tld_size, current_tld.split(".").size - 1
+    end
+  end
+
+  def self.included(base)
+    base.class_eval do
+      test "when specific subdomain is required - renders root page" do
+        header "HOST", "foo.example#{tld}"
+        get "/"
+
+        assert_equal "set: foo", last_response.body
+      end
+
+      test "when specific subdomain is required - renders about page" do
+        header "HOST", "foo.example#{tld}"
+        get "/about"
+
+        assert_equal "set: about foo", last_response.body
+      end
+
+      test "when any subdomain is required - renders root page" do
+        header "HOST", "mail.example#{tld}"
+        get "/"
+
+        assert_equal "any: mail", last_response.body
+      end
+
+      test "when any subdomain is required - renders about page" do
+        header "HOST", "mail.example#{tld}"
+        get "/about"
+
+        assert_equal "any: about mail", last_response.body
+      end
+
+      test "when no subdomain is required - renders root page" do
+        header "HOST", "example#{tld}"
+        get "/"
+
+        assert_equal "root", last_response.body
+      end
+
+      test "when no subdomain is required - renders about page" do
+        header "HOST", "example#{tld}"
+        get "/about"
+
+        assert_equal "about", last_response.body
+      end
+
+      test "when multi-subdomain is required - renders root page" do
+        header "HOST", "foo.bar.example#{tld}"
+        get "/"
+
+        assert_equal "multiple: foo.bar", last_response.body
+      end
+
+      test "when multi-subdomain is required - renders about page" do
+        header "HOST", "foo.bar.example#{tld}"
+        get "/about"
+
+        assert_equal "multiple: about foo.bar", last_response.body
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,41 +1,20 @@
-require "test/unit"
-require "rack/test"
-require "capybara"
-require "capybara/dsl"
-
-require "sinatra/subdomain"
-
-Capybara.default_driver = :selenium
+# frozen_string_literal: true
 
-class Test::Unit::TestCase
-  include Capybara::DSL
-end
-
-class SampleApp < Sinatra::Base
-  register Sinatra::Subdomain
+require "simplecov"
+SimpleCov.start
 
-  subdomain :foo do
-    get("/") { "set: #{subdomain}" }
-  end
+require "bundler/setup"
 
-  subdomain do
-    get("/") { "any: #{subdomain}" }
-  end
-
-  get("/") { "root" }
-end
-
-class MultipleTldsApp < Sinatra::Base
-  register Sinatra::Subdomain
-  set :tld_size, 2
+require "minitest/utils"
+require "minitest/autorun"
+require "rack/test"
+require "sinatra/subdomain"
+require "yaml"
 
-  subdomain :foo do
-    get("/") { "set: #{subdomain}" }
-  end
+Dir["./test/support/**/*.rb"].sort.each {|file| require file }
 
-  subdomain do
-    get("/") { "any: #{subdomain}" }
+module Minitest
+  class Test
+    include Rack::Test::Methods
   end
-
-  get("/") { "root" }
 end

metadata

@@ -1,60 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-subdomain
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70271793132080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70271793132080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70271793129920 !ruby/object:Gem::Requirement
-    none: false
+  name: minitest-utils
+  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: pry-meta
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271793129920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70271793128720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271793128720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &70271793143680 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271793143680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: rubocop-fnando
+  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: simplecov
+  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'
 description: Separate routes for subdomains on Sinatra
 email:
 - fnando.vieira@gmail.com
@@ -62,48 +129,56 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".github/FUNDING.yml"
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
-- README.rdoc
+- README.md
 - Rakefile
+- gemfiles/sinatra_1_4.gemfile
+- gemfiles/sinatra_2_0.gemfile
+- gemfiles/sinatra_2_1.gemfile
 - lib/sinatra/subdomain.rb
 - lib/sinatra/subdomain/version.rb
 - sinatra-subdomain.gemspec
-- test/multiple_tlds_test.rb
-- test/subdomain_test.rb
+- test/sinatra-subdomain/ip_address_test.rb
+- test/sinatra-subdomain/multiple_subdomain_test.rb
+- test/sinatra-subdomain/multiple_tlds_test.rb
+- test/sinatra-subdomain/single_tld_test.rb
+- test/sinatra-subdomain/subdomains_test.rb
+- test/support/app.rb
+- test/support/subdomain_tests.rb
 - test/test_helper.rb
 homepage: http://rubygems.org/gems/sinatra-subdomain
-licenses: []
-post_install_message: 
+licenses:
+- MIT
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -355263696072099514
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -355263696072099514
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.10
-signing_key: 
-specification_version: 3
+rubygems_version: 3.1.2
+signing_key:
+specification_version: 4
 summary: Separate routes for subdomains on Sinatra
 test_files:
-- test/multiple_tlds_test.rb
-- test/subdomain_test.rb
+- test/sinatra-subdomain/ip_address_test.rb
+- test/sinatra-subdomain/multiple_subdomain_test.rb
+- test/sinatra-subdomain/multiple_tlds_test.rb
+- test/sinatra-subdomain/single_tld_test.rb
+- test/sinatra-subdomain/subdomains_test.rb
+- test/support/app.rb
+- test/support/subdomain_tests.rb
 - test/test_helper.rb

data/Gemfile.lock

@@ -1,49 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sinatra-subdomain (0.1.1)
-      sinatra
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    capybara (1.1.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.2.2)
-      ffi (~> 1.0.6)
-    ffi (1.0.9)
-    json_pure (1.5.4)
-      spruz (~> 0.2.8)
-    mime-types (1.16)
-    nokogiri (1.5.0)
-    rack (1.3.2)
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.5.0)
-      childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
-      rubyzip
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    spruz (0.2.13)
-    tilt (1.3.3)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  capybara
-  rack-test
-  rake
-  sinatra-subdomain!

data/README.rdoc

@@ -1,48 +0,0 @@
-= Sinatra Subdomain
-
-== Installation
-
-  sudo gem install sinatra-subdomain
-
-== Usage
-
-  require "sinatra"
-  require "sinatra/subdomain"
-
-  # Specify which subdomain you want
-  subdomain :foo do
-    get '/' do
-      "render page for FOO"
-    end
-  end
-
-  # If any subdomain is set
-  subdomain do
-    get '/' do
-      "render page for #{subdomain} subdomain"
-    end
-  end
-
-By default, sinatra-subdomain will consider 1 TLD as in <tt>example.com</tt>.
-You can specify your TLD size for domains like <tt>example.com.br</tt> or <tt>example.co.uk</tt>.
-
-  require "sinatra"
-  require "sinatra/subdomain"
-
-  set :tld_size, 2
-
-This extension was based on http://github.com/akahn/sinatra-subdomain/
-
-= License
-
-(The MIT License)
-
-Copyright © 2010:
-
-* Nando Vieira (http://simplesideias.com.br)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/multiple_tlds_test.rb

@@ -1,25 +0,0 @@
-require "test_helper"
-
-class MultipleTldsTest < Test::Unit::TestCase
-  def setup
-    Capybara.app = MultipleTldsApp
-  end
-
-  def test_specified_subdomain
-    visit "http://foo.smackaho.smackaho.st:9887/"
-    assert page.has_content? "set: foo"
-  end
-
-  def test_any_subdomain
-    visit "http://status.smackaho.smackaho.st:9887/"
-    assert page.has_content? "any: status"
-
-    visit "http://mail.smackaho.smackaho.st:9887/"
-    assert page.has_content? "any: mail"
-  end
-
-  def test_root
-    visit "http://smackaho.smackaho.st:9887/"
-    assert page.has_content? "root"
-  end
-end

data/test/subdomain_test.rb

@@ -1,25 +0,0 @@
-require "test_helper"
-
-class SubdomainTest < Test::Unit::TestCase
-  def setup
-    Capybara.app = SampleApp
-  end
-
-  def test_specified_subdomain
-    visit "http://foo.smackaho.st:9887/"
-    assert page.has_content? "set: foo"
-  end
-
-  def test_any_subdomain
-    visit "http://status.smackaho.st:9887/"
-    assert page.has_content? "any: status"
-
-    visit "http://mail.smackaho.st:9887/"
-    assert page.has_content? "any: mail"
-  end
-
-  def test_root
-    visit "http://smackaho.st:9887/"
-    assert page.has_content? "root"
-  end
-end