rack-subdomain 0.2.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5959d46b21502dbf6990dbf7e52638f717cad88c
+  data.tar.gz: 6f1690afc1a59e46fb1180ea11c07d64e112ebdd
+SHA512:
+  metadata.gz: 4080b6caf3b42ba6df5e5f17471edd2341d3dae3ec5cb9863555be2f1da209b3f83dd13fdc06d25663e0550995e88d6b3ccf7b4a2e1206ae9f79f2469d72a026
+  data.tar.gz: 2f14cf9749e2fb0665b7a3adee42cd95dfc7b88a2c6df60ad57bb49f19ff0f3fc1e63b7c960b64d078b810289ed169c07ec8fab0b3c773bc83ebae641574fffd

data/Gemfile

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

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rack-subdomain (0.2.1)
+    rack-subdomain (0.3.0)
       rack (>= 1.2.0, <= 2.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     minitest (2.11.4)
     rack (1.4.1)
@@ -18,8 +18,8 @@ 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

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,6 +1,6 @@
 module Rack
   class Subdomain
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
 
     def initialize(app, domain, options = {}, &block)
       # Maintain compatibility with previous rack-subdomain gem
@@ -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'].match(/^localhost/)
     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/rack-subdomain.gemspec

@@ -12,14 +12,12 @@ Gem::Specification.new do |s|
   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.0", "<= 2.0.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,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-subdomain
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Mattt Thompson
@@ -10,44 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -58,7 +24,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -67,53 +32,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   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: rake
+  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: 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
@@ -126,37 +99,31 @@ files:
 - ./lib/rack/subdomain.rb
 - ./lib/rack-subdomain.rb
 - ./LICENSE
+- ./rack-subdomain-0.2.1.gem
 - ./rack-subdomain.gemspec
 - ./Rakefile
 - ./README.md
 homepage: http://github.com/mattt/rack-subdomain
 licenses: []
+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: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: rack-subdomain
 test_files: []