mtwarden 6.0.1 → 6.1.0

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

@@ -1,17 +1,17 @@
-<h2>Edit Account</h2>
-
-<%= form_for(current_account, :url => account_path) do |account| %>
-	<%= account.error_messages %>
-	<p>
-		<%= account.label :name %>
-		<%= account.text_field :name %>
-	</p>
-
-	<p>
-		<%= account.label :plan_id %>
-		<% plans = Mtwarden::Plan.all.map { |p| [p.name, p.id] } %>
-		<%= account.select :plan_id, plans %>
-	</p>
-
-	<%= account.submit "Update Account" %>
-<% end %>
+<h2>Edit Account</h2>
+
+<%= form_for(current_account, :url => account_path) do |account| %>
+	<%= account.error_messages %>
+	<p>
+		<%= account.label :name %>
+		<%= account.text_field :name %>
+	</p>
+
+	<p>
+		<%= account.label :plan_id %>
+		<% plans = Mtwarden::Plan.all.map { |p| [p.name, p.id] } %>
+		<%= account.select :plan_id, plans %>
+	</p>
+
+	<%= account.submit "Update Account" %>
+<% end %>

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

@@ -1,14 +1,14 @@
-<div class='plan-info'>
-	<p>
-		You are changing to the '<%= @plan.name %>' plan.
-	</p>
-	<p>
-		This plan costs <strong>$<%= @plan.price %></strong> per month.
-	</p>
-</div>
-
-<% if current_account.braintree_subscription_id.present? %>
-	<%= render "existing_subscription" %>
-<% else %>
-	<%= render "new_subscription" %>
-<% end %>
+<div class='plan-info'>
+	<p>
+		You are changing to the '<%= @plan.name %>' plan.
+	</p>
+	<p>
+		This plan costs <strong>$<%= @plan.price %></strong> per month.
+	</p>
+</div>
+
+<% if current_account.braintree_subscription_id.present? %>
+	<%= render "existing_subscription" %>
+<% else %>
+	<%= render "new_subscription" %>
+<% end %>

data/app/views/mtwarden/account/dashboard/index.html.erb

@@ -1 +1 @@
-Your account's dashboard. Coming soon.
+Your account's dashboard. Coming soon.

data/app/views/mtwarden/account/sessions/new.html.erb

@@ -1,19 +1,19 @@
-<h2>Sign in</h2>
-
-<%= form_for @user, :url => sessions_url do |f| %>
-	<p>
-		<%= f.label :email %><br>
-		<%= f.email_field :email %>
-	</p>
-
-	<p>
-		<%= f.label :password %><br>
-		<%= f.password_field :password %>
-	</p>
-
-	<p>
-		<%= f.submit "Sign in" %>
-	</p>
-<% end %>
-
-<%= link_to "New User?", user_sign_up_url %>
+<h2>Sign in</h2>
+
+<%= form_for @user, :url => sessions_url do |f| %>
+	<p>
+		<%= f.label :email %><br>
+		<%= f.email_field :email %>
+	</p>
+
+	<p>
+		<%= f.label :password %><br>
+		<%= f.password_field :password %>
+	</p>
+
+	<p>
+		<%= f.submit "Sign in" %>
+	</p>
+<% end %>
+
+<%= link_to "New User?", user_sign_up_url %>

data/app/views/mtwarden/account/users/_form.html.erb

@@ -1,14 +1,14 @@
-<p>
-	<%= user.label :email %><br>
-	<%= user.email_field :email %>
-</p>
-
-<p>
-	<%= user.label :password %><br>
-	<%= user.password_field :password %>
-</p>
-
-<p>
-	<%= user.label :password_confirmation %><br>
-	<%= user.password_field :password_confirmation %>
-</p>
+<p>
+	<%= user.label :email %><br>
+	<%= user.email_field :email %>
+</p>
+
+<p>
+	<%= user.label :password %><br>
+	<%= user.password_field :password %>
+</p>
+
+<p>
+	<%= user.label :password_confirmation %><br>
+	<%= user.password_field :password_confirmation %>
+</p>

data/app/views/mtwarden/account/users/new.html.erb

@@ -1,6 +1,6 @@
-<h2>Sign Up</h2>
-
-<%= form_for(@user, :url => do_user_sign_up_url) do |user| %>
-	<%= render "mtwarden/account/users/form", :user => user %>
-	<%= user.submit "Sign up" %>
-<% end %>
+<h2>Sign Up</h2>
+
+<%= form_for(@user, :url => do_user_sign_up_url) do |user| %>
+	<%= render "mtwarden/account/users/form", :user => user %>
+	<%= user.submit "Sign up" %>
+<% end %>

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

@@ -1,20 +1,20 @@
-<h2>Sign Up</h2>
-
-<%= form_for(@account) do |account| %>
-	<%= account.error_messages %>
-	<p>
-		<%= account.label :name %><br>
-		<%= account.text_field :name %>
-	</p>
-
-	<p>
-		<%= account.label :subdomain %><br>
-		<%= account.text_field :subdomain %>
-	</p>
-
-	<%= account.fields_for :owner do |owner| %>
-		<%= render "mtwarden/account/users/form", :user => owner %>
-	<% end %>
-
-	<%= account.submit %>
-<% end %>
+<h2>Sign Up</h2>
+
+<%= form_for(@account) do |account| %>
+	<%= account.error_messages %>
+	<p>
+		<%= account.label :name %><br>
+		<%= account.text_field :name %>
+	</p>
+
+	<p>
+		<%= account.label :subdomain %><br>
+		<%= account.text_field :subdomain %>
+	</p>
+
+	<%= account.fields_for :owner do |owner| %>
+		<%= render "mtwarden/account/users/form", :user => owner %>
+	<% end %>
+
+	<%= account.submit %>
+<% end %>

data/app/views/mtwarden/dashboard/index.html.erb

@@ -1 +1 @@
-<%= link_to "Account Sign Up", sign_up_path %>
+<%= link_to "Account Sign Up", sign_up_path %>

data/app/views/mtwarden/shared/_login.html.erb

@@ -1,7 +1,7 @@
-<% if user_signed_in? %>
-	Signed in as <%= current_user.email %>
-	<% if owner? %>
-		&middot;
-		<%= link_to "Edit Account", account_path %>
-	<% end %>
-<% end %>
+<% if user_signed_in? %>
+	Signed in as <%= current_user.email %>
+	<% if owner? %>
+		&middot;
+		<%= link_to "Edit Account", account_path %>
+	<% end %>
+<% end %>

data/config/initializers/warden/strategies/password.rb

@@ -1,18 +1,18 @@
-Warden::Strategies.add(:password) do
-
-  def subdomain
-    ActionDispatch::Http::URL.extract_subdomains(request.host, 1)
-  end
-
-  def valid?
-    subdomain.present? && params["user"]
-  end
-
-  def authenticate!
-    return fail! unless account = Mtwarden::Account.find_by(subdomain: subdomain)
-    return fail! unless user = account.users.find_by(email: params["user"]["email"])
-    return fail! unless user.authenticate(params["user"]["password"])
-    success! user
-  end
-
-end
+Warden::Strategies.add(:password) do
+
+  def subdomain
+    ActionDispatch::Http::URL.extract_subdomains(request.host, 1)
+  end
+
+  def valid?
+    subdomain.present? && params["user"]
+  end
+
+  def authenticate!
+    return fail! unless account = Mtwarden::Account.find_by(subdomain: subdomain)
+    return fail! unless user = account.users.find_by(email: params["user"]["email"])
+    return fail! unless user.authenticate(params["user"]["password"])
+    success! user
+  end
+
+end

data/config/routes.rb

@@ -1,30 +1,30 @@
-require "mtwarden/constraints/subdomain_required"
-
-Mtwarden::Engine.routes.draw do
-
-  constraints(Mtwarden::Constraints::SubdomainRequired) do
-    scope :module => "account" do
-      root :to => "dashboard#index", :as => :account_root
-      get "/sign_in", :to => "sessions#new", :as => :sign_in
-      post "/sign_in", :to => "sessions#create", :as => :sessions
-      get "/sign_up", :to => "users#new", :as => :user_sign_up
-      post "/sign_up", :to => "users#create", :as => :do_user_sign_up
-      get "/account", :to => "accounts#edit", :as => :edit_account
-      patch "/account", :to => "accounts#update"
-      get "/account/plan/:plan_id",
-      :to => "accounts#plan",
-      :as => :plan_account
-      get "/account/subscribe",
-      :to => "accounts#subscribe",
-      :as => :subscribe_account
-      post "/account/confirm_plan",
-      :to => "accounts#confirm_plan",
-      :as => :confirm_plan_account
-    end
-  end
-
-  root "dashboard#index"
-  get "/sign_up", :to => "accounts#new", :as => :sign_up
-  post "/accounts", :to => "accounts#create", :as => :accounts
-
-end
+require "mtwarden/constraints/subdomain_required"
+
+Mtwarden::Engine.routes.draw do
+
+  constraints(Mtwarden::Constraints::SubdomainRequired) do
+    scope :module => "account" do
+      root :to => "dashboard#index", :as => :account_root
+      get "/sign_in", :to => "sessions#new", :as => :sign_in
+      post "/sign_in", :to => "sessions#create", :as => :sessions
+      get "/sign_up", :to => "users#new", :as => :user_sign_up
+      post "/sign_up", :to => "users#create", :as => :do_user_sign_up
+      get "/account", :to => "accounts#edit", :as => :edit_account
+      patch "/account", :to => "accounts#update"
+      get "/account/plan/:plan_id",
+      :to => "accounts#plan",
+      :as => :plan_account
+      get "/account/subscribe",
+      :to => "accounts#subscribe",
+      :as => :subscribe_account
+      post "/account/confirm_plan",
+      :to => "accounts#confirm_plan",
+      :as => :confirm_plan_account
+    end
+  end
+
+  root "dashboard#index"
+  get "/sign_up", :to => "accounts#new", :as => :sign_up
+  post "/accounts", :to => "accounts#create", :as => :accounts
+
+end

data/db/migrate/20140621030847_create_mtwarden_accounts.rb

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

data/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb

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

data/db/migrate/20140621114231_create_mtwarden_users.rb

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

data/db/migrate/20140621114308_create_mtwarden_members.rb

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

data/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb

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

data/db/migrate/20140829231923_create_mtwarden_plans.rb

@@ -1,13 +1,13 @@
-class CreateMtwardenPlans < ActiveRecord::Migration[5.0]
-  def change
-  create_table :mtwarden_plans do |t|
-
-      t.string :name
-      t.float :price
-      t.string :braintree_id
-
-      t.timestamps
-
-    end
-  end
-end
+class CreateMtwardenPlans < ActiveRecord::Migration[5.0]
+  def change
+  create_table :mtwarden_plans do |t|
+
+      t.string :name
+      t.float :price
+      t.string :braintree_id
+
+      t.timestamps
+
+    end
+  end
+end