mtdevise 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77cbd55ba1c53fb82cc0b878f90cd308e57dd5f6
-  data.tar.gz: fc5e2fe0869629327b2e0fd0fd3081d0c76d74bb
+  metadata.gz: 343b2b25a2101d7b24353247547eb6a16994f7e0
+  data.tar.gz: 36c3b00844f77ba978de23bf81348f93fa7d5b46
 SHA512:
-  metadata.gz: 934b003be2bd8cb60333829887aed83b9ded33516e11da18ae1f0c5b0ed233993118203f0551df1d403a2c4d3988a4dde019b8b2f6a79ea9f027b8057f32ca39
-  data.tar.gz: de8d52bfb0df42526fd90aa1df5539ae062c95fcc8bd41b0b56b94603d4af810ceb41aa35c7b83c822fcc612180d9d4f0c0aa17ab7c0d5ad3e31a7b08c1ab095
+  metadata.gz: e3f690bf4a9c6ecbfbf1779a3d12fca019cf21da2b1364d688cb33cde0d4ea49b2cba6a6bfff8687704b7a81b365955b079557b400567c2407b463fb6938f7a8
+  data.tar.gz: ade830aa9a656faff596cbb0c5a0d8fc47d8b7e331ad3227cfad530b5a32a56fe1ca0606b893074953d21a0c121ef14ee3170c06cb43a4e60b741fee02fe37cd

data/app/controllers/mtdevise/account/dashboard_controller.rb

@@ -7,6 +7,5 @@ module Mtdevise
 
 		def index
 		end
-
 	end
-end
+end

data/app/controllers/mtdevise/account/sessions_controller.rb

@@ -16,4 +16,4 @@
 #       end
 #     end
 #   end
-# end
+# end

data/app/controllers/mtdevise/account/users_controller.rb

@@ -24,4 +24,4 @@ module Mtdevise
 		end
 
 	end
-end
+end

data/app/controllers/mtdevise/accounts_controller.rb

@@ -55,10 +55,8 @@ module Mtdevise
 		end
 
 		def account_params
-				params.require(:account).permit(:name, :subdomain, { :owner_attributes => [:email, :password, :password_confirmation]})
+			params.require(:account).permit(:name, :firstname, :lastname, :username, :subdomain, { :owner_attributes => [:email, :password, :password_confirmation]})
 		end
 
-
-
 	end
 end

data/app/controllers/mtdevise/application_controller.rb

@@ -14,13 +14,11 @@ module Mtdevise
 		def current_user?(user)
 			user == current_user
 		end
-
 		helper_method :current_user
 
 		def current_account?(account)
 			account == current_account
 		end
-
 		helper_method :current_account 
 
 		private

data/app/controllers/mtdevise/dashboard_controller.rb

@@ -6,6 +6,5 @@ module Mtdevise
 
 		def index
 		end
-
 	end
-end
+end

data/app/controllers/mtdevise/welcome_controller.rb

@@ -2,12 +2,10 @@ require_dependency "mtdevise/application_controller"
 
 module Mtdevise
 	class WelcomeController < ApplicationController
-
 		layout "mtdevise/welcome"   
 		before_filter :redirect_logged_in_users_to_account_page
 
 		def index
 		end
-
 	end
 end

data/app/extenders/controllers/application_controller_extender.rb

@@ -6,4 +6,4 @@
 
 	helper_method :current_account
 
-end
+end

data/app/helpers/mtdevise/application_helper.rb

@@ -10,6 +10,6 @@ module Mtdevise
 				when :alert then "alert alert-warning"
 			end
 		end
-          
+
 	end
 end

data/app/models/mtdevise/account.rb

@@ -17,8 +17,19 @@ module Mtdevise
 			presence: true,
 			uniqueness: {scope: :owner_id}
 
+		validates :firstname,
+			presence: true
+
+		validates :lastname,
+			presence: true
+
+		validates :username,
+			presence: true,
+			uniqueness: true
+
 		before_validation do
 			self.subdomain = subdomain.to_s.downcase
+			self.username = username.to_s.downcase
 		end
 
 		def self.create_with_owner(params={})

data/app/views/mtdevise/accounts/index.html.erb

@@ -28,4 +28,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>

data/app/views/mtdevise/accounts/new.html.erb

@@ -13,6 +13,18 @@
 							<span class="input-group-addon"><i class="fa fa-users"></i></span>
 							<%= account.input_field :name, required: true, autofocus: true, :class => "form-control", :placeholder => "Account Name" %>
 						</div>
+						<div style="margin-bottom: 25px" class="input-group">
+							<span class="input-group-addon"><i class="fa fa-link"></i></span>
+							<%= account.input_field :firstname, required: true, :class => "form-control", :placeholder => "First Name" %>
+						</div>
+						<div style="margin-bottom: 25px" class="input-group">
+							<span class="input-group-addon"><i class="fa fa-link"></i></span>
+							<%= account.input_field :lastname, required: true, :class => "form-control", :placeholder => "Last Name" %>
+						</div>
+						<div style="margin-bottom: 25px" class="input-group">
+							<span class="input-group-addon"><i class="fa fa-link"></i></span>
+							<%= account.input_field :username, required: true, :class => "form-control", :placeholder => "User Name" %>
+						</div>
 						<div style="margin-bottom: 25px" class="input-group">
 							<span class="input-group-addon"><i class="fa fa-link"></i></span>
 							<%= account.input_field :subdomain, required: true, :class => "form-control", :placeholder => "Subdomain" %>
@@ -40,6 +52,18 @@
 							<span class="input-group-addon"><i class="fa fa-users"></i></span>
 							<%= account.input_field :name, label: 'Account Name', :class => "form-control", :placeholder => "Account Name"  %>
 						</div>
+						<div style="margin-bottom: 25px" class="input-group">
+							<span class="input-group-addon"><i class="fa fa-link"></i></span>
+							<%= account.input_field :firstname, required: true, :class => "form-control", :placeholder => "First Name" %>
+						</div>
+						<div style="margin-bottom: 25px" class="input-group">
+							<span class="input-group-addon"><i class="fa fa-link"></i></span>
+							<%= account.input_field :lastname, required: true, :class => "form-control", :placeholder => "Last Name" %>
+						</div>
+						<div style="margin-bottom: 25px" class="input-group">
+							<span class="input-group-addon"><i class="fa fa-link"></i></span>
+							<%= account.input_field :username, required: true, :class => "form-control", :placeholder => "User Name" %>
+						</div>
 						<div style="margin-bottom: 25px" class="input-group">
 							<%= account.simple_fields_for :owner do |owner| %>
 						</div>

data/app/views/mtdevise/welcome/index.html.erb

@@ -7,7 +7,7 @@
 		<h3 class="text-muted">mtdevise</h3>
 	</div>
 	<div class="jumbotron">
-		<h1>CDG Multitenancy Engine</h1>
+		<h1>Multitenancy Engine</h1>
 		<p><%= link_to "Sign Up Today", mtdevise.sign_up_path, role: 'button', class: 'btn btn-lg btn-success', 'data-no-turbolink' => 'true' %></p>
 		<p></p>
 	</div>
@@ -15,5 +15,5 @@
 		Already have an Account? Login Below.
 		<%= link_to "Sign In To Manage Your Accounts", mtdevise.new_user_session_path, class: 'text-center center-block', 'data-no-turbolink' => 'true' %>
 	</p>
-	<footer class="footer"><p>© CoastDigitalGroup 2015</p></footer>
+	<footer class="footer"><p>Opensourced PHCNetworks 2015-2016</p></footer>
 </div>

data/app/views/shared/_header.html.erb

@@ -1,20 +1,20 @@
 <nav class="navbar navbar-default navbar-fixed-top">
 	<div class="container">
-		<div class="navbar-header"><%= link_to 'mtdevise', account_root_path, class: 'navbar-brand' %></div>
-			<div class="collapse navbar-collapse">
-				<ul class="dropdown-menu nav navbar-nav navbar-right">
-					<li>
-						<a aria-expanded="false" class="dropdown-toggle" data-toggle="dropdown" href="#" role="button">Settings<span class="caret"></span></a>
-						<%- if user_signed_in? %>
-							<ul class="dropdown-menu" role="menu">
-								<li>Signed in as <%= current_user.email %></li>
-								<li class="divider"></li>
-								<li><%= link_to 'Log out', destroy_user_session_path, method: :delete %></li>
-							</ul>
-						<% end %>
-					</li>
-				</ul>
-			</div>
+		<div class="navbar-header"><%= link_to 'mtdevise', account_root_path, class: 'navbar-brand' %>
+		</div>
+		<div class="collapse navbar-collapse">
+			<ul class="dropdown-menu nav navbar-nav navbar-right">
+				<li>
+					<a aria-expanded="false" class="dropdown-toggle" data-toggle="dropdown" href="#" role="button">Settings<span class="caret"></span></a>
+					<%- if user_signed_in? %>
+						<ul class="dropdown-menu" role="menu">
+							<li>Signed in as <%= current_user.email %></li>
+							<li class="divider"></li>
+							<li><%= link_to 'Log out', destroy_user_session_path, method: :delete %></li>
+						</ul>
+					<% end %>
+				</li>
+			</ul>
 		</div>
 	</div>
 </nav>

data/db/migrate/20151231043439_add_firstname_to_mtdevise_accounts.rb

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

data/lib/mtdevise/version.rb

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

data/spec/controllers/mtdevise/accounts_controller_spec.rb

@@ -12,7 +12,7 @@ describe Mtdevise::AccountsController do
 		#   controller.stub(:force_authentication!)
 		# end
 		let(:params) do
-			{:account => {name: 'something', subdomain: 'something', owner_attributes: {email: 'bb@gmail.com', password: 'password', password_confirmation: 'password'}}}
+			{:account => {name: 'something', firstname: 'something', lastname: 'something', username: 'something', subdomain: 'something', owner_attributes: {email: 'bb@gmail.com', password: 'password', password_confirmation: 'password'}}}
 		end
 
 		context "the user is already signed in" do

data/spec/features/accounts/create_spec.rb

@@ -11,11 +11,17 @@ feature 'Accounts creation' do
 	scenario 'creating an account' do
 		fill_in 'Account Name', :with => 'Test'
 		fill_in "Subdomain", :with => "test"
+		fill_in 'First Name', :with => 'Test'
+		fill_in 'Last Name', :with => 'Test'
+		fill_in 'User Name', :with => 'Test'
 		click_button 'Create Account'
 		expect(page).to have_text('Your account has been successfully created.')
 	end
 	scenario "Ensure subdomain uniqueness" do
 		fill_in 'Account Name', :with => 'Test'
+		fill_in 'First Name', :with => 'Test'
+		fill_in 'Last Name', :with => 'Test'
+		fill_in 'User Name', :with => 'Test'
 		fill_in "Subdomain", :with => @account.subdomain
 		click_button 'Create Account'
 		expect(page).to have_text("Sorry, your account could not be created.")
@@ -23,6 +29,9 @@ feature 'Accounts creation' do
 	end
 	scenario "Subdomain with restricted name" do
 		fill_in 'Account Name', :with => 'Test'
+		fill_in 'First Name', :with => 'Test'
+		fill_in 'Last Name', :with => 'Test'
+		fill_in 'User Name', :with => 'Test'
 		fill_in "Subdomain", :with => "admin"
 		click_button 'Create Account'
 		expect(page).to have_text("Sorry, your account could not be created.")
@@ -30,6 +39,9 @@ feature 'Accounts creation' do
 	end
 	scenario "Subdomain with invalid name" do
 		fill_in 'Account Name', :with => 'Test'
+		fill_in 'First Name', :with => 'Test'
+		fill_in 'Last Name', :with => 'Test'
+		fill_in 'User Name', :with => 'Test'
 		fill_in "Subdomain", :with => "<admin>"
 		click_button 'Create Account'
 		expect(page).to have_text("Sorry, your account could not be created.")

data/spec/features/accounts/sign_up_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 feature 'Accounts' do
+
 	context 'signed in users' do
 		scenario 'should redirect to accounts page' do
 			sign_in
@@ -8,11 +9,15 @@ feature 'Accounts' do
 			expect(page.current_url).to match(/#{mtdevise.accounts_path}/)
 		end
 	end
+
 	context 'signed out users' do
 		scenario 'creating an account' do
 			visit mtdevise.root_path
 			click_link 'Sign Up Today'
 			fill_in 'Account Name', :with => 'Test'
+			fill_in 'First Name', :with => 'Test'
+			fill_in 'Last Name', :with => 'Test'
+			fill_in 'User Name', :with => 'Test'
 			fill_in "Subdomain", :with => "test"
 			fill_in 'Email', :with => 'mtdevise@example.com'
 			fill_in 'Password', :with => 'password', :exact => true
@@ -30,6 +35,9 @@ feature 'Accounts' do
 			visit mtdevise.root_path
 			click_link "Sign Up Today"
 			fill_in "Account Name", :with => "another name"
+			fill_in 'First Name', :with => 'Test'
+			fill_in 'Last Name', :with => 'Test'
+			fill_in 'User Name', :with => 'Test'
 			fill_in "Subdomain", :with => "anothersubdomain"
 			fill_in "Email", :with => owner.email
 			fill_in "Password", :with => "password", :exact => true
@@ -41,11 +49,14 @@ feature 'Accounts' do
 		end
 
 		scenario "Ensure subdomain uniqueness" do
-			Mtdevise::Account.create!(:subdomain => "test", :name => "Test")
+			Mtdevise::Account.create!(:subdomain => "test", :name => "Test", :firstname => "Test", :lastname => "Test", :username => "test")
 			visit mtdevise.root_path
 			click_link "Sign Up Today"
 			fill_in "Account Name", :with => "Test"
 			fill_in "Subdomain", :with => "test"
+			fill_in 'First Name', :with => 'Test'
+			fill_in 'Last Name', :with => 'Test'
+			fill_in 'User Name', :with => 'Test'
 			fill_in "Email", :with => "mtdevise@example.com"
 			fill_in "Password", :with => "password", :exact => true
 			fill_in "Confirm Password", :with => 'password'
@@ -59,6 +70,9 @@ feature 'Accounts' do
 			visit mtdevise.root_path
 			click_link "Sign Up Today"
 			fill_in "Account Name", :with => "Test"
+			fill_in 'First Name', :with => 'Test'
+			fill_in 'Last Name', :with => 'Test'
+			fill_in 'User Name', :with => 'Test'
 			fill_in "Subdomain", :with => "admin"
 			fill_in "Email", :with => "mtdevise@example.com"
 			fill_in "Password", :with => "password"
@@ -73,6 +87,9 @@ feature 'Accounts' do
 			visit mtdevise.root_path
 			click_link "Sign Up Today"
 			fill_in "Account Name", :with => "Test"
+			fill_in 'First Name', :with => 'Test'
+			fill_in 'Last Name', :with => 'Test'
+			fill_in 'User Name', :with => 'Test'
 			fill_in "Subdomain", :with => "<admin>"
 			fill_in "Email", :with => "mtdevise@example.com"
 			fill_in "Password", :with => "password"

data/spec/features/users/sign_up_spec.rb

@@ -1,5 +1,3 @@
-# #TODO This should be a modularized feature
-
 # require "spec_helper"
 
 # feature "User signup" do

data/spec/models/mtdevise/account_spec.rb

@@ -1,33 +1,24 @@
-# == Schema Information
-#
-# Table name: mtdevise_accounts
-#
-#  id         :integer          not null, primary key
-#  name       :string(255)
-#  created_at :datetime
-#  updated_at :datetime
-#  owner_id   :integer
-#  subdomain  :string(255)
-#
-
 require 'spec_helper'
 
 describe Mtdevise::Account do
 
 	it "can be created with an owner" do
 		params = {
-		:name => "Test Account",
-		:subdomain => "test",
-		:owner_attributes => {
-		:email => "user@example.com",
-		:password => "password",
-		:password_confirmation => "password"
+			:name => "Test Account",
+			:firstname => "Test",
+			:lastname => "Test",
+			:username => "test",
+			:subdomain => "test",
+			:owner_attributes => {
+			:email => "user@example.com",
+			:password => "password",
+			:password_confirmation => "password"
+			}
 		}
-	}
-	account = Mtdevise::Account.create_with_owner(params)
-	users = account.users
-	expect(account).to be_persisted
-	expect(users.first).to eq(account.owner)
+		account = Mtdevise::Account.create_with_owner(params)
+		users = account.users
+		expect(account).to be_persisted
+		expect(users.first).to eq(account.owner)
 
 	end
 end

data/spec/support/factories/account_factory.rb

@@ -1,6 +1,9 @@
 FactoryGirl.define do
 	factory :account, :class => Mtdevise::Account do
 		sequence(:name) { |n| "Test Account ##{n}" }
+		sequence(:firstname) { |n| "Test#{n}" }
+		sequence(:lastname) { |n| "Test#{n}" }
+		sequence(:username) { |n| "test#{n}" }
 		sequence(:subdomain) { |n| "test#{n}" }
 		association :owner, :factory => :user
 		after(:create) do |account|

data/spec/test_app/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150719125100) do
+ActiveRecord::Schema.define(version: 20151231043439) do
 
   create_table "mtdevise_accounts", force: :cascade do |t|
     t.string   "name"
@@ -19,6 +19,9 @@ ActiveRecord::Schema.define(version: 20150719125100) do
     t.datetime "updated_at"
     t.integer  "owner_id"
     t.string   "subdomain"
+    t.string   "firstname"
+    t.string   "lastname"
+    t.string   "username"
   end
 
   add_index "mtdevise_accounts", ["subdomain"], name: "index_mtdevise_accounts_on_subdomain"