ssl_routes 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWRjZTk0YmFmYjBlNmI4NmM5MGUwNzg5ODcyYmFkOTYxYzRlZTdiNA==
+    MjQ1MDVjODMyYjAwODJkMGU0ZmU0YjllNmYzZTRkMTVmYjg1ZGQzMw==
   data.tar.gz: !binary |-
-    YjBkNTUwYWYxYWEyNzc0OThlYjNkNDM3YTg3ZWM4MDQ0NGM0MTEzNg==
+    ZTg1ZGE1NDU5ZDZmZDI3NzczNzJlOWIyZDRkZmE1MTM5NzBlYmViMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODQwYWQyZTMyOGI1NTUwYmQ0MjEzNTJiMWY5ZDk2MWVmNGE2OTYxNzg2NTUw
-    ZWQyNzk0NWQzNGFhOTg0ZjMwMjZmZWZmNjY0MWU1ODQ5M2M4NjQ4MWYwMjAz
-    NTFkZGI1MGMzM2M1Zjc3MzBlZjRjMGNkOTc4MDRkYzljOGM0NmU=
+    NDZmZWU1MDU0YjM2MTFhZjgxMzViYzc2MGU1MjAyNjg3ZjBmOTAwNTllNTUy
+    OGQ0YjUxYWUzZjkzY2UwYmE2ZDc4MWEyYjc1ZmI0YWU2OTQ5YjI3MzU4M2Q0
+    ZTZlNWQyMWQ2YjgxMTkwYWQxOTcxOTU0OWM1OWNjMjAwM2QzZDQ=
   data.tar.gz: !binary |-
-    ZGQ1M2Q2MzBiNTkwNDdhNTJhYThhMDFhM2FmOWFmZWYxMTZlZjYzYTQ2NWRl
-    YTM5MDU2MzA0MGU4NDM2ZGZlNDQ5MzQzNWFjNmVjNzhlYWM2ODcwNjVkNTBh
-    MDgwMjFmZWMyM2MxMGNlNjNlNDg2MGYxMmM4YTRjMTVkMWNmZmY=
+    ODc5MTRhZTk1MzZkMjM1NDE2Yzg0MGI5ODY2MTkwYTNkMGJkYzE1MDFiYzU4
+    ODEyY2MzN2NhOTBmZmNmYzA5YzQ4MjMyMjQ0MDg5NmZjYTdhNWVkNjJlMGVi
+    MzRmOGI3ODk2ZjdlYjljZDYyODQzYmJhOWM2MzJlYmVkYmM2OTI=

data/lib/ssl_routes/rails.rb

@@ -25,9 +25,8 @@ module SslRoutes
         when String then options[self.parameter]
         when TrueClass then 'https'
         when FalseClass then 'http'
-        else 'http' # maybe this should be current
+        else current
       end
-      target = current if [:all, :both].include? options[self.parameter]
       target = 'https' if self.secure_session && current_user
       target = options[:protocol] if options[:protocol]
       [ current, target.split(':').first ]
@@ -36,8 +35,8 @@ module SslRoutes
     private
 
       def ensure_protocol
-        routes = Rails.application.routes
-        options = routes.recognize_path request.path, {:method => request.env['REQUEST_METHOD']}
+        router = Rails.application.routes.router
+        options = recognize_request(router, self.request)
         current, target = determine_protocols(options)
         if (current != target && !request.xhr? && request.get?)
           flash.keep
@@ -48,6 +47,31 @@ module SslRoutes
         end
       end
 
+      Constraints = ::ActionDispatch::Routing::Mapper::Constraints
+      Dispatcher = ::ActionDispatch::Routing::RouteSet::Dispatcher
+
+      def recognize_request(router, req)
+        router.recognize(req) do |route, matches, params|
+          params.each do |key, value|
+            if value.is_a?(String)
+              value = value.dup.force_encoding(Encoding::BINARY) if value.encoding_aware?
+              params[key] = URI.parser.unescape(value)
+            end
+          end
+
+          dispatcher = route.app
+          while dispatcher.is_a?(Constraints) && dispatcher.matches?(env) do
+            dispatcher = dispatcher.app
+          end
+
+          if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params, false)
+            dispatcher.prepare_params!(params)
+            return params
+          end
+        end
+
+        raise ActionController::RoutingError, "No route matches #{path.inspect}"
+      end
   end
 
   module ActionDispatch
@@ -60,12 +84,9 @@ module SslRoutes
       ac = self.respond_to?(:controller) ? self.controller : self
       if ac.respond_to?(:enable_ssl) && ac.enable_ssl
         if options.is_a?(Hash)
-          case options
-            when Hash
-              current, target = ac.determine_protocols(options)
-              if current != target
-                options.merge!({ :protocol => target, :only_path => false })
-              end
+          current, target = ac.determine_protocols(options)
+          if current != target
+            options.merge!({ :protocol => target, :only_path => false })
           end
         end
       end

data/lib/ssl_routes/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssl_routes
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Cedric Howe
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails