active_registration 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d91f57419970f798df8aadc2d7fcebf139fdd1f9d215f845389ecc744cbfd0f
-  data.tar.gz: 9c4149954450c9fd6967e9823e3eed6574e7ae2940da157b870db56cf0f450ac
+  metadata.gz: fe9df96cb6561a6aeee5ea549eae7a609c6f968e3a79bec6181a608e2a65a955
+  data.tar.gz: 90c93712d5c449df39fee21ddcd97761eac195e63a8628e5dbccef2fca337574
 SHA512:
-  metadata.gz: 9928062ea9157a3f3232ea575b2fd48cd3d4312b216c974e491964a8753ead2cd2b478a82e39ea786e7307330bcb6e46d188a813b12008236b48da333057f10a
-  data.tar.gz: e7bbe018225831ef611ac27bbf42b8536f66dc31d734dee4581af927bac0e17bc46ad89baed73164c380d5ad1e167f2e9e87f627425c6e9105e005726e986d2a
+  metadata.gz: d643d3a49acbf71a9f6afae0ee7b40edb7fa32c846becce57477bb110e5d0832bab0ae50db4902f8b6249c8503f6c80c36e024b1b4c2db1c10f09661f9a3f511
+  data.tar.gz: bf5abfef36157166fd38571b609f3f0b7bb0fdfac7465e29b9e2ca73f555ba18237c15bec02eb79d611e63b9265031b7e205a02065a11a285e15ddae21da694d

data/README.md

@@ -34,11 +34,49 @@ Run the installation generator:
 ```bash
 rails generate active_registration:install
 ```
+This generator will:
+- Add necessary fields to your User model (confirmation_token, confirmation_sent_at, confirmed_at)
+- Create a RegistrationsController for handling user registration
+- Generate view templates for registration forms
+- Add routes for registration and confirmation
+- Create a ConfirmationMailer and associated views
+- Inject necessary methods into your User model
 
 Apply database migrations:
 ```bash
 rails db:migrate
 ```
+## What the Generator Does
+
+The `active_registration:install` generator performs the following actions:
+
+1. **Database Migration**: Adds confirmation-related fields to your users table:
+   - `confirmation_token`: A unique token for email confirmation
+   - `confirmation_sent_at`: When the confirmation email was sent
+   - `confirmed_at`: When the user confirmed their email
+
+2. **Controller Generation**: Creates a RegistrationsController that handles:
+   - New user registration
+   - Email confirmation
+
+3. **View Generation**: Creates view templates for:
+   - Registration form
+   - Confirmation emails
+
+4. **Route Configuration**: Adds routes for registration and confirmation:
+   ```ruby
+   resource :registration, only: [ :new, :create ] do
+     get :confirm, on: :collection
+   end
+   ```
+
+5. **Mailer Generation**: Creates a ConfirmationMailer for sending confirmation emails
+
+6. **User Model Extension**: Adds methods to your User model:
+   - `confirm!`: Confirms a user's email
+   - `confirmed?`: Checks if a user is confirmed
+   - `confirmation_period_valid?`: Checks if the confirmation token is still valid
+   - `generate_confirmation_token`: Generates a secure confirmation token
 
 ## Configuration
 ### Development Environment

data/lib/active_registration/version.rb

@@ -1,3 +1,3 @@
 module ActiveRegistration
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/active_registration.rb

@@ -2,5 +2,4 @@ require "active_registration/version"
 require "active_registration/engine"
 
 module ActiveRegistration
-  autoload :UserExtensions, "active_registration/user_extensions"
 end

data/lib/generators/active_registration/install_generator.rb

@@ -20,8 +20,6 @@ module ActiveRegistration
     end
 
     def add_routes
-      # TODO implement edit and update in the future
-      # resource :registration, only: [:new, :create, :edit, :update] do
       route <<~ROUTE
         resource :registration, only: [ :new, :create ] do
           get :confirm, on: :collection
@@ -34,15 +32,90 @@ module ActiveRegistration
       directory "views/confirmation_mailer", "app/views/confirmation_mailer"
     end
 
-    def inject_user_extension
+    def inject_user_methods
       user_model_path = "app/models/user.rb"
       return unless File.exist?(user_model_path)
 
-      inject_into_file user_model_path, after: "class User < ApplicationRecord\n" do
-        "  include ActiveRegistration::UserExtensions\n"
+      content = File.read(user_model_path)
+
+      if content.include?("validates :email_address, presence: true, uniqueness: true") &&
+         content.include?("def confirm!") &&
+         content.include?("def generate_confirmation_token")
+        say "User model already contains active_registration methods, skipping injection.", :yellow
+        return
       end
+
+      inject_validations_and_hooks(user_model_path)
+      inject_all_methods(user_model_path)
     rescue Errno::ENOENT
-      say "User model not found. Add 'include ActiveRegistration::UserExtensions' to your User model.", :yellow
+      say "User model not found. Please add the registration methods to your User model manually.", :yellow
+    end
+
+    private
+
+    def find_method_end(lines, method_start_index)
+      depth = 1  # We're already inside the method definition
+      (method_start_index + 1...lines.length).each do |i|
+        line = lines[i]
+        depth += 1 if line.match(/^\s*(def|class|module|if|unless|case|begin|do\s*$|do\s*\||while|for)\b/)
+        depth -= 1 if line.match(/^\s*end\s*$/)
+        return i if depth == 0  # Found the matching end for our method
+      end
+      lines.length - 1
+    end
+
+    def inject_all_methods(user_model_path)
+      inject_into_file user_model_path, before: /^end\s*$/ do
+        <<RUBY
+
+  def confirm!
+    update(confirmed_at: Time.current, confirmation_token: nil)
+  end
+
+  def confirmed?
+    confirmed_at.present?
+  end
+
+  def confirmation_period_valid?
+    confirmation_sent_at >= 24.hours.ago
+  end
+
+  private
+
+  def generate_confirmation_token
+    self.confirmation_token = SecureRandom.urlsafe_base64
+    self.confirmation_sent_at = Time.current
+  end
+RUBY
+      end
+    end
+
+    def inject_validations_and_hooks(user_model_path)
+      content = File.read(user_model_path)
+
+      if content.match(/^\s*(validates|before_|after_|around_)/)
+        last_validation_line = content.lines.each_with_index.reverse_each.find do |line, _|
+          line.match(/^\s*(validates|before_|after_|around_)/)
+        end
+
+        if last_validation_line
+          inject_into_file user_model_path, after: last_validation_line[0] do
+            <<RUBY
+  validates :email_address, presence: true, uniqueness: true
+  before_create :generate_confirmation_token
+RUBY
+          end
+          return
+        end
+      end
+
+      inject_into_file user_model_path, after: "class User < ApplicationRecord\n" do
+        <<RUBY
+  validates :email_address, presence: true, uniqueness: true
+  before_create :generate_confirmation_token
+
+RUBY
+      end
     end
   end
 end

data/lib/generators/active_registration/templates/registrations_controller.rb

@@ -1,5 +1,5 @@
 class RegistrationsController < ApplicationController
-  allow_unauthenticated_access
+  allow_unauthenticated_access only: %i[ new create confirm ]
 
   def new
     @user = User.new
@@ -12,7 +12,7 @@ class RegistrationsController < ApplicationController
       redirect_to root_path, notice: "Confirmation email sent!"
     else
       flash[:alert] = @user.errors.full_messages.join(", ")
-      render :new, status: :unprocessable_entity
+      render :new, status: :unprocessable_content
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_registration
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Salanoid
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,7 +36,6 @@ files:
 - Rakefile
 - lib/active_registration.rb
 - lib/active_registration/engine.rb
-- lib/active_registration/user_extensions.rb
 - lib/active_registration/version.rb
 - lib/generators/active_registration/install_generator.rb
 - lib/generators/active_registration/templates/add_active_registration_fields_to_users.rb
@@ -65,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A simple gem that adds generators for sign up Rails Authentication Generator.
 test_files: []

data/lib/active_registration/user_extensions.rb

@@ -1,29 +0,0 @@
-module ActiveRegistration
-  module UserExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      validates :email_address, presence: true, uniqueness: true
-      before_create :generate_confirmation_token
-    end
-
-    def confirm!
-      update(confirmed_at: Time.current, confirmation_token: nil)
-    end
-
-    def confirmed?
-      confirmed_at.present?
-    end
-
-    def confirmation_period_valid?
-      confirmation_sent_at >= 24.hours.ago
-    end
-
-    private
-
-    def generate_confirmation_token
-      self.confirmation_token = SecureRandom.urlsafe_base64
-      self.confirmation_sent_at = Time.current
-    end
-  end
-end