tyler-ssl_requirement 1.0.4 → 1.1.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-patch: 4
+patch: 0
 major: 1
-minor: 0
+minor: 1

data/lib/ssl_requirement.rb

@@ -27,11 +27,6 @@ module SslRequirement
     @@ssl_host = host
   end
   
-  def self.included(controller)
-    controller.extend(ClassMethods)
-    controller.before_filter(:ensure_proper_protocol)
-  end
-
   def self.disable_ssl_check?
     @@disable_ssl_check ||= false
   end
@@ -73,6 +68,11 @@ module SslRequirement
     end
 
   private
+    def self.included(controller)
+      controller.extend(ClassMethods)
+      controller.before_filter(:ensure_proper_protocol)
+    end
+
     def ensure_proper_protocol
       return true if SslRequirement.disable_ssl_check?
       return true if ssl_allowed?

data/lib/url_rewriter.rb

@@ -1,27 +1,25 @@
 require 'action_controller/url_rewriter'
+require 'action_controller/routing/optimisations'
 
 module ActionController
   class UrlRewriter
-    
     # Add a secure option to the rewrite method.
     def rewrite_with_secure_option(options = {})
       secure = options.delete(:secure)
-      if !secure.nil? && !SslRequirement.disable_ssl_check?
-        if secure == true || secure == 1 || secure.to_s.downcase == "true"
-          options.merge!({
-            :only_path => false,
-            :protocol => 'https'
-          })
-        else
-          options.merge!({
-            :only_path => false,
-            :protocol => 'http'
-          })
+      options.merge!(:only_path => false, :protocol => secure ? 'https' : 'http') unless SslRequirement.disable_ssl_check?
+      rewrite_without_secure_option options
+    end
+    alias_method_chain :rewrite, :secure_option
+  end
+
+  module Routing
+    module Optimisation
+      class PositionalArgumentsWithAdditionalParams
+        def guard_condition_with_secure_option
+          guard_condition_without_secure_option + ' && !args.last.has_key?(:secure)'
         end
+        alias_method_chain :guard_condition, :secure_option
       end
-      
-      rewrite_without_secure_option(options)
     end
-    alias_method_chain :rewrite, :secure_option
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyler-ssl_requirement
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - RailsJedi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-23 00:00:00 -08:00
+date: 2008-12-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency