ssl_routes 0.1.5 → 0.2.0

data/lib/ssl_routes/{rails3.rb → rails.rb}

@@ -11,7 +11,7 @@ module SslRoutes
       def enforce_protocols(&block)
         cattr_accessor :parameter, :secure_session, :enable_ssl
         self.parameter      = :protocol
-        self.secure_session = false
+        self.secure_session = true
         self.enable_ssl     = false
         yield self if block_given?
         before_filter :ensure_protocol if self.enable_ssl
@@ -21,10 +21,11 @@ module SslRoutes
 
     def determine_protocols(options)
       current = self.request.ssl? ? 'https' : 'http'
-      target = case options[self.parameter]
+      target  = case options[self.parameter]
         when String then options[self.parameter]
         when TrueClass then 'https'
-        else 'http'
+        when FalseClass then 'http'
+        else 'http' # maybe this should be current
       end
       target = current if [:all, :both].include? options[self.parameter]
       target = 'https' if self.secure_session && current_user
@@ -40,7 +41,7 @@ module SslRoutes
         current, target = determine_protocols(options)
         if current != target && !request.xhr? && request.get?
           flash.keep
-          redirect_to URI.join("#{target}://#{request.host_with_port}", request.fullpath).to_s
+          redirect_to "#{target}://#{request.host_with_port + request.fullpath}"
           return false
         end
       end

data/lib/ssl_routes/version.rb

@@ -1,5 +1,5 @@
 module SslRoutes
-  
-  VERSION = '0.1.5'
-  
+
+  VERSION = '0.2.0'
+
 end

data/lib/ssl_routes.rb

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

data/test/test_helper.rb

@@ -1,5 +1,4 @@
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-$: << File.join(File.dirname(__FILE__))
+$LOAD_PATH << File.dirname(__FILE__)
 
 require 'rubygems'
 require 'test/unit'
@@ -11,4 +10,3 @@ require 'test/unit'
 # require 'action_view'
 # require 'active_record'
 # require 'ruby-debug'
-require 'spamtrap'

metadata

@@ -1,21 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: ssl_routes
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Cedric Howe
+- Lance Ivy
+- Tieg Zaharia
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-07-12 00:00:00 Z
+date: 2013-02-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -25,11 +27,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 7
         segments: 
-        - 2
         - 3
-        version: "2.3"
+        - 0
+        version: "3.0"
   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.
@@ -42,8 +44,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/ssl_routes/paperclip.rb
-- lib/ssl_routes/rails2.rb
-- lib/ssl_routes/rails3.rb
+- lib/ssl_routes/rails.rb
 - lib/ssl_routes/version.rb
 - lib/ssl_routes.rb
 - test/test_helper.rb

data/lib/ssl_routes/rails2.rb

@@ -1,71 +0,0 @@
-module SslRoutes::Controller
-
-  def self.included(base)
-    base.extend ClassMethods
-    base.send :include, InstanceMethods
-    base.send :alias_method_chain, :url_for, :ssl_support
-  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 url_for_with_ssl_support(options)
-      if self.enable_ssl
-        case options
-          when Hash
-            current_protocol = request.protocol.split(':').first
-            target_protocol  = determine_target_protocol(current_protocol, options)
-            if current_protocol != target_protocol
-              options.merge!({ :protocol => target_protocol, :only_path => false })
-            end
-        end
-      end
-      url_for_without_ssl_support(options)
-    end
-
-    private
-
-      def ensure_protocol
-        options = ActionController::Routing::Routes.recognize_path(
-          request.path,
-          ActionController::Routing::Routes.extract_request_environment(request)
-        )
-        current_protocol = request.protocol.split(':').first
-        target_protocol  = determine_target_protocol(current_protocol, options)
-        if current_protocol != target_protocol && !request.xhr? && request.get?
-          flash.keep
-          redirect_to "#{target_protocol}://#{request.host_with_port + request.request_uri}"
-          return false
-        end
-      end
-
-      def determine_target_protocol(current_protocol, options)
-        protocol = case options[self.parameter]
-          when String then options[self.parameter]
-          when TrueClass then 'https'
-          else 'http'
-        end
-        protocol = current_protocol if [:all, :both].include? options[self.parameter]
-        protocol = 'https' if self.secure_session && current_user
-        protocol = options[:protocol] if options[:protocol]
-        return protocol.split(':').first
-      end
-
-  end
-
-end
-
-ActionController::Base.send :include, SslRoutes::Controller
-ActionController::Routing::Routes.send :remove_recognize_optimized!