rack-subdomain 0.2.1 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: eb8698dabd7a346578bee0b70ad7cfad99a922e1e5430bd3235ffa772275e7cf
+  data.tar.gz: a1bec06a3ea859f8074cf94074bc7dbe24caf3c686c70a23ef9c4252ad25b832
+SHA512:
+  metadata.gz: 779a34cb3e6bed260d7e95fdaf007835c4909422440e42dd9207ae267091890d7089f13ecf0c86d92ec4758a2c75c15e96d37d1d5d39d71579f3ddfb0bd525b5
+  data.tar.gz: 49ebf73dac7826e54768b893266c9e5df29746c0a3b7651c4ffa564d3d07093ab0ebaaca304411046412ebdf3ef1aed3b2fd2a6e1b67e13fb97f4ff68e674398

data/Gemfile

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

data/Gemfile.lock

@@ -1,25 +1,43 @@
 PATH
   remote: .
   specs:
-    rack-subdomain (0.2.1)
-      rack (>= 1.2.0, <= 2.0.0)
+    rack-subdomain (0.5.0)
+      ipaddress (~> 0.8.0)
+      rack (>= 1.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    minitest (2.11.4)
-    rack (1.4.1)
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    rspec (0.6.4)
+    diff-lcs (1.4.4)
+    ipaddress (0.8.3)
+    minitest (2.12.1)
+    rack (2.2.3)
+    rack-test (0.8.3)
+      rack (>= 1.0, < 3)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (~> 2.11.4)
+  minitest (~> 2.11)
   rack-subdomain!
-  rack-test (~> 0.6.1)
-  rake (~> 0.9.2)
-  rspec (~> 0.6.1)
+  rack-test (~> 0.6)
+  rake
+  rspec
+
+BUNDLED WITH
+   2.1.4

data/{LICENSE → LICENSE.md}

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Mattt Thompson (http://mattt.me/)
+Copyright (c) 2012 – 2019 Mattt (https://mat.tt/)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,19 +1,19 @@
 # rack-subdomain
 
-Rack middleware to transparently route requests with a subdomain to a specified path with substitutions. 
+Rack middleware to transparently route requests with a subdomain
+to a specified path with substitutions.
 
 ## Usage
 
 ### Gemfile
 
-``` ruby
+```ruby
 gem 'rack-subdomain'
 ```
 
 ### config.ru
 
-``` ruby
-
+```ruby
 # Simple Example
 
 use Rack::Subdomain, "example.com", to: "/users/:subdomain"
@@ -27,12 +27,9 @@ end
 
 ## Contact
 
-Mattt Thompson
-
-- http://github.com/mattt
-- http://twitter.com/mattt
-- m@mattt.me
+[Mattt](https://twitter.com/mattt)
 
 ## License
 
-rack-subdomain is available under the MIT license. See the LICENSE file for more info.
+rack-subdomain is available under the MIT license.
+See the LICENSE file for more info.

data/Rakefile

@@ -7,5 +7,4 @@ task :build => "#{gemspec.full_name}.gem"
 
 file "#{gemspec.full_name}.gem" => gemspec.files + ["rack-subdomain.gemspec"] do
   system "gem build rack-subdomain.gemspec"
-  system "gem install rack-subdomain-#{Rack::Subdomain::VERSION}.gem"
 end

data/lib/rack-subdomain.rb

@@ -1 +1,2 @@
 require 'rack/subdomain'
+require 'ipaddress'

data/lib/rack/subdomain.rb

@@ -1,7 +1,7 @@
+require 'ipaddress'
+
 module Rack
   class Subdomain
-    VERSION = '0.2.1'
-
     def initialize(app, domain, options = {}, &block)
       # Maintain compatibility with previous rack-subdomain gem
       options = {to: options} if options.is_a? String
@@ -20,7 +20,7 @@ module Rack
         raise ArgumentError, "missing `:to` option or block to define mapping"
       end
     end
-    
+
     def call(env)
       @env = env
       @subdomain = subdomain
@@ -49,13 +49,24 @@ module Rack
 
   private
 
+    def domain
+      case @domain
+      when Proc
+        @domain.call(@env['HTTP_HOST'])
+      when Regexp
+        @domain.match(@env['HTTP_HOST'])
+      else
+        @domain
+      end
+    end
+
     def subdomain
-      @env['HTTP_HOST'].sub(/\.?#{@domain}.*$/,'') unless @env['HTTP_HOST'].match(/^localhost/)
+      @env['HTTP_HOST'].sub(/\.?#{domain}.*$/,'') unless @env['HTTP_HOST'].nil? || @env['HTTP_HOST'].match(/^localhost/) || IPAddress.valid?(@env['SERVER_NAME'])
     end
 
     def remap_with_substituted_path!(path)
       scheme = @env["rack.url_scheme"]
-      host = "#{@subdomain}.#{@domain}"
+      host = "#{@subdomain}.#{domain}"
       port = ":#{@env['SERVER_PORT']}" unless @env['SERVER_PORT'] == '80'
       path = @env["PATH_INFO"] = ::File.join(path, @env["PATH_INFO"])
       query_string = "?" + @env["QUERY_STRING"] unless @env["QUERY_STRING"].empty?

data/lib/rack/subdomain/version.rb

@@ -0,0 +1,5 @@
+module Rack
+    class Subdomain
+      VERSION = '0.5.0'
+    end
+end

data/rack-subdomain.gemspec

@@ -1,25 +1,26 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "rack-subdomain"
+require "rack/subdomain/version"
 
 Gem::Specification.new do |s|
   s.name        = "rack-subdomain"
-  s.authors     = ["Mattt Thompson", "Piotr Sarnacki"]
-  s.email       = "m@mattt.me"
+  s.authors     = ["Mattt", "Piotr Sarnacki"]
+  s.email       = "mattt@me.com"
+  s.license     = "MIT"
   s.homepage    = "http://github.com/mattt/rack-subdomain"
   s.version     = Rack::Subdomain::VERSION
   s.platform    = Gem::Platform::RUBY
   s.summary     = "rack-subdomain"
   s.description = "Rack middleware to route requests with subdomains to specified routes with substitutions"
 
-  s.add_development_dependency "rspec", "~> 0.6.1"
-  s.add_development_dependency "rake",  "~> 0.9.2"
+  s.add_runtime_dependency "rack", ">= 1.2"
 
-  s.add_runtime_dependency "rack", ">= 1.2.0", "<= 2.0.0"
+  s.add_dependency "ipaddress", "~> 0.8.0"
 
-  s.add_development_dependency "minitest",  "~> 2.11.4"
-  s.add_development_dependency "rack-test", "~> 0.6.1"
-  s.add_development_dependency "rake",      "~> 0.9.2"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "minitest",  "~> 2.11"
+  s.add_development_dependency "rack-test", "~> 0.6"
 
   s.files         = Dir["./**/*"].reject { |file| file =~ /\.\/(bin|log|pkg|script|spec|test|vendor)/ }
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,162 +1,140 @@
 --- !ruby/object:Gem::Specification
 name: rack-subdomain
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
-- Mattt Thompson
+- Mattt
 - Piotr Sarnacki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :development
+        version: '1.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: ipaddress
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
+        version: 0.8.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - <=
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - <=
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.6'
 description: Rack middleware to route requests with subdomains to specified routes
   with substitutions
-email: m@mattt.me
+email: mattt@me.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./Gemfile
-- ./Gemfile.lock
-- ./lib/rack/subdomain.rb
-- ./lib/rack-subdomain.rb
-- ./LICENSE
-- ./rack-subdomain.gemspec
-- ./Rakefile
-- ./README.md
+- "./Gemfile"
+- "./Gemfile.lock"
+- "./LICENSE.md"
+- "./README.md"
+- "./Rakefile"
+- "./lib/rack-subdomain.rb"
+- "./lib/rack/subdomain.rb"
+- "./lib/rack/subdomain/version.rb"
+- "./rack-subdomain-0.4.0.gem"
+- "./rack-subdomain-0.4.1.gem"
+- "./rack-subdomain-0.5.0.gem"
+- "./rack-subdomain.gemspec"
 homepage: http://github.com/mattt/rack-subdomain
-licenses: []
+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: -539744315784908145
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -539744315784908145
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: rack-subdomain
 test_files: []