Fixed using force_ssl.

yalab · Nov 18, 2011 · 59e05d2 · 59e05d2
1 parent b3d09e6
commit 59e05d2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 27 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,4 +1,5 @@
 class ApplicationController < ActionController::Base
+  force_ssl
   protect_from_forgery
   before_filter{
     @javascripts = []

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -9,7 +9,7 @@
 </head>
 <body>
 <div id="siteholder">
-  <h1><%= link_to 'Anmitsu', root_url.as_ssl, :id => 'logo-link' %></h1>
+  <h1><%= link_to 'Anmitsu', root_url, :id => 'logo-link' %></h1>
   <h2>For your buisiness.</h2>
   <div id="siteWrap">
     <div class="wrapCapT">
@@ -28,8 +28,8 @@
             <li><%= link_to t('Listing items'), items_path %></li>
             <li><%= link_to t('Preferences'), edit_information_path(current_user.information), :id => 'preferences_link' %></li>
           <% else %>
-            <li><%= link_to t('Sign up'), new_user_registration_url.as_ssl, :id => 'sign-up-link' %></li>
-            <li><%= link_to t('Sign in'), new_user_session_url.as_ssl, :id => 'sign-in-link' %></li>
+            <li><%= link_to t('Sign up'), new_user_registration_url, :id => 'sign-up-link' %></li>
+            <li><%= link_to t('Sign in'), new_user_session_url, :id => 'sign-in-link' %></li>
           <% end %>
         </ul>
       </div>

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,27 +1,21 @@
 Anmitsu::Application.routes.draw do
-  class ForceSSL
-    def self.matches?(request)
-      Rails.env != 'production' || request.ssl?
-    end
-  end
-
   get :tos, :to => "root#tos"
   get :contact, :to => "root#contact"
   root :to => "root#index"
-  scope :constraints => ForceSSL do
-    resources :clients, :only => [:index]
-    resources :information, :only => [:edit, :update]
-    resources :accounts, :only => [:show]
-    resources :items do
-      resources :accounts, :only => [:create, :destroy]
-    end
-    devise_for :users, :controllers => {:sessions => 'users/sessions', :confirmations => 'users/confirmations', :registrations => 'users'} do
-      namespace :users do
-        get :registered
-      end
+
+  resources :clients, :only => [:index]
+  resources :information, :only => [:edit, :update]
+  resources :accounts, :only => [:show]
+  resources :items do
+    resources :accounts, :only => [:create, :destroy]
+  end
+  devise_for :users, :controllers => {:sessions => 'users/sessions', :confirmations => 'users/confirmations', :registrations => 'users'} do
+    namespace :users do
+      get :registered
     end
   end
 
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

diff --git a/lib/ext/string/as_ssl.rb b/lib/ext/string/as_ssl.rb