mtdevise 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 906e4f3152c3ed92ec989001a89ff5cedb1aa797
-  data.tar.gz: 1fe439fb4d3cfcaf1d00f07007958b6802a728f9
+  metadata.gz: 77cbd55ba1c53fb82cc0b878f90cd308e57dd5f6
+  data.tar.gz: fc5e2fe0869629327b2e0fd0fd3081d0c76d74bb
 SHA512:
-  metadata.gz: 8b2f5ec6ce0905893c9e784b8498c87f9780df62620e9c4966c755c96bf96e48456ec83fd5b99184c7345d54bd66e7b9f170ff3c3ac4a9de342aebe38b6762ab
-  data.tar.gz: a21a3324542cb63b0d364407f742bf58a4fa3aeaae5155a9e19c34a0b7db376393a381c28f174fd15ff80ad31f5a10381e151ce5b27bcf28ff71fdc8e5cf99f9
+  metadata.gz: 934b003be2bd8cb60333829887aed83b9ded33516e11da18ae1f0c5b0ed233993118203f0551df1d403a2c4d3988a4dde019b8b2f6a79ea9f027b8057f32ca39
+  data.tar.gz: de8d52bfb0df42526fd90aa1df5539ae062c95fcc8bd41b0b56b94603d4af810ceb41aa35c7b83c822fcc612180d9d4f0c0aa17ab7c0d5ad3e31a7b08c1ab095

data/app/controllers/mtdevise/accounts_controller.rb

@@ -4,6 +4,7 @@ module Mtdevise
 	class AccountsController < ApplicationController
 
 		layout "mtdevise/accounts"
+
 		before_action :redirect_if_coming_form_sign_up, only: :new
 		before_action :authenticate_user!, except: [:new, :create]
 
@@ -57,5 +58,7 @@ module Mtdevise
 				params.require(:account).permit(:name, :subdomain, { :owner_attributes => [:email, :password, :password_confirmation]})
 		end
 
+
+
 	end
 end

data/app/controllers/mtdevise/application_controller.rb

@@ -2,9 +2,10 @@ module Mtdevise
 
 # class ApplicationController < ActionController::Base
 	class ApplicationController < ::ApplicationController
-		around_filter :catch_not_found
 		protect_from_forgery with: :null_session
 
+		before_action :check_subdomain
+
 		def after_sign_in_path_for(resource)
 			request.env['omniauth.origin'] || stored_location_for(resource) || mtdevise.accounts_path
 		end
@@ -24,16 +25,16 @@ module Mtdevise
 
 		private
 
-		def catch_not_found
-			yield
-			rescue ActiveRecord::RecordNotFound
-      redirect_to mtdevise.root_url, :flash => { :error => "Account Not Found Please Register." }
-		end
-
 		def redirect_logged_in_users_to_account_page
 			redirect_to mtdevise.accounts_path if user_signed_in?
 		end
 
+		def check_subdomain
+			if request.subdomain.present? && Account.where(subdomain: request.subdomain).blank?
+				redirect_to mtdevise.root_url(subdomain: false), notice: "Subdomain Doesn't Exist. Would you like to Register."
+			end
+		end
+
 	end
 
 end

data/config/routes.rb

@@ -12,9 +12,9 @@ Mtdevise::Engine.routes.draw do
 		end
 	end
 
-	root 'welcome#index'
 	devise_for :users, class_name: 'Mtdevise::User', module: :devise
 	get '/sign_up', :to => 'accounts#new', :as => :sign_up
 	resources :accounts, only: [:create, :index, :new]
+	root 'welcome#index'
 
 end

data/lib/mtdevise/version.rb

@@ -1,3 +1,3 @@
 module Mtdevise
-	VERSION = '1.5.2'
+	VERSION = '1.5.3'
 end

data/spec/features/root_spec.rb

@@ -19,6 +19,11 @@ feature 'Root page' do
 			visit mtdevise.root_path
 			click_link 'Sign In To Manage Your Accounts'
 		end
+		scenario 'visit non-existing subdomain' do
+			visit mtdevise.root_url(subdomain: 'nonexisting')
+			expect(page.current_url).to match(/#{mtdevise.root_path}/)
+			expect(page).to have_content("Subdomain Doesn't Exist. Would you like to Register.")
+		end
 	end
 
 end

data/spec/test_app/config/environments/development.rb

@@ -15,6 +15,8 @@ Rails.application.configure do
 
 	# Don't care if the mailer can't send.
 	config.action_mailer.raise_delivery_errors = false
+	config.action_mailer.delivery_method = :letter_opener
+	config.action_mailer.default_url_options = { :host => 'lvh.me:3000' }
 
 	# Print deprecation notices to the Rails logger.
 	config.active_support.deprecation = :log

data/spec/test_app/config/environments/test.rb

@@ -34,7 +34,7 @@ Rails.application.configure do
 	# Print deprecation notices to the stderr.
 	config.active_support.deprecation = :stderr
 
-	config.action_mailer.default_url_options = { :host => 'localhost' }
+	config.action_mailer.default_url_options = { :host => 'lvh.me:3000' }
 
 	# Raises error for missing translations
 	# config.action_view.raise_on_missing_translations = true

data/spec/test_app/config/initializers/session_store.rb

@@ -1,4 +1,4 @@
 # Be sure to restart your server when you modify this file.
 
 # Rails.application.config.session_store :cookie_store, key: '_dummy_session'
-Rails.application.config.session_store :cookie_store, key: '_dummy_session', domain: 'example.com'
+Rails.application.config.session_store :cookie_store, key: '_dummy_session', domain: :all, tld_length: 2