ssl_routes 0.0.9 → 0.1.0

data/lib/ssl_routes/{controller.rb → rails2.rb}

@@ -38,7 +38,6 @@ module SslRoutes::Controller
     private
 
       def ensure_protocol
-        # ActionController::Routing::Routes.send :remove_recognize_optimized!
         options = ActionController::Routing::Routes.recognize_path(
           request.path,
           ActionController::Routing::Routes.extract_request_environment(request)

data/lib/ssl_routes/rails3.rb

@@ -0,0 +1,84 @@
+module SslRoutes
+
+  module ActionController
+
+    def self.included(base)
+      base.extend ClassMethods
+      base.send :include, InstanceMethods
+    end
+
+    module ClassMethods
+
+      def enforce_protocols(&block)
+        cattr_accessor :parameter, :secure_session, :enable_ssl
+        self.parameter      = :protocol
+        self.secure_session = false
+        self.enable_ssl     = false
+        yield self if block_given?
+        before_filter :ensure_protocol if self.enable_ssl
+      end
+
+    end
+
+    module InstanceMethods
+
+      def determine_protocols(options)
+        current = self.request.ssl? ? 'https' : 'http'
+        target = case options[self.parameter]
+          when String then options[self.parameter]
+          when TrueClass then 'https'
+          else 'http'
+        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 ]
+      end
+
+      private
+
+        def ensure_protocol
+          routes = Rails.application.routes
+          options = routes.recognize_path request.path, request.env
+          current, target = determine_protocols(options)
+          if current != target && !request.xhr? && request.get?
+            flash.keep
+            redirect_to "#{target}://#{request.host_with_port + request.fullpath}"
+            return false
+          end
+        end
+
+    end
+
+  end
+
+  module ActionDispatch
+
+    def self.included(base)
+      base.send :include, InstanceMethods
+      base.send :alias_method_chain, :url_for, :ssl_support
+    end
+
+    module InstanceMethods
+
+      def url_for_with_ssl_support(options)
+        if self.controller.enable_ssl
+          case options
+            when Hash
+              current, target = self.controller.determine_protocols(options)
+              if current != target
+                options.merge!({ :protocol => target, :only_path => false })
+              end
+          end
+        end
+        url_for_without_ssl_support(options)
+      end
+
+    end
+
+  end
+
+end
+
+ActionController::Base.send :include, SslRoutes::ActionController
+ActionDispatch::Routing::UrlFor.send :include, SslRoutes::ActionDispatch

data/lib/ssl_routes/version.rb

@@ -1,5 +1,5 @@
 module SslRoutes
   
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
   
 end

data/lib/ssl_routes.rb

@@ -1,6 +1,7 @@
 module SslRoutes
   
-  require 'ssl_routes/controller'
-  require 'ssl_routes/paperclip' if defined?( Paperclip )
+  require 'ssl_routes/rails3' if ::Rails::VERSION::MAJOR == 3
+  require 'ssl_routes/rails2' if ::Rails::VERSION::MAJOR == 2
+  require 'ssl_routes/paperclip' if defined?( ::Paperclip )
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ssl_routes
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Cedric Howe
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -04:00
-default_executable: 
+date: 2011-08-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -24,7 +23,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
@@ -42,12 +41,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/ssl_routes/controller.rb
 - lib/ssl_routes/paperclip.rb
+- lib/ssl_routes/rails2.rb
+- lib/ssl_routes/rails3.rb
 - lib/ssl_routes/version.rb
 - lib/ssl_routes.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/cedric/ssl_routes/
 licenses: []
 
@@ -79,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ssl_routes
-rubygems_version: 1.4.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Enforce SSL based on your Rails routes.