rack-ssl-enforcer 0.1.2 → 0.1.3

data/README.rdoc

@@ -26,9 +26,10 @@ You might need the :redirect_to option if the requested URL can't be determined
   (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.
 
-== Thanks!
+== Contributors
 
-* To {Dan Mayer}[http://github.com/danmayer] for making proxied ssl setups work
+* {Dan Mayer}[http://github.com/danmayer]
+* {Rémy Coutable}http://github.com/rymai]
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/rack-ssl-enforcer.rb

@@ -1,25 +1,28 @@
 module Rack
-
+  
   class SslEnforcer
-
+    
     def initialize(app, options = {})
-      @app = app
+      @app     = app
       @options = options
     end
- 
+    
     def call(env)
-      @options[:redirect_to] ||= Rack::Request.new(env).url
-      @options[:redirect_to].gsub!(/^http:/,'https:')
-      @options[:message] ||= "You are beeing redirected to #{@options[:redirect_to]}."
-      ssl_request?(env) ? @app.call(env) : [301, {'Location' => @options[:redirect_to]}, @options[:message]]
+      if ssl_request?(env)
+        @app.call(env)
+      else
+        @options[:redirect_to] ||= Rack::Request.new(env).url
+        @options[:redirect_to].gsub!(/^http:/, 'https:')
+        @options[:message] ||= "You are beeing redirected to #{@options[:redirect_to]}."
+        [301, { 'Location' => @options[:redirect_to] }, @options[:message]]
+      end
     end
     
-    
     private
       
       def ssl_request?(env)
         (env['HTTP_X_FORWARDED_PROTO'] || env['rack.url_scheme']) == 'https'
       end
- 
+      
   end
-end
+end

data/rack-ssl-enforcer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-ssl-enforcer}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Matthies"]
-  s.date = %q{2010-07-30}
+  s.date = %q{2010-08-12}
   s.email = %q{tm@mit2m.de}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-ssl-enforcer
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tobias Matthies
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 +02:00
+date: 2010-08-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency