wahanegi · rogergraves · Jan 24, 2025 · Jan 14, 2025 · Jan 14, 2025 · Jan 14, 2025
diff --git a/.rspec b/.rspec
@@ -0,0 +1,2 @@
+--require spec_helper
+--format documentation
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,6 +1,7 @@
 # Add rules from rubocop-rails
 require:
   - rubocop-rails
+  - rubocop-rspec_rails
 
 # Overwrite or add rules to create your own house style
 #
@@ -30,4 +31,12 @@ Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false
 
 Bundler/OrderedGems:
-  Enabled: true
+  Enabled: true
+
+Metrics/MethodLength:
+  Exclude:
+    - db/migrate/*.rb
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*
diff --git a/Gemfile b/Gemfile
@@ -67,6 +67,7 @@ group :development, :test do
   # Rubocop Ruby on Rails Style
   gem "rubocop"
   gem "rubocop-rails", require: false
+  gem "rubocop-rspec_rails", require: false
 
   # Opens sent emails in the browser for easy debugging during development
   gem "letter_opener"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -360,6 +360,11 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.3.0)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sassc (2.4.0)
@@ -460,6 +465,7 @@ DEPENDENCIES
   rspec-rails
   rubocop
   rubocop-rails
+  rubocop-rspec_rails
   sassc (~> 2.4)
   shoulda-matchers
   solid_cable

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,4 +1,3 @@
 class ApplicationController < ActionController::Base
-  # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
   allow_browser versions: :modern
 end
diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb
@@ -0,0 +1,16 @@
+class AdminUser < ApplicationRecord
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
+  devise :database_authenticatable, :recoverable,
+         :rememberable, :validatable
+
+  PASSWORD_SYMBOL_FORMAT = /\A(?=.*[^\w\s])[^\s]*\z/
+  PASSWORD_REPEATED_CHAR_FORMAT = /\A(?!.*(.)\1\1).*\z/
+
+  validates :name, presence: true
+  validates :email, presence: true, uniqueness: true,
+                    format: { with: URI::MailTo::EMAIL_REGEXP, message: "must be a valid email format" }
+  validates :password, length: { minimum: 8, maximum: 128 },
+                       format: { with: PASSWORD_SYMBOL_FORMAT, message: "must contain at least one symbol" }
+  validates :password, format: { with: PASSWORD_REPEATED_CHAR_FORMAT, message: "must not contain repeated characters" }
+end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -0,0 +1,14 @@
+class User < ApplicationRecord
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
+  devise :database_authenticatable, :recoverable, :rememberable, :validatable
+  PASSWORD_SYMBOL_FORMAT = /\A(?=.*[^\w\s])[^\s]*\z/
+  PASSWORD_REPEATED_CHAR_FORMAT = /\A(?!.*(.)\1\1).*\z/
+
+  validates :name, presence: true
+  validates :email, presence: true, uniqueness: true,
+                    format: { with: URI::MailTo::EMAIL_REGEXP, message: "must be a valid email format" }
+  validates :password, length: { minimum: 8, maximum: 128 },
+                       format: { with: PASSWORD_SYMBOL_FORMAT, message: "must contain at least one symbol" }
+  validates :password, format: { with: PASSWORD_REPEATED_CHAR_FORMAT, message: "must not contain repeated characters" }
+end
diff --git a/app/views/home/app.html.erb b/app/views/home/app.html.erb
@@ -1 +1 @@
-Hello Clever Calculator!
+<p>Hello Clever Calculator!</p>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -21,9 +21,14 @@
     <%= stylesheet_link_tag :app, "data-turbo-track": "reload" %>
     <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
+
+    <%#= TODO: Delete this styles link when the markup for Clever Calculator is ready %>
+    <%= stylesheet_link_tag "http://cdn.simplecss.org/simple.css" %>
   </head>
 
   <body>
+    <p class="notice"><%= notice %></p>
+    <p class="alert"><%= alert %></p>
     <%= yield %>
   </body>
 </html>
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -69,4 +69,6 @@
 
   # Apply autocorrection by RuboCop to files generated by `bin/rails generate`.
   # config.generators.apply_rubocop_autocorrect_after_generate!
+
+  config.secret_key_base = ENV["DEVISE_SECRET_KEY"]
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -50,4 +50,6 @@
 
   # Raise error when a before_action's only/except options reference missing actions.
   config.action_controller.raise_on_missing_callback_actions = true
+
+  config.secret_key_base = ENV["DEVISE_SECRET_KEY"]
 end
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Hello Clever Calculator!
		<p>Hello Clever Calculator!</p>