mtwarden 6.0.1 → 6.1.0

data/app/controllers/mtwarden/accounts_controller.rb

@@ -1,32 +1,32 @@
-require_dependency "mtwarden/application_controller"
-
-module Mtwarden
-	class AccountsController < ApplicationController
-		def new
-			@account = Mtwarden::Account.new
-			@account.build_owner
-		end
-
-		def create
-			@account = Mtwarden::Account.create_with_owner(account_params)
-			if @account.valid?
-				force_authentication!(@account.owner)
-				flash[:success] = "Your account has been successfully created."
-				redirect_to mtwarden.root_url(:subdomain => @account.subdomain)
-			else
-				flash[:error] = "Sorry, your account could not be created."
-				render :new
-			end
-		end
-
-		private
-
-		def account_params
-			params.require(:account).permit(:name, :subdomain,
-				{ :owner_attributes => [
-					[:email, :password, :password_confirmation]
-				]}
-			)
-		end
-	end
-end
+require_dependency "mtwarden/application_controller"
+
+module Mtwarden
+	class AccountsController < ApplicationController
+		def new
+			@account = Mtwarden::Account.new
+			@account.build_owner
+		end
+
+		def create
+			@account = Mtwarden::Account.create_with_owner(account_params)
+			if @account.valid?
+				force_authentication!(@account.owner)
+				flash[:success] = "Your account has been successfully created."
+				redirect_to mtwarden.root_url(:subdomain => @account.subdomain)
+			else
+				flash[:error] = "Sorry, your account could not be created."
+				render :new
+			end
+		end
+
+		private
+
+		def account_params
+			params.require(:account).permit(:name, :subdomain,
+				{ :owner_attributes => [
+					[:email, :password, :password_confirmation]
+				]}
+			)
+		end
+	end
+end

data/app/controllers/mtwarden/application_controller.rb

@@ -1,12 +1,12 @@
-module Mtwarden
-	class ApplicationController < ::ApplicationController
-
-	def authorize_owner
-			unless owner?
-				flash[:error] = "You are not allowed to do that."
-				redirect_to root_path
-			end
-		end
-	end
-
-end
+module Mtwarden
+	class ApplicationController < ::ApplicationController
+
+	def authorize_owner
+			unless owner?
+				flash[:error] = "You are not allowed to do that."
+				redirect_to root_path
+			end
+		end
+	end
+
+end

data/app/controllers/mtwarden/dashboard_controller.rb

@@ -1,6 +1,6 @@
-require_dependency "mtwarden/application_controller"
-
-module Mtwarden
-	class DashboardController < ApplicationController
-	end
-end
+require_dependency "mtwarden/application_controller"
+
+module Mtwarden
+	class DashboardController < ApplicationController
+	end
+end

data/app/extenders/controllers/application_controller_extender.rb

@@ -1,38 +1,38 @@
-::ApplicationController.class_eval do
-	def current_account
-		@current_account ||= env['X-Houser-Object']
-	end
-	helper_method :current_account
-
-	def current_user
-		if user_signed_in?
-			@current_user ||= begin
-				user_id = env["warden"].user(:scope => :user)
-				Mtwarden::User.find_by_id(user_id)
-			end
-		end
-	end
-	helper_method :current_user
-
-	def user_signed_in?
-		env["warden"].authenticated?(:user)
-	end
-	helper_method :user_signed_in?
-
-	def authenticate_user!
-		unless user_signed_in?
-			flash[:info] = "Please sign in."
-			redirect_to '/sign_in'
-		end
-	end
-
-	def force_authentication!(user)
-		env["warden"].set_user(user, :scope => :user)
-	end
-
-	def owner?
-		current_account.owner?(current_user)
-	end
-	helper_method :owner?
-
-end
+::ApplicationController.class_eval do
+	def current_account
+		@current_account ||= env['X-Houser-Object']
+	end
+	helper_method :current_account
+
+	def current_user
+		if user_signed_in?
+			@current_user ||= begin
+				user_id = env["warden"].user(:scope => :user)
+				Mtwarden::User.find_by_id(user_id)
+			end
+		end
+	end
+	helper_method :current_user
+
+	def user_signed_in?
+		env["warden"].authenticated?(:user)
+	end
+	helper_method :user_signed_in?
+
+	def authenticate_user!
+		unless user_signed_in?
+			flash[:info] = "Please sign in."
+			redirect_to '/sign_in'
+		end
+	end
+
+	def force_authentication!(user)
+		env["warden"].set_user(user, :scope => :user)
+	end
+
+	def owner?
+		current_account.owner?(current_user)
+	end
+	helper_method :owner?
+
+end

data/app/helpers/mtwarden/application_helper.rb

@@ -1,4 +1,4 @@
-module Mtwarden
-  module ApplicationHelper
-  end
-end
+module Mtwarden
+  module ApplicationHelper
+  end
+end

data/app/jobs/mtwarden/application_job.rb

@@ -1,4 +1,4 @@
-module Mtwarden
-  class ApplicationJob < ActiveJob::Base
-  end
-end
+module Mtwarden
+  class ApplicationJob < ActiveJob::Base
+  end
+end

data/app/mailers/mtwarden/application_mailer.rb

@@ -1,8 +1,8 @@
-module Mtwarden
-  class ApplicationMailer < ActionMailer::Base
-
-    default from: 'from@example.com'
-    layout 'mailer'
-
-  end
-end
+module Mtwarden
+  class ApplicationMailer < ActionMailer::Base
+
+    default from: 'from@example.com'
+    layout 'mailer'
+
+  end
+end

data/app/models/mtwarden/account.rb

@@ -1,39 +1,39 @@
-module Mtwarden
-	class Account < ActiveRecord::Base
-
-		belongs_to :owner, :class_name => "Mtwarden::User"
-		accepts_nested_attributes_for :owner
-
-		belongs_to :plan, :class_name => "Mtwarden::Plan"
-
-		validates :subdomain, :presence => true, :uniqueness => true
-		validates :name, presence: true
-
-		has_many :members, :class_name => "Mtwarden::Member"
-		has_many :users, :through => :members
-
-		EXCLUDED_SUBDOMAINS = %w(admin)
-		validates_exclusion_of :subdomain, :in => EXCLUDED_SUBDOMAINS,
-		:message => "is not allowed. Please choose another subdomain."
-
-		validates_format_of :subdomain, :with => /\A[\w\-]+\Z/i,
-		:message => "is not allowed. Please choose another subdomain."
-
-		before_validation do
-			self.subdomain = subdomain.to_s.downcase
-		end
-
-		def self.create_with_owner(params={})
-			account = new(params)
-			if account.save
-				account.users << account.owner
-			end
-			account
-		end
-
-		def owner?(user)
-			owner == user
-		end
-	end
-
-end
+module Mtwarden
+	class Account < ActiveRecord::Base
+
+		belongs_to :owner, :class_name => "Mtwarden::User"
+		accepts_nested_attributes_for :owner
+
+		belongs_to :plan, :class_name => "Mtwarden::Plan"
+
+		validates :subdomain, :presence => true, :uniqueness => true
+		validates :name, presence: true
+
+		has_many :members, :class_name => "Mtwarden::Member"
+		has_many :users, :through => :members
+
+		EXCLUDED_SUBDOMAINS = %w(admin)
+		validates_exclusion_of :subdomain, :in => EXCLUDED_SUBDOMAINS,
+		:message => "is not allowed. Please choose another subdomain."
+
+		validates_format_of :subdomain, :with => /\A[\w\-]+\Z/i,
+		:message => "is not allowed. Please choose another subdomain."
+
+		before_validation do
+			self.subdomain = subdomain.to_s.downcase
+		end
+
+		def self.create_with_owner(params={})
+			account = new(params)
+			if account.save
+				account.users << account.owner
+			end
+			account
+		end
+
+		def owner?(user)
+			owner == user
+		end
+	end
+
+end

data/app/models/mtwarden/application_record.rb

@@ -1,5 +1,5 @@
-module Mtwarden
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end
+module Mtwarden
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/app/models/mtwarden/member.rb

@@ -1,6 +1,6 @@
-module Mtwarden
-	class Member < ActiveRecord::Base
-		belongs_to :account, :class_name => "Mtwarden::Account"
-		belongs_to :user, :class_name => "Mtwarden::User"
-	end
-end
+module Mtwarden
+	class Member < ActiveRecord::Base
+		belongs_to :account, :class_name => "Mtwarden::Account"
+		belongs_to :user, :class_name => "Mtwarden::User"
+	end
+end

data/app/models/mtwarden/plan.rb

@@ -1,4 +1,4 @@
-module Mtwarden
-	class Plan < ActiveRecord::Base
-	end
-end
+module Mtwarden
+	class Plan < ActiveRecord::Base
+	end
+end

data/app/models/mtwarden/user.rb

@@ -1,7 +1,7 @@
-module Mtwarden
-	class User < ActiveRecord::Base
-		include Gravtastic
-		gravtastic
-		has_secure_password
-	end
-end
+module Mtwarden
+	class User < ActiveRecord::Base
+		include Gravtastic
+		gravtastic
+		has_secure_password
+	end
+end

data/app/views/layouts/mtwarden/application.html.erb

@@ -1,16 +1,16 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>CoastDigitalGroup Mtwarden Warden Edition</title>
-		<%= stylesheet_link_tag    "mtwarden/application", media: "all" %>
-		<%= javascript_include_tag "mtwarden/application" %>
-		<%= csrf_meta_tags %>
-	</head>
-	<body>
-		<% flash.each do |k,v| %>
-			<div class='flash <%= k %>'><%= v %></div>
-		<% end %>
-		<%= render "mtwarden/shared/login" %>
-		<%= yield %>
-	</body>
-</html>
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>CoastDigitalGroup Mtwarden Warden Edition</title>
+		<%= stylesheet_link_tag    "mtwarden/application", media: "all" %>
+		<%= javascript_include_tag "mtwarden/application" %>
+		<%= csrf_meta_tags %>
+	</head>
+	<body>
+		<% flash.each do |k,v| %>
+			<div class='flash <%= k %>'><%= v %></div>
+		<% end %>
+		<%= render "mtwarden/shared/login" %>
+		<%= yield %>
+	</body>
+</html>

data/app/views/mtwarden/account/accounts/_existing_subscription.html.erb

@@ -1,3 +1,3 @@
-<%= form_tag confirm_plan_account_path(:plan_id => params[:plan_id]) do %>
-	<%= submit_tag "Change plan" %>
-<% end %>
+<%= form_tag confirm_plan_account_path(:plan_id => params[:plan_id]) do %>
+	<%= submit_tag "Change plan" %>
+<% end %>

data/app/views/mtwarden/account/accounts/_new_subscription.html.erb

@@ -1,38 +1,38 @@
-<% if @result && @result.message %>
-	<ul class="gateway_messages">
-		<% @result.message.split("\n").each do |message| %>
-			<li><%= message %></li>
-		<% end %>
-	</ul>
-<% end %>
-
-<%= form_for :customer,
-	:url => Braintree::TransparentRedirect.url,
-	:html => {:autocomplete => "off"} do |customer| -%>
-	<% tr_data = Braintree::TransparentRedirect.create_customer_data(
-		:redirect_url => mtwarden.subscribe_account_url(:plan_id => params[:plan_id]),
-	) %>
-	<%= hidden_field_tag "tr_data", tr_data %>
-	<%= customer.fields_for :credit_card do |cc| -%>
-		<p>
-			<%= cc.label :number, "Credit card number" %><br>
-			<%= cc.text_field :number %>
-		</p>
-
-		<p>
-			<%= cc.label :cardholder_name, "Name on card" %><br>
-			<%= cc.text_field :cardholder_name %>
-		</p>
-
-		<p>
-			<%= cc.label :expiration_date, "Expiration date" %><br>
-			<%= cc.text_field :expiration_date %>
-		</p>
-
-		<p>
-			<%= cc.label :cvv, "CVV" %><br>
-			<%= cc.text_field :cvv %>
-		</p>
-		<%= customer.submit "Change plan" %>
-	<% end %>
-<% end %>
+<% if @result && @result.message %>
+	<ul class="gateway_messages">
+		<% @result.message.split("\n").each do |message| %>
+			<li><%= message %></li>
+		<% end %>
+	</ul>
+<% end %>
+
+<%= form_for :customer,
+	:url => Braintree::TransparentRedirect.url,
+	:html => {:autocomplete => "off"} do |customer| -%>
+	<% tr_data = Braintree::TransparentRedirect.create_customer_data(
+		:redirect_url => mtwarden.subscribe_account_url(:plan_id => params[:plan_id]),
+	) %>
+	<%= hidden_field_tag "tr_data", tr_data %>
+	<%= customer.fields_for :credit_card do |cc| -%>
+		<p>
+			<%= cc.label :number, "Credit card number" %><br>
+			<%= cc.text_field :number %>
+		</p>
+
+		<p>
+			<%= cc.label :cardholder_name, "Name on card" %><br>
+			<%= cc.text_field :cardholder_name %>
+		</p>
+
+		<p>
+			<%= cc.label :expiration_date, "Expiration date" %><br>
+			<%= cc.text_field :expiration_date %>
+		</p>
+
+		<p>
+			<%= cc.label :cvv, "CVV" %><br>
+			<%= cc.text_field :cvv %>
+		</p>
+		<%= customer.submit "Change plan" %>
+	<% end %>
+<% end %>