rack-ssl 1.2.0 → 1.3.0

data/lib/rack/ssl.rb

@@ -16,8 +16,8 @@ module Rack
       @hsts = {} if @hsts.nil? || @hsts == true
       @hsts = self.class.default_hsts_options.merge(@hsts) if @hsts
 
-      @exclude   = options[:exclude]
-      @subdomain = options[:subdomain]
+      @exclude = options[:exclude]
+      @host    = options[:host]
     end
 
     def call(env)
@@ -46,10 +46,14 @@ module Rack
       end
 
       def redirect_to_https(env)
-        req      = Request.new(env)
-        location = "https://#{[@subdomain, req.host].compact.join('.')}#{req.fullpath}"
+        req        = Request.new(env)
+        url        = URI(req.url)
+        url.scheme = "https"
+        url.host   = @host if @host
+        headers    = hsts_headers.merge('Content-Type' => 'text/html',
+                                        'Location'     => url.to_s)
 
-        [301, hsts_headers.merge({'Content-Type' => "text/html", 'Location' => location}), []]
+        [301, headers, []]
       end
 
       # http://tools.ietf.org/html/draft-hodges-strict-transport-sec-02

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-ssl
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Joshua Peek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -06:00
+date: 2011-02-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,17 +32,18 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Force SSL/TLS in your app.
+description: "    Rack middleware to force SSL/TLS.\n"
 email: josh@joshpeek.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - lib/rack/ssl.rb
+- LICENSE
+- README.md
 has_rdoc: true
 homepage: https://github.com/josh/rack-ssl
 licenses: []
@@ -72,10 +73,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.4.2
+rubyforge_project: rack-ssl
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
-summary: Rack middleware to force SSL
+summary: Force SSL/TLS in your app.
 test_files: []