Permalink
Browse files

Removed trailing whitespace terds and reformatted.

  • Loading branch information...
retr0h committed May 20, 2011
1 parent 1d77970 commit c1c989cff42f06bbd28a27210a70b6e738815e97
Showing with 29 additions and 44 deletions.
  1. +29 −44 lib/ssl_requirement.rb
View
@@ -1,31 +1,14 @@
-# Copyright (c) 2005 David Heinemeier Hansson
-#
-# 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 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.
module SslRequirement
def self.included(controller)
controller.extend(ClassMethods)
controller.before_filter(:ensure_proper_protocol)
end
module ClassMethods
- # Specifies that the named actions requires an SSL connection to be performed (which is enforced by ensure_proper_protocol).
+ ##
+ # Specifies that the named actions requires an SSL connection
+ # to be performed (which is enforced by ensure_proper_protocol).
+
def ssl_required(*actions)
write_inheritable_array(:ssl_required_actions, actions)
end
@@ -34,29 +17,31 @@ def ssl_allowed(*actions)
write_inheritable_array(:ssl_allowed_actions, actions)
end
end
-
- protected
- # Returns true if the current action is supposed to run as SSL
- def ssl_required?
- (self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)
- end
-
- def ssl_allowed?
- (self.class.read_inheritable_attribute(:ssl_allowed_actions) || []).include?(action_name.to_sym)
- end
- private
- def ensure_proper_protocol
- return true if ssl_allowed?
-
- if ssl_required? && !request.ssl?
- redirect_to "https://" + request.host + (request.respond_to?(:fullpath) ? request.fullpath : request.request_uri)
- flash.keep
- return false
- elsif request.ssl? && !ssl_required?
- redirect_to "http://" + request.host + (request.respond_to?(:fullpath) ? request.fullpath : request.request_uri)
- flash.keep
- return false
- end
+protected
+ ##
+ # Returns true if the current action is supposed to run as SSL.
+
+ def ssl_required?
+ (self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)
+ end
+
+ def ssl_allowed?
+ (self.class.read_inheritable_attribute(:ssl_allowed_actions) || []).include?(action_name.to_sym)
+ end
+
+private
+ def ensure_proper_protocol
+ return true if ssl_allowed?
+
+ if ssl_required? && !request.ssl?
+ redirect_to "https://" + request.host + (request.respond_to?(:fullpath) ? request.fullpath : request.request_uri)
+ flash.keep
+ return false
+ elsif request.ssl? && !ssl_required?
+ redirect_to "http://" + request.host + (request.respond_to?(:fullpath) ? request.fullpath : request.request_uri)
+ flash.keep
+ return false
end
+ end
end

0 comments on commit c1c989c

Please sign in to comment.