ssl_routes 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmU5MjVhMWY0ZjcyNDMwMDFiNGZjYmI2NmI5YTM4YzgxYjdkYWQzYw==
+  data.tar.gz: !binary |-
+    YmIyYmM1NjU5MjgxNDMxNDk3NjgyMTY1N2Q5NDU2ZjUwMDViYmQzMQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjlhN2I3MTU4OWNhZDA1YmY5Mjk2MGE3MTIzMTYyMGY0MzFlMjhhYTBhMDU4
+    ZmNlOTdiNTA2MDJmNTZmOTZjZmM5NTYxYWQ5MWM2OTgyYmUyYWE0YzkyMzcw
+    YTc4YWIwYjk4YzI5ZGE4NmEzZmZjZTE5ZTRkZmYxM2FiZTc2NWM=
+  data.tar.gz: !binary |-
+    Nzk4MTVhYjBmODUyNmQ1ODE5OTYxMzU4NGFkNzNlYTk3YTAwNWRlYjJiN2Q3
+    MmE4YzIxMzMxMmZkN2IyNTdlNmJmMzQ4MGQ4N2RjNGE0MzE4Mzk0ZDE4YjJl
+    NDVmZWE0YmEyZmQ5MzU5NjAxMzQ0NWJlNTNmYWExMTMxMWYyZmM=

data/lib/ssl_routes/rails.rb

@@ -39,8 +39,11 @@ module SslRoutes
         routes = Rails.application.routes
         options = routes.recognize_path request.path, {:method => request.env['REQUEST_METHOD']}
         current, target = determine_protocols(options)
-        if current != target && !request.xhr? && request.get?
+        safari_preloading = !!request.xhr? && request.accepts.all? { |a| a.symbol != :json }
+        if (current != target && safari_preloading && request.get?) || (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"
           redirect_to "#{target}://#{request.host_with_port + request.fullpath}"
           return false
         end
@@ -55,8 +58,8 @@ module SslRoutes
     end
 
     def url_for_with_ssl_support(options)
+      ac = self.respond_to?(:controller) ? self.controller : self
       if options.is_a?(Hash) && options[:only_path] == true
-        ac = self.respond_to?(:controller) ? self.controller : self
         if ac.respond_to?(:enable_ssl) && ac.enable_ssl
           case options
             when Hash
@@ -66,7 +69,12 @@ 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.0'
+  VERSION = '0.2.1'
 
 end

metadata

@@ -1,87 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ssl_routes
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Cedric Howe
 - Lance Ivy
 - Tieg Zaharia
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  version_requirements: *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.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+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@howe.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ssl_routes/paperclip.rb
 - lib/ssl_routes/rails.rb
 - lib/ssl_routes/version.rb
 - lib/ssl_routes.rb
 - test/test_helper.rb
 homepage: http://github.com/cedric/ssl_routes
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
-rubyforge_project: ssl_routes
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enforce SSL based on your Rails routes.
-test_files: 
+test_files:
 - test/test_helper.rb