schoolgirl_uniform 0.2.0 → 1.0.1

data/lib/generators/schoolgirl_uniform/templates/finish.html.erb

@@ -1,7 +1,118 @@
-uuid: <%= @record.uuid %>
-<br>
-username: <%= @record.username %>
-<br>
-email: <%= @record.personal_data.email %>
-<br>
-phone: <%= @record.personal_data.phone %>
+<style>
+    body {
+        font-family: Arial, sans-serif;
+        background-color: #f4f4f4;
+        display: flex;
+        justify-content: center;
+        align-items: flex-start;
+        min-height: 100vh;
+        margin: 0;
+        padding: 20px 0;
+    }
+
+    .form-container {
+        background-color: #fff;
+        padding: 30px;
+        border-radius: 8px;
+        box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
+        width: 100%;
+        max-width: 600px;
+        margin-top: 20px;
+        margin-bottom: 20px;
+    }
+    /* Finish Step / Results Styling */
+    .results-display {
+        background-color: #e9f5e9; /* Light green background */
+        border: 1px solid #c8e6c9; /* Greenish border */
+        padding: 25px;
+        border-radius: 6px;
+        line-height: 1.8; /* Better readability for text lines */
+        margin-top: 20px; /* Add some space if it's directly after the form */
+    }
+
+    .results-display h3 {
+        margin-top: 0;
+        color: #2e7d32; /* Darker green for the heading */
+        border-bottom: 1px solid #a5d6a7; /* Lighter green border under heading */
+        padding-bottom: 10px;
+        margin-bottom: 20px;
+    }
+
+    .results-display .result-item {
+        margin-bottom: 12px; /* Space between each result item */
+        font-size: 1.05em; /* Slightly larger font for readability */
+    }
+
+    .results-display .result-item b {
+        color: #333; /* Dark grey for the labels (bold text) */
+        margin-right: 8px; /* Space after the label */
+        display: inline-block; /* Ensures proper spacing and layout */
+        min-width: 120px; /* Optional: aligns values if labels have varying lengths */
+    }
+
+    .results-display hr {
+        border: 0;
+        height: 1px;
+        background-color: #d0e0d0; /* Lighter green/grey for the horizontal rule */
+        margin-top: 20px;
+        margin-bottom: 20px;
+    }
+</style>
+<div class="form-container">
+  <div class="results-display">
+    <h3>Registration Complete!</h3>
+    <div class="result-item">
+      <b>ID:</b> <%= @record.id %>
+    </div>
+
+    <div class="result-item">
+      <b>Username:</b> <%= @record.username %>
+    </div>
+    <hr>
+
+    <div class="result-item">
+      <b>Date of Birth:</b> <%= @record.personal_detail&.date_of_birth %>
+    </div>
+
+    <div class="result-item">
+      <b>Gender:</b> <%= @record.personal_detail&.gender %>
+    </div>
+
+    <div class="result-item">
+      <b>Favourite Color:</b> <%= @record.personal_detail&.favourite_color %>
+    </div>
+
+    <div class="result-item">
+      <b>Device Type:</b> <%= @record.personal_detail&.device_type %>
+    </div>
+    <hr>
+
+    <div class="result-item">
+      <b>Email:</b> <%= @record.contact_info&.email %>
+    </div>
+
+    <div class="result-item">
+      <b>Phone Number:</b> <%= @record.contact_info&.phone_number %>
+    </div>
+
+    <div class="result-item">
+      <b>Country:</b> <%= @record.contact_info&.country %>
+    </div>
+
+    <div class="result-item">
+      <b>City:</b> <%= @record.contact_info&.city %>
+    </div>
+
+    <div class="result-item">
+      <b>Address Line 1:</b> <%= @record.contact_info&.address_field_1 %>
+    </div>
+
+    <div class="result-item">
+      <b>Address Line 2:</b> <%= @record.contact_info&.address_field_2 %>
+    </div>
+
+    <div class="result-item">
+      <b>Zip Code:</b> <%= @record.contact_info&.zip_code %>
+    </div>
+  </div>
+</div>

data/lib/generators/schoolgirl_uniform/templates/form_errors.html.erb

@@ -1,16 +1,7 @@
-<style>
-    .schoolgirl-uniform-errors {
-        border: 1px solid red;
-    }
-    .schoolgirl-uniform-errors span {
-        color: red;
-    }
-</style>
-
-<% if @form.errors.any? %>
+<% if form.errors.any? %>
   <div class="schoolgirl-uniform-errors">
     <ul>
-      <% @form.errors.full_messages.each do |message|%>
+      <% form.errors.full_messages.each do |message|%>
         <li>
           <span><%= message %> </span>
         </li>

data/lib/generators/schoolgirl_uniform/templates/forms/template_form.rb.erb

@@ -1,44 +1,87 @@
-class <%= class_name %>Form < SchoolgirlUniform::BaseForm
-  attribute :username, String
-  attribute :password, String
-  attribute :email, String
-  attribute :phone, String
+class <%= class_name %>Form
+  include SchoolgirlUniform::Uniformable
 
-  validates :username, presence: true, length: 3..10, if: proc { on_step('first') }
-  validate :custom_username_validation,               if: proc { on_step('first') }
-  validates :password, length: { minimum: 3 },        if: proc { on_step('first') }
+  attribute :username, :string
+  attribute :password, :string
 
-  validates :email, presence: true,                   if: proc { on_step('second') }
-  validate :custom_email_validation,                  if: proc { on_step('second') }
+  attribute :date_of_birth, :date
+  attribute :gender, :string
+  attribute :favourite_color, :string
+  attribute :device_type, :string
 
-  validates :phone, presence: true,                   if: proc { on_step('third') }
-  validate :custom_phone_validation,                  if: proc { on_step('third') }
+  attribute :email, :string
+  attribute :phone_number, :string
+  attribute :country, :string
+  attribute :city, :string
+  attribute :address_field_1, :string
+  attribute :address_field_2, :string
+  attribute :zip_code, :string
+
+  steps %w[first second third]
+
+  def self.steps_details
+    {
+      first: 'Credentials',
+      second: 'Personal Details',
+      third: 'Contact Information'
+    }
+  end
+
+  attr_reader :identifier
+
+  with_options if: :first? do |step|
+    step.validates :username, presence: true, length: 3..10
+    step.validate :custom_username_validation
+    step.validates :password, length: { minimum: 3 }
+  end
+
+  with_options if: :second? do |step|
+    step.validates :date_of_birth, presence: true
+    step.validate :custom_date_of_birth_validation
+  end
+
+  with_options if: :third? do |step|
+    step.validates :email, presence: true
+    step.validate :custom_email_validation
+
+    step.validates :phone_number, presence: true
+    step.validate :custom_phone_validation
+  end
 
   def custom_username_validation
+    errors.add(:username, "#{username} is already taken, enter uniq username") if User.where(username: username).exists?
     errors.add(:username, 'cannot contain "@"') if username.include?('@')
     errors.add(:username, 'cannot contain "#"') if username.include?('#')
     errors.add(:username, 'cannot contain "?"') if username.include?('?')
   end
 
+  def custom_date_of_birth_validation
+    begin
+      date = Date.parse(date_of_birth.to_s)
+      if date > Date.today - 18.years
+        errors.add(:date_of_birth, 'You need to be 18 year old or older to participate in this survey.')
+      end
+    rescue => e
+      errors.add(:date_of_birth, 'Please enter a valid date in the format: DD.MM.YYYY')
+    end
+  end
+
   def custom_email_validation
-    errors.add(:email, 'should contain "@"') if email.exclude?('@')
+    errors.add(:email, 'should contain "@"')      if email.exclude?('@')
     errors.add(:email, 'should not contain ".."') if email.include?('..')
   end
 
   def custom_phone_validation
-    errors.add(:phone, 'should be max 14 symbols') if phone.size > 14
+    errors.add(:phone_number, 'should be min 3 symbols') if phone_number.size < 3
+    errors.add(:phone_number, 'should be max 14 symbols') if phone_number.size > 14
   end
 
-  def self.steps
-    %w[first second third]
-  end
 
   def save!
-    ActiveRecord::Base.transaction do
-      user.save!(validate: false)
-      personal_data.save!(validate: false)
-    end
-    @identifier = user.reload.uuid
+    user.save!(validate: false)
+    personal_detail.save!(validate: false)
+    contact_info.save!(validate: false)
+    @identifier = user.id
   end
 
   private
@@ -47,7 +90,24 @@ class <%= class_name %>Form < SchoolgirlUniform::BaseForm
     @user ||= User.new(username: username, password: password)
   end
 
-  def personal_data
-    user.build_personal_data(email: email, phone: phone)
+  def personal_detail
+    user.build_personal_detail(
+      date_of_birth: date_of_birth,
+      gender: gender,
+      favourite_color: favourite_color,
+      device_type: device_type
+    )
+  end
+
+  def contact_info
+    user.build_contact_info(
+      email: email,
+      phone_number: phone_number,
+      country: country,
+      city: city,
+      address_field_1: address_field_1,
+      address_field_2: address_field_2,
+      zip_code: zip_code
+    )
   end
 end

data/lib/generators/schoolgirl_uniform/templates/show.html.erb

@@ -1,27 +1,203 @@
 <style>
+    body {
+        font-family: Arial, sans-serif;
+        background-color: #f4f4f4;
+        display: flex;
+        justify-content: center;
+        align-items: flex-start;
+        min-height: 100vh;
+        margin: 0;
+        padding: 20px 0;
+    }
+
+    .form-container {
+        background-color: #fff;
+        padding: 30px;
+        border-radius: 8px;
+        box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
+        width: 100%;
+        max-width: 600px;
+        margin-top: 20px;
+        margin-bottom: 20px;
+    }
+
+    .schoolgirl-uniform-step-wizard {
+        display: flex;
+        justify-content: space-around;
+        margin-bottom: 30px;
+        padding-bottom: 15px;
+        border-bottom: 1px solid #e0e0e0;
+    }
+
+    .schoolgirl-uniform-step-wizard .milestone {
+        padding: 8px 15px;
+        border: 1px solid #ccc;
+        border-radius: 20px;
+        background-color: #f9f9f9;
+        color: #555;
+        font-size: 0.9em;
+        text-align: center;
+        flex-grow: 1;
+        margin: 0 5px;
+    }
+
+    .schoolgirl-uniform-step-wizard .milestone.active {
+        background-color: #58aaca;
+        color: white;
+        border-color: #276891;
+        border-style: dashed;
+        border-width: 2px;
+    }
+
+    .schoolgirl-uniform-step-wizard .milestone.passed {
+        background-color: #4CAF50;
+        color: white;
+        border-color: #388E3C;
+    }
+
+    .schoolgirl-uniform-step-wizard .milestone.completed {
+        background-color: #D4EDDA;
+        color: #155724;
+        border-color: #C3E6CB;
+    }
+
+    .multistep-form .form-step-content {
+        border: 1px solid #ddd;
+        padding: 25px;
+        border-radius: 6px;
+        margin-bottom: 25px;
+        background-color: #fdfdfd;
+    }
+
+    .multistep-form .form-group {
+        margin-bottom: 20px;
+    }
+
+    .multistep-form .form-group label {
+        display: block;
+        margin-bottom: 8px;
+        font-weight: bold;
+        color: #333;
+        font-size: 0.95em;
+    }
+
+    .multistep-form .form-group input[type="text"],
+    .multistep-form .form-group input[type="password"],
+    .multistep-form .form-group input[type="date"],
+    .multistep-form .form-group input[type="email"],
+    .multistep-form .form-group input[type="tel"],
+    .multistep-form .form-group select {
+        width: 100%;
+        padding: 12px;
+        border: 1px solid #ccc;
+        border-radius: 4px;
+        box-sizing: border-box;
+        font-size: 1em;
+        transition: border-color 0.3s ease;
+    }
+
+    .multistep-form .form-group input[type="text"]:focus,
+    .multistep-form .form-group input[type="password"]:focus,
+    .multistep-form .form-group input[type="date"]:focus,
+    .multistep-form .form-group input[type="email"]:focus,
+    .multistep-form .form-group input[type="tel"]:focus,
+    .multistep-form .form-group select:focus {
+        border-color: #4CAF50;
+        outline: none;
+        box-shadow: 0 0 5px rgba(76, 175, 80, 0.5);
+    }
+
     .field_with_errors {
         display: inline-block;
+        width: 100%;
+    }
+    .field_with_errors input,
+    .field_with_errors select {
+        border: 1px solid red !important;
+    }
+
+    .schoolgirl-uniform-errors {
+        border: 1px solid red;
+        padding: 10px;
+        margin-bottom: 20px;
+        border-radius: 4px;
+        background-color: #ffebeb;
+    }
+    .schoolgirl-uniform-errors ul {
+        list-style-type: none;
+        padding-left: 0;
+        margin: 0;
+    }
+    .schoolgirl-uniform-errors li {
+        margin-bottom: 5px;
+    }
+    .schoolgirl-uniform-errors span {
+        color: red;
+    }
+
+    .form-navigation {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 25px;
+        padding-top: 20px;
+        border-top: 1px solid #e0e0e0;
+    }
+
+    .form-navigation a,
+    .form-navigation input[type="submit"] {
+        padding: 12px 25px;
+        border: none;
+        border-radius: 5px;
+        text-decoration: none;
+        font-size: 1em;
+        cursor: pointer;
+        transition: background-color 0.3s ease, box-shadow 0.3s ease;
+    }
+
+    .form-navigation a {
+        background-color: #6c757d;
+        color: white;
+    }
+    .form-navigation a:hover {
+        background-color: #5a6268;
+        box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+    }
+
+    .form-navigation input[type="submit"] {
+        background-color: #007bff;
+        color: white;
     }
-    .field_with_errors input {
-        border: 1px solid red
+    .form-navigation input[type="submit"]:hover {
+        background-color: #0056b3;
+        box-shadow: 0 2px 5px rgba(0,0,0,0.1);
     }
 </style>
+<div class="form-container">
+
+  <%= render 'wizard', form: @form %>
+
+  <%= form_for @form, as: "#{controller_name}_form".to_sym, url: form_carrier.current_step_path, html: { id: "#{controller_name}_form", class: 'multistep-form' } do |f| %>
+    <%= f.hidden_field :step, value: @form.current_step %>
+
+    <%= render "form_errors", form: @form %>
+
+    <div class="form-step-content">
+      <%= render "#{ controller_name }/steps/#{@form.current_step.underscore}", form: f %>
+    </div>
+
+    <div class="form-navigation">
+      <% if !@form.first_step? %>
+        <%= link_to 'Back', form_carrier.previous_step_path %>
+      <% else %>
+        <span>&nbsp;</span>
+      <% end %>
 
-<%= render 'wizard', form: @form %>
-<%= form_for @form, as: "#{controller_name}_form".to_sym, url: form_carrier.current_step_path, html: { id: "#{controller_name}_form", class: 'multistep-form' } do |form| %>
-  <%= form.hidden_field :step, value: @form.current_step %>
-
-  <%= render "form_errors", form: form %>
-  <%= render "#{ controller_name }/steps/#{@form.current_step}", form: form %>
-
-  <div class="tc">
-    <% if !@form.first_step? %>
-      <%= link_to 'back', form_carrier.previous_step_path %>
-    <% end %>
-    <% if @form.last_step? %>
-      <%= form.submit 'submit' %>
-    <% else %>
-      <%= form.submit 'next' %>
-    <% end %>
-  </div>
-<% end %>
+      <% if @form.last_step? %>
+        <%= f.submit 'Submit Details' %>
+      <% else %>
+        <%= f.submit 'Next Step' %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/lib/generators/schoolgirl_uniform/templates/steps/first.html.erb

@@ -1,5 +1,9 @@
-<%= form.label :username %>
-<%= form.text_field :username %>
-<br>
-<%= form.label :password %>
-<%= form.text_field :password %>
+<div class="form-group">
+  <%= form.label :username %>
+  <%= form.text_field :username %>
+</div>
+
+<div class="form-group">
+  <%= form.label :password %>
+  <%= form.password_field :password %>
+</div>

data/lib/generators/schoolgirl_uniform/templates/steps/second.html.erb

@@ -1,2 +1,19 @@
-<%= form.label :email %>
-<%= form.text_field :email %>
+<div class="form-group">
+  <%= form.label :date_of_birth %>
+  <%= form.date_field :date_of_birth %>
+</div>
+
+<div class="form-group">
+  <%= form.label :gender %>
+  <%= form.select :gender, [:male, :female, :else], prompt: 'Select Gender' %>
+</div>
+
+<div class="form-group">
+  <%= form.label :favourite_color %>
+  <%= form.select :favourite_color, [:red, :green , :blue], prompt: 'Select Color' %>
+</div>
+
+<div class="form-group">
+  <%= form.label :device_type %>
+  <%= form.select :device_type, [:android, :ios, :other], prompt: 'Select Device' %>
+</div>

data/lib/generators/schoolgirl_uniform/templates/steps/third.html.erb

@@ -1,2 +1,34 @@
-<%= form.label :phone %>
-<%= form.text_field :phone %>
+<div class="form-group">
+  <%= form.label :email %>
+  <%= form.email_field :email %>
+</div>
+
+<div class="form-group">
+  <%= form.label :phone_number %>
+  <%= form.telephone_field :phone_number %>
+</div>
+
+<div class="form-group">
+  <%= form.label :country %>
+  <%= form.text_field :country %>
+</div>
+
+<div class="form-group">
+  <%= form.label :city %>
+  <%= form.text_field :city %>
+</div>
+
+<div class="form-group">
+  <%= form.label :address_field_1 %>
+  <%= form.text_field :address_field_1 %>
+</div>
+
+<div class="form-group">
+  <%= form.label :address_field_2 %>
+  <%= form.text_field :address_field_2 %>
+</div>
+
+<div class="form-group">
+  <%= form.label :zip_code %>
+  <%= form.text_field :zip_code %>
+</div>

data/lib/generators/schoolgirl_uniform/templates/wizard.html.erb

@@ -1,21 +1,7 @@
-<style>
-    .schoolgirl-uniform-step-wizard {
-        margin: 10px 25%;
-    }
-    .milestone {
-        display: inline-block;
-    }
-    div.active {
-        background-color: greenyellow;
-    }
-</style>
-
 <div class="schoolgirl-uniform-step-wizard">
   <% form.steps.each_with_index do |step, index| %>
-    <div class="<%=  'active' if form.current_step_index >= index %> milestone">
-        <span>
-          <%= step %>
-        </span>
+    <div class="milestone <%= 'passed' if form.current_step_index > index %> <%= 'active' if form.current_step_index == index %>">
+      <span><%= form.steps_details[step.to_sym] || step %></span>
     </div>
   <% end %>
 </div>

data/lib/schoolgirl_uniform/version.rb

@@ -1,3 +1,3 @@
 module SchoolgirlUniform
-  VERSION = "0.2.0"
+  VERSION = "1.0.1"
 end

data/lib/schoolgirl_uniform.rb

@@ -1,14 +1,6 @@
-require 'virtus'
 require '../schoolgirl_uniform/app/carriers/carrier'
 require '../schoolgirl_uniform/app/forms/uniformable'
-require '../schoolgirl_uniform/app/forms/base_form'
 require '../schoolgirl_uniform/app/controllers/base_controller'
 require 'schoolgirl_uniform/engine'
 
-module SchoolgirlUniform
-  pp 111
-  # autoload :Uniformable, 'schoolgirl_uniform/forms/uniformable'
-  # autoload :BaseForm, 'schoolgirl_uniform/forms/base_form'
-  # autoload :Carrier, 'schoolgirl_uniform/carriers/carrier'
-  # autoload :BaseController, 'schoolgirl_uniform/controllers/base_controller'
-end
+module SchoolgirlUniform; end

data/schoolgirl_uniform.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
                           Supports selectable per step validations without data persistence into db.}
   spec.homepage      = "https://github.com/vergilet/schoolgirl_uniform"
   spec.license       = "MIT"
+  spec.required_ruby_version = '>= 2.7.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -33,10 +34,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activemodel', '~> 6.0'
+  spec.add_runtime_dependency 'activemodel', ['>= 5.2', '< 9.0']
 
-  spec.add_dependency "bundler", '~> 2.0'
-  spec.add_dependency "rake", '~> 13.0'
-  spec.add_dependency "rspec", '~> 3.5'
-  spec.add_dependency "virtus", '~> 2.0'
+  spec.add_development_dependency "bundler", '~> 2.0'
+  spec.add_development_dependency "rake", '~> 13.0'
+  spec.add_development_dependency "rspec", '~> 3.5'
 end