ssl_routes 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmU5MjVhMWY0ZjcyNDMwMDFiNGZjYmI2NmI5YTM4YzgxYjdkYWQzYw==
+    OWRjZTk0YmFmYjBlNmI4NmM5MGUwNzg5ODcyYmFkOTYxYzRlZTdiNA==
   data.tar.gz: !binary |-
-    YmIyYmM1NjU5MjgxNDMxNDk3NjgyMTY1N2Q5NDU2ZjUwMDViYmQzMQ==
+    YjBkNTUwYWYxYWEyNzc0OThlYjNkNDM3YTg3ZWM4MDQ0NGM0MTEzNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjlhN2I3MTU4OWNhZDA1YmY5Mjk2MGE3MTIzMTYyMGY0MzFlMjhhYTBhMDU4
-    ZmNlOTdiNTA2MDJmNTZmOTZjZmM5NTYxYWQ5MWM2OTgyYmUyYWE0YzkyMzcw
-    YTc4YWIwYjk4YzI5ZGE4NmEzZmZjZTE5ZTRkZmYxM2FiZTc2NWM=
+    ODQwYWQyZTMyOGI1NTUwYmQ0MjEzNTJiMWY5ZDk2MWVmNGE2OTYxNzg2NTUw
+    ZWQyNzk0NWQzNGFhOTg0ZjMwMjZmZWZmNjY0MWU1ODQ5M2M4NjQ4MWYwMjAz
+    NTFkZGI1MGMzM2M1Zjc3MzBlZjRjMGNkOTc4MDRkYzljOGM0NmU=
   data.tar.gz: !binary |-
-    Nzk4MTVhYjBmODUyNmQ1ODE5OTYxMzU4NGFkNzNlYTk3YTAwNWRlYjJiN2Q3
-    MmE4YzIxMzMxMmZkN2IyNTdlNmJmMzQ4MGQ4N2RjNGE0MzE4Mzk0ZDE4YjJl
-    NDVmZWE0YmEyZmQ5MzU5NjAxMzQ0NWJlNTNmYWExMTMxMWYyZmM=
+    ZGQ1M2Q2MzBiNTkwNDdhNTJhYThhMDFhM2FmOWFmZWYxMTZlZjYzYTQ2NWRl
+    YTM5MDU2MzA0MGU4NDM2ZGZlNDQ5MzQzNWFjNmVjNzhlYWM2ODcwNjVkNTBh
+    MDgwMjFmZWMyM2MxMGNlNjNlNDg2MGYxMmM4YTRjMTVkMWNmZmY=

data/lib/ssl_routes/rails.rb

@@ -39,11 +39,10 @@ module SslRoutes
         routes = Rails.application.routes
         options = routes.recognize_path request.path, {:method => request.env['REQUEST_METHOD']}
         current, target = determine_protocols(options)
-        safari_preloading = !!request.xhr? && request.accepts.all? { |a| a.symbol != :json }
-        if (current != target && safari_preloading && request.get?) || (current != target && !request.xhr? && request.get?)
+        if (current != target && !request.xhr? && request.get?)
           flash.keep
-          response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
-          response.headers["Pragma"] = "no-cache"
+          response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
+          response.headers['Pragma'] = 'no-cache'
           redirect_to "#{target}://#{request.host_with_port + request.fullpath}"
           return false
         end
@@ -59,8 +58,8 @@ module SslRoutes
 
     def url_for_with_ssl_support(options)
       ac = self.respond_to?(:controller) ? self.controller : self
-      if options.is_a?(Hash) && options[:only_path] == true
-        if ac.respond_to?(:enable_ssl) && ac.enable_ssl
+      if ac.respond_to?(:enable_ssl) && ac.enable_ssl
+        if options.is_a?(Hash)
           case options
             when Hash
               current, target = ac.determine_protocols(options)
@@ -69,12 +68,7 @@ module SslRoutes
               end
           end
         end
-      else
-        if options[:ssl] && ac.respond_to?(:enable_ssl) && ac.enable_ssl
-          options.merge!({ :protocol => 'https' })
-        end
       end
-
       url_for_without_ssl_support(options)
     end
 

data/lib/ssl_routes/version.rb

@@ -1,5 +1,5 @@
 module SslRoutes
 
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssl_routes
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Cedric Howe