mtdevise 3.8.4 → 3.9.0

data/config/initializers/devise/strategies/subdomain.rb

@@ -1,25 +1,26 @@
 require 'devise/strategies/authenticatable'
 
 module Devise
-	module Strategies
-		class SubdomainLogin < Authenticatable
-
-			def subdomain
-				request.subdomain
-			end
-
-			def valid?
-				subdomain.present? && params["user"]
-			end
-
-			def authenticate!
-				return fail!('Invalid email or password.') unless account = Mtdevise::Account.find_by(subdomain: subdomain)
-				return fail!('Invalid email or password.') unless user = account.users.find_by(email: params["user"]["email"])
-				return fail!('Invalid email or password.') unless user.valid_password?(params["user"]["password"])
-				success! user
-			end
-
-		end 
-	end 
+  module Strategies
+    class SubdomainLogin < Authenticatable
+    
+      def subdomain
+        request.subdomain
+      end
+      
+      def valid?
+        subdomain.present? && params["user"]
+      end
+      
+      def authenticate!
+        return fail!('Invalid email or password.') unless account = Mtdevise::Account.find_by(subdomain: subdomain)
+        return fail!('Invalid email or password.') unless user = account.users.find_by(email: params["user"]["email"])
+        return fail!('Invalid email or password.') unless user.valid_password?(params["user"]["password"])
+        success! user
+      end
+    
+    end
+  end 
 end
+
 Warden::Strategies.add(:subdomain_login, Devise::Strategies::SubdomainLogin)

data/db/migrate/20150426071228_create_mtdevise_accounts.rb

@@ -1,9 +1,11 @@
 class CreateMtdeviseAccounts < ActiveRecord::Migration[5.0]
-	def change
-		create_table :mtdevise_accounts do |t|
-			t.string :name
+  def change
+    create_table :mtdevise_accounts do |t|
 
-			t.timestamps
-		end
-	end
-end
+      t.string :name
+      
+      t.timestamps
+
+    end
+  end
+end

data/db/migrate/20150426115631_add_owner_id_to_mtdevise_accounts.rb

@@ -1,5 +1,7 @@
 class AddOwnerIdToMtdeviseAccounts < ActiveRecord::Migration[5.0]
-	def change
-		add_column :mtdevise_accounts, :owner_id, :integer
-	end
-end
+  def change
+
+    add_column :mtdevise_accounts, :owner_id, :integer
+
+  end
+end

data/db/migrate/20150426115910_create_mtdevise_users.rb

@@ -1,10 +1,12 @@
 class CreateMtdeviseUsers < ActiveRecord::Migration[5.0]
-	def change
-		create_table :mtdevise_users do |t|
-			t.string :email
-			t.string :password_digest
+  def change
+    create_table :mtdevise_users do |t|
 
-			t.timestamps
-		end
-	end
-end
+      t.string :email
+      t.string :password_digest
+      
+      t.timestamps
+
+    end
+  end
+end

data/db/migrate/20150426143800_add_devise_to_mtdevise_users.rb

@@ -1,49 +1,51 @@
 class AddDeviseToMtdeviseUsers < ActiveRecord::Migration[5.0]
-	def self.up
-		change_table(:mtdevise_users) do |t|
-			## Database authenticatable
-			t.string :encrypted_password, null: false, default: ""
 
-			## Recoverable
-			t.string   :reset_password_token
-			t.datetime :reset_password_sent_at
+  def self.up
+    change_table(:mtdevise_users) do |t|
+      ## Database authenticatable
+      t.string :encrypted_password, null: false, default: ""
+      
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+      
+      ## Rememberable
+      t.datetime :remember_created_at
+      
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+      
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+      
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+      
+      
+      # Uncomment below if timestamps were not included in your original model.
+      # t.timestamps null: false
+    end
+    
+    add_index :mtdevise_users, :email,                unique: true
+    add_index :mtdevise_users, :reset_password_token, unique: true
+    # add_index :mtdevise_users, :confirmation_token,   unique: true
+    # add_index :mtdevise_users, :unlock_token,         unique: true
+  end
+  
+  def self.down
+    # By default, we don't want to make any assumption about how to roll back a migration when your
+    # model already existed. Please edit below which fields you would like to remove in this migration.
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+end
 
-			## Rememberable
-			t.datetime :remember_created_at
-
-			## Trackable
-			t.integer  :sign_in_count, default: 0, null: false
-			t.datetime :current_sign_in_at
-			t.datetime :last_sign_in_at
-			t.string   :current_sign_in_ip
-			t.string   :last_sign_in_ip
-
-			## Confirmable
-			# t.string   :confirmation_token
-			# t.datetime :confirmed_at
-			# t.datetime :confirmation_sent_at
-			# t.string   :unconfirmed_email # Only if using reconfirmable
-
-			## Lockable
-			# t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
-			# t.string   :unlock_token # Only if unlock strategy is :email or :both
-			# t.datetime :locked_at
-
-
-			# Uncomment below if timestamps were not included in your original model.
-			# t.timestamps null: false
-		end
-
-		add_index :mtdevise_users, :email,                unique: true
-		add_index :mtdevise_users, :reset_password_token, unique: true
-		# add_index :mtdevise_users, :confirmation_token,   unique: true
-		# add_index :mtdevise_users, :unlock_token,         unique: true
-	end
-
-	def self.down
-		# By default, we don't want to make any assumption about how to roll back a migration when your
-		# model already existed. Please edit below which fields you would like to remove in this migration.
-		raise ActiveRecord::IrreversibleMigration
-	end
-
-end

data/db/migrate/20150427200506_add_subdomain_to_mtdevise_accounts.rb

@@ -1,6 +1,8 @@
 class AddSubdomainToMtdeviseAccounts < ActiveRecord::Migration[5.0]
-	def change
-		add_column :mtdevise_accounts, :subdomain, :string
-		add_index :mtdevise_accounts, :subdomain
-	end
-end
+  def change
+
+    add_column :mtdevise_accounts, :subdomain, :string
+    add_index :mtdevise_accounts, :subdomain
+
+  end
+end

data/db/migrate/20150428110406_create_mtdevise_members.rb

@@ -1,10 +1,12 @@
 class CreateMtdeviseMembers < ActiveRecord::Migration[5.0]
-	def change
-		create_table :mtdevise_members do |t|
-			t.integer :account_id
-			t.integer :user_id
+  def change
+    create_table :mtdevise_members do |t|
+ 
+      t.integer :account_id
+      t.integer :user_id
+      
+      t.timestamps
 
-			t.timestamps
-		end
-	end
-end
+    end
+  end
+end

data/db/migrate/20150504181830_add_confirmed_at_to_users.rb

@@ -1,8 +1,10 @@
 class AddConfirmedAtToUsers < ActiveRecord::Migration[5.0]
-	def change
-		add_column :mtdevise_users, :confirmed_at, :timestamp
-		add_column :mtdevise_users, :confirmation_token, :string
-		add_column :mtdevise_users, :confirmation_sent_at, :timestamp
-		add_column :mtdevise_users, :unconfirmed_email, :string
-	end
-end
+  def change
+
+    add_column :mtdevise_users, :confirmed_at, :timestamp
+    add_column :mtdevise_users, :confirmation_token, :string
+    add_column :mtdevise_users, :confirmation_sent_at, :timestamp
+    add_column :mtdevise_users, :unconfirmed_email, :string
+
+  end
+end

data/db/migrate/20150719125100_add_authentication_token_to_mtdevise_users.rb

@@ -1,6 +1,8 @@
 class AddAuthenticationTokenToMtdeviseUsers < ActiveRecord::Migration[5.0]
-	def change
-		add_column :mtdevise_users, :authentication_token, :string
-		add_index :mtdevise_users, :authentication_token
-	end
-end
+  def change
+
+    add_column :mtdevise_users, :authentication_token, :string
+    add_index :mtdevise_users, :authentication_token
+
+  end
+end

data/db/migrate/20151231043439_add_firstname_to_mtdevise_accounts.rb

@@ -1,7 +1,9 @@
 class AddFirstnameToMtdeviseAccounts < ActiveRecord::Migration[5.0]
-	def change
-		add_column :mtdevise_accounts, :firstname, :string
-		add_column :mtdevise_accounts, :lastname, :string
-		add_column :mtdevise_accounts, :username, :string
-	end
-end
+  def change
+
+    add_column :mtdevise_accounts, :firstname, :string
+    add_column :mtdevise_accounts, :lastname, :string
+    add_column :mtdevise_accounts, :username, :string
+
+  end
+end

data/lib/generators/mtdevise/views_generator.rb

@@ -1,59 +1,60 @@
 require 'rails/generators/base'
 
 module Mtdevise
-	module Generators
-
-		module ViewPathTemplates
-			extend ActiveSupport::Concern
-
-			included do
-				class_option :views, aliases: "-v", type: :array, desc: "Select specific view directories to generate (devise, layouts, mtdevise)"
-
-				public_task :copy_views
-			end
-
-			# module ClassMethods
-			#   def hide!
-			#     Rails::Generators.hide_namespace self.namespace
-			#   end
-			# end
-
-			def copy_views
-				if options[:views]
-					options[:views].each do |directory|
-						view_directory directory.to_sym
-					end
-				else
-					view_directory :devise
-					view_directory :layouts
-					view_directory :shared
-					view_directory :mtdevise
-				end
-			end
-
-			protected
-
-			def view_directory(name, _target_path = nil)
-				directory name.to_s, _target_path || "#{target_path}/#{name}" do |content|
-					content
-				end
-			end
-
-			def target_path
-				@target_path ||= "app/views"
-			end
-		end
-
-		class SharedViewsGenerator < Rails::Generators::Base
-			include ViewPathTemplates
-			source_root File.expand_path("../../../../app/views", __FILE__)
-			desc "Copies Mtdevise views to your application."
-			hide!
-		end
-
-		class ViewsGenerator < Rails::Generators::Base
-			desc "Copies Mtdevise views to your application."
-			invoke SharedViewsGenerator
-		end
-	end
-end
+  module Generators
+
+    module ViewPathTemplates
+      extend ActiveSupport::Concern
+      
+        included do
+          class_option :views, aliases: "-v", type: :array, desc: "Select specific view directories to generate (devise, layouts, mtdevise)"
+          public_task :copy_views
+        end
+      
+        # module ClassMethods
+        #   def hide!
+        #     Rails::Generators.hide_namespace self.namespace
+        #   end
+        # end
+      
+        def copy_views
+          if options[:views]
+            options[:views].each do |directory|
+              view_directory directory.to_sym
+            end
+            else
+              view_directory :devise
+              view_directory :layouts
+              view_directory :shared
+              view_directory :mtdevise
+          end
+        end
+      
+      protected
+      
+      def view_directory(name, _target_path = nil)
+        directory name.to_s, _target_path || "#{target_path}/#{name}" do |content|
+          content
+        end
+      end
+      
+      def target_path
+        @target_path ||= "app/views"
+      end
+
+    end
+
+    class SharedViewsGenerator < Rails::Generators::Base
+      include ViewPathTemplates
+      source_root File.expand_path("../../../../app/views", __FILE__)
+      desc "Copies Mtdevise views to your application."
+      hide!
+    end
+    
+    class ViewsGenerator < Rails::Generators::Base
+      desc "Copies Mtdevise views to your application."
+      invoke SharedViewsGenerator
+    end
+
+  end
+end

data/lib/mtdevise.rb

@@ -1,5 +1,4 @@
 require "mtdevise/engine"
 
 module Mtdevise
-  # Your code goes here...
 end

data/lib/mtdevise/active_record_extensions.rb

@@ -1,15 +1,15 @@
 ActiveRecord::Base.class_eval do
 
-	def self.scoped_to_account
-		belongs_to :account, :class_name => "Mtdevise::Account"
-		association_name = self.to_s.downcase.pluralize
-		Mtdevise::Account.has_many association_name.to_sym, :class_name => self.to_s
+  def self.scoped_to_account
+    belongs_to :account, :class_name => "Mtdevise::Account"
+    association_name = self.to_s.downcase.pluralize
+    Mtdevise::Account.has_many association_name.to_sym, :class_name => self.to_s
+    
+    instance_eval <<-HERE
+    def scoped_to(account)
+    where(:account_id => account.id)
+    end
+    HERE
+  end
 
-		instance_eval <<-HERE
-		def scoped_to(account)
-		where(:account_id => account.id)
-		end
-		HERE
-	end
-
-end
+end

data/lib/mtdevise/engine.rb

@@ -15,37 +15,39 @@ require 'font-awesome-rails'
 require 'gravtastic'
 require 'phctitleseo'
 require 'phcnotifi'
-		
-module Mtdevise
-	class Engine < ::Rails::Engine
-
-    	#Isolate Name
-		isolate_namespace Mtdevise
-
-    	# Houser Gem
-		initializer 'mtdevise.middleware.houser' do
-			Rails.application.config.middleware.use Houser::Middleware, :class_name => 'Mtdevise::Account'
-		end
-
-    	# Testing and Rspec
-		config.generators do |g|
-			g.test_framework :rspec, :view_specs => false
-		end
 
-		config.to_prepare do
-			root = Mtdevise::Engine.root
-			extenders_path = root + "app/extenders/**/*.rb"
-			Dir.glob(extenders_path) do |file|
-				Rails.configuration.cache_classes ? require(file) : load(file)
-			end
-		end
+module Mtdevise
+  class Engine < ::Rails::Engine
+  
+    #Isolate Name
+    isolate_namespace Mtdevise
+    
+    # Houser Gem
+    initializer 'mtdevise.middleware.houser' do
+      Rails.application.config.middleware.use Houser::Middleware, :class_name => 'Mtdevise::Account'
+    end
+    
+    # Testing and Rspec
+    config.generators do |g|
+      g.test_framework :rspec, :view_specs => false
+    end
+    
+    config.to_prepare do
+      root = Mtdevise::Engine.root
+      extenders_path = root + "app/extenders/**/*.rb"
+      Dir.glob(extenders_path) do |file|
+        Rails.configuration.cache_classes ? require(file) : load(file)
+      end
+    end
+    
+    # Load Helper Files
+    config.to_prepare do
+      ApplicationController.helper(ApplicationHelper)
+      Phcnotifi::ApplicationController.helper(ApplicationHelper)
+      Phctitleseo::ApplicationController.helper(ApplicationHelper)
+    end
+  
+  end
+end
 
-		# Load Helper Files
-		config.to_prepare do
-			ApplicationController.helper(ApplicationHelper)
-			Phcnotifi::ApplicationController.helper(ApplicationHelper)
-			Phctitleseo::ApplicationController.helper(ApplicationHelper)
-		end
 
-	end
-end