ssl_routes 0.0.7 → 0.0.8

data/lib/ssl_routes/controller.rb

@@ -25,10 +25,10 @@ module SslRoutes::Controller
       if self.enable_ssl
         case options
           when Hash
-            current = request.protocol.split(':').first
-            target  = extract_protocol(options)
-            if current != target
-              options.merge!({ :protocol => target, :only_path => false })
+            current_protocol = request.protocol.split(':').first
+            target_protocol  = determine_target_protocol(current_protocol, options)
+            if current_protocol != target_protocol
+              options.merge!({ :protocol => target_protocol, :only_path => false })
             end
         end
       end
@@ -43,21 +43,22 @@ module SslRoutes::Controller
           request.path,
           ActionController::Routing::Routes.extract_request_environment(request)
         )
-        current = request.protocol.split(':').first
-        target  = extract_protocol(options)
-        if current != target && !request.xhr? && request.get?
+        current_protocol = request.protocol.split(':').first
+        target_protocol  = determine_target_protocol(current_protocol, options)
+        if current_protocol != target_protocol && !request.xhr? && request.get?
           flash.keep
-          redirect_to "#{target}://#{request.host_with_port + request.request_uri}"
+          redirect_to "#{target_protocol}://#{request.host_with_port + request.request_uri}"
           return false
         end
       end
 
-      def extract_protocol(options)
+      def determine_target_protocol(current_protocol, options)
         protocol = case options[self.parameter]
           when String then options[self.parameter]
           when TrueClass then 'https'
           else 'http'
         end
+        protocol = current_protocol if [:all, :both].include? options[self.parameter]
         protocol = 'https' if self.secure_session && current_user
         protocol = options[:protocol] if options[:protocol]
         return protocol.split(':').first

data/lib/ssl_routes/version.rb

@@ -1,5 +1,5 @@
 module SslRoutes
   
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ssl_routes
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Cedric Howe
@@ -15,24 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -05:00
+date: 2011-07-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
         - 2
         - 3
         version: "2.3"
+  name: rails
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  requirement: *id001
 description: Define your SSL settings in one place to enforce in your controller, generate URLs with the correct protocol, and protect yourself against session hijacking.
 email: cedric@freezerbox.com
 executables: []
@@ -68,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
       hash: 23
       segments: 
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ssl_routes
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Enforce SSL based on your Rails routes.