rack-www-enforcer 0.0.1 → 0.0.2

data/README.md

@@ -1,11 +1,15 @@
-Rack::WwwRedirect
+Rack::WwwEnforcer
 =================
 
-Rack Middleware for redirect requests to an specific subdomain of your app. (Ex. http://mysite.com to https://app.mysite.com)
+Rack Middleware for redirect requests to an specific subdomain of your app. (Ex. http://mysite.com to http://app.mysite.com)
 
 Usage
 -------
 
-    use Rack::WwwRedirect, :subdomain => "app"
+    use Rack::WwwEnforcer, :subdomain => "app"
 
-If subdomain isn't present "www" is used by default
+If subdomain isn't present "www" is used by default.
+
+You can use it in your Rails app, in the environment configuration file add it to Middleware stack:
+
+    config.middleware.insert_before ActionDispatch::Static, Rack::WwwEnforcer

data/lib/rack/www-enforcer.rb

@@ -7,6 +7,7 @@ module Rack
     def initialize(app, options = {})
       @app = app
       @subdomain = options[:subdomain] || "www"
+      @replace_subdomain = options[:replace_subdomain]
     end
 
     def call(env)
@@ -27,7 +28,11 @@ module Rack
 
     def redirect_to_subdomain(req)
       url       = URI(req.url)
-      url.host  = "#{@subdomain}.#{url.host}"
+      unless @replace_subdomain
+        url.host  = "#{@subdomain}.#{url.host}"
+      else
+        url.host = url.host.gsub(/^([^.]+)(\..*)$/, "#{@subdomain}#{'\2'}")
+      end
       headers   = {'Content-Type' => 'text/html', 'Location' => url.to_s}
 
       [301, headers, []]

data/rack-www-enforcer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "rack-www-enforcer"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Guillermo Iguaran"]
   s.email       = ["guilleiguaran@gmail.com"]
   s.homepage    = "https://github.com/guilleiguaran/rack-www-enforcer"

data/test/test_www-enforcer.rb

@@ -26,9 +26,22 @@ class TestWwwEnforcer < Test::Unit::TestCase
   end
 
   def test_redirect_to_custom_subdomain
+    old_app = self.app
     self.app = Rack::WwwEnforcer.new(mock_app, :subdomain => "app")
     get "http://example.org/"
     assert_equal "http://app.example.org/",
       last_response.headers['Location']
+  ensure
+    self.app = old_app
+  end
+
+  def test_redirect_if_subdomain_already_given_and_replacing_subdomain
+    old_app = self.app
+    self.app = Rack::WwwEnforcer.new(mock_app, :subdomain => "app", :replace_subdomain => true)
+    get "http://www.example.org"
+    assert_equal "http://app.example.org/",
+      last_response.headers['Location']
+  ensure
+    self.app = old_app
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-www-enforcer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-06 00:00:00.000000000Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2157511420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157511420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! '    Rack middleware to redirect requests to an specific subdomain
   in your app.
 
@@ -61,9 +66,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Redirect requests to a subdomain in your app
 test_files:
 - test/test_www-enforcer.rb
+has_rdoc: