rack-subdomain 0.0.2 → 0.2.1

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,25 @@
+PATH
+  remote: .
+  specs:
+    rack-subdomain (0.2.1)
+      rack (>= 1.2.0, <= 2.0.0)
+
+GEM
+  remote: http://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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  minitest (~> 2.11.4)
+  rack-subdomain!
+  rack-test (~> 0.6.1)
+  rake (~> 0.9.2)
+  rspec (~> 0.6.1)

data/LICENSE

@@ -1,20 +1,19 @@
-Copyright (c) 2009 Piotr Sarnacki
+Copyright (c) 2012 Mattt Thompson (http://mattt.me/)
 
-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:
+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 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.
+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/README.md

@@ -0,0 +1,38 @@
+# rack-subdomain
+
+Rack middleware to transparently route requests with a subdomain to a specified path with substitutions. 
+
+## Usage
+
+### Gemfile
+
+``` ruby
+gem 'rack-subdomain'
+```
+
+### config.ru
+
+``` ruby
+
+# Simple Example
+
+use Rack::Subdomain, "example.com", to: "/users/:subdomain"
+
+# Complex Example
+use Rack::Subdomain, "example.com", except: ['', 'www', 'secure'] do
+  map 'downloads', to: "/downloads/:subdomain"
+  map '*', to: "/users/:subdomain"
+end
+```
+
+## Contact
+
+Mattt Thompson
+
+- http://github.com/mattt
+- http://twitter.com/mattt
+- m@mattt.me
+
+## License
+
+rack-subdomain is available under the MIT license. See the LICENSE file for more info.

data/Rakefile

@@ -0,0 +1,11 @@
+require "bundler"
+Bundler.setup
+
+gemspec = eval(File.read("rack-subdomain.gemspec"))
+
+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

@@ -0,0 +1 @@
+require 'rack/subdomain'

data/lib/rack/subdomain.rb

@@ -1,44 +1,66 @@
 module Rack
   class Subdomain
-    def initialize(app, domain, map_to = nil)
-      @domain = domain
+    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
+
+      @options = {except: ['', 'www']}.merge(options)
+
       @app = app
-      @map_to = map_to
-    end
+      @domain = domain
+      @mappings = {}
 
+      if @options[:to]
+        map('*', @options[:to])
+      elsif block_given?
+        instance_eval &block
+      else
+        raise ArgumentError, "missing `:to` option or block to define mapping"
+      end
+    end
+    
     def call(env)
       @env = env
-      subdomain = fetch_subdomain
-      set_params(subdomain)
+      @subdomain = subdomain
+
+      if @subdomain && !@subdomain.empty? && !@options[:except].include?(@subdomain)
+        pattern, route = @mappings.detect do |pattern, route|
+          pattern === subdomain
+        end
+
+        if route
+          remap_with_substituted_path!(route.gsub(/\:subdomain/, @subdomain))
+        end
+      end
 
       @app.call(env)
     end
 
-    def fetch_subdomain
-      subdomain = @env['SERVER_NAME'].sub(/\.?#{@domain}$/,'')
+    def map(pattern, route)
+      map(pattern, route[:to]) and return if route.kind_of?(Hash)
+      raise ArgumentError, "missing route" unless route
 
-      ['', 'www'].include?(subdomain) ? nil : subdomain
+      pattern = /.*/ if pattern == '*'
+      regexp = Regexp.new(pattern)
+      @mappings[regexp] = route
     end
 
-    def set_params(subdomain)
-      request = Rack::Request.new(@env)
-      if subdomain
-        request[:subdomain] = subdomain
-        map_to(subdomain)
-      end
+  private
+
+    def subdomain
+      @env['HTTP_HOST'].sub(/\.?#{@domain}.*$/,'') unless @env['HTTP_HOST'].match(/^localhost/)
     end
 
-    def map_to(subdomain)
-      if @map_to
-        @map_to.gsub!(":subdomain", subdomain)
-        new_path_info = "#{@map_to}#{@env["PATH_INFO"]}"
-        @env["PATH_INFO"] = new_path_info
-        new_request_uri = new_path_info.dup
-        if @env["QUERY_STRING"]
-          new_request_uri << "?" << @env["QUERY_STRING"]
-        end
-        @env["REQUEST_URI"] = new_request_uri
-      end
+    def remap_with_substituted_path!(path)
+      scheme = @env["rack.url_scheme"]
+      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?
+
+      @env["REQUEST_URI"] = "#{scheme}://#{host}#{port}#{path}#{query_string}"
     end
   end
 end

data/rack-subdomain.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "rack-subdomain"
+
+Gem::Specification.new do |s|
+  s.name        = "rack-subdomain"
+  s.authors     = ["Mattt Thompson", "Piotr Sarnacki"]
+  s.email       = "m@mattt.me"
+  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.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.files         = Dir["./**/*"].reject { |file| file =~ /\.\/(bin|log|pkg|script|spec|test|vendor)/ }
+  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.require_paths = ["lib"]
+end

metadata

@@ -1,90 +1,162 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-subdomain
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.2.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
+- Mattt Thompson
 - Piotr Sarnacki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-06-18 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-09 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
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  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
+        version: 1.2.0
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  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
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.4
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.4
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
   type: :development
-  version_requirements: *id002
-description: Rack::Subdomain can fetch subdomain from request and manipulate PATH_INFO to rewrite url with fetched subdomain
-email: 
-- drogus@gmail.com
+  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
+description: Rack middleware to route requests with subdomains to specified routes
+  with substitutions
+email: m@mattt.me
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/rack/subdomain.rb
-- LICENSE
-- README.rdoc
-has_rdoc: true
-homepage: http://github.com/drogus/rack-subdomain
+files:
+- ./Gemfile
+- ./Gemfile.lock
+- ./lib/rack/subdomain.rb
+- ./lib/rack-subdomain.rb
+- ./LICENSE
+- ./rack-subdomain.gemspec
+- ./Rakefile
+- ./README.md
+homepage: http://github.com/mattt/rack-subdomain
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+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
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+      hash: -539744315784908145
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Rack middleware for fetching subdomains
+summary: rack-subdomain
 test_files: []
-

data/README.rdoc

@@ -1,25 +0,0 @@
-= rack-subdomain
-
-Simple rack middleware for fetching subdomain from request and modyfing path with fetched subdomain.
-
-== Usage
-
-Example for rails app:
-
-    config.middleware.use(Rack::Subdomain, "example.org", "/users/:subdomain")
-
-This will get subdomains for domain example.org (ie. something.example.org) and will map path to /users/:subdomain/original/path.
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Piotr Sarnacki. See LICENSE for details.