webring-rails 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 447748a2ca051ec5cfdbdb2939c09a30c8b57e2a47fff7aabd8f32cea100cc0c
-  data.tar.gz: 6644675f77cd307363543cc56b183152e4a42adb1121844834da943e430ba993
+  metadata.gz: fab197d616f0b7c93d8689e4873d66fc86c186af7401dbd7237ba00cfeef5dcf
+  data.tar.gz: 9770538896f190f67b28d796b3ec58618cedb4a763f42833d610253754b8ce34
 SHA512:
-  metadata.gz: a2b3855e306305947af1fc114b30005e8ed551f070f7cacd67d5719f9517b915fcbe6a3bf266f4acf187c6345f636f513a6ee0a6ebaea5ea8d1b4d8a20c40ac5
-  data.tar.gz: 771bdf593b8310ae9a0c18b957ed3f6f896e26b7277b85da26e36bd03c7f86bcb736430a73df8c45f039150eb8dfd7f3616b8b0c1427706fd7ebfd50238c216c
+  metadata.gz: a5827a69ce17c27f9f3ecdfb7c5bcf295e49dd2a2b3466698cc51287c77d888df2de53d6ac4eaa0b69818fb1528161a6ad13973339c17f20f0819ca430258181
+  data.tar.gz: 62e1d083641d38151c2787c992cccbc652ee090fb6075462f38ccfab3bce64c8dd5aa7a21710b2ddde676fedabdc4ff0b29bf7efeae7819271406df32aebfd84

data/app/controllers/webring/members_controller.rb

@@ -31,9 +31,9 @@ module Webring
     # PATCH/PUT /webring/members/1
     def update
       if member.update(member_params)
-        redirect_to admin_panel_member_path(member), notice: 'Member was successfully updated.'
+        update_success_response
       else
-        render :edit, status: :unprocessable_entity
+        update_error_response
       end
     end
 
@@ -46,6 +46,20 @@ module Webring
 
     private
 
+    def update_success_response
+      respond_to do |format|
+        format.html { redirect_to admin_panel_member_path(member), notice: 'Member was successfully updated.' }
+        format.json { head :ok }
+      end
+    end
+
+    def update_error_response
+      respond_to do |format|
+        format.html { render :edit, status: :unprocessable_entity }
+        format.json { render json: { status: 'error', errors: member.errors }, status: :unprocessable_entity }
+      end
+    end
+
     def members
       @members ||= Member.all.order(created_at: :desc)
     end
@@ -55,7 +69,7 @@ module Webring
     end
 
     def member_params
-      params.require(:member).permit(:name, :url, :description)
+      params.require(:member).permit(:name, :url, :description, :status)
     end
   end
 end

data/app/controllers/webring/navigation_controller.rb

@@ -35,7 +35,7 @@ module Webring
     end
 
     def find_member
-      @member = Webring::Member.find_by(uid: permitted_params[:source_member_uid])
+      @member = Webring::Member.active.find_by(uid: permitted_params[:source_member_uid])
       return if @member
 
       render_member_not_found
@@ -43,13 +43,13 @@ module Webring
 
     def check_member_exists
       member_uid = permitted_params[:source_member_uid]
-      return unless member_uid.present? && !Webring::Member.exists?(uid: member_uid)
+      return unless member_uid.present? && !Webring::Member.active.exists?(uid: member_uid)
 
       render_member_not_found
     end
 
     def ensure_members_exist
-      return if Webring::Member.exists?
+      return if Webring::Member.active.exists?
 
       render plain: 'No members in the webring', status: :not_found
     end

data/app/models/concerns/webring/navigation.rb

@@ -4,55 +4,57 @@ module Webring
     # Find the next member in the webring after the current one
     # If current member is the last, return the first member (ring concept)
     def find_next(source_member_uid)
-      source_member = find_by(uid: source_member_uid)
-      return first_member_by_creation unless source_member
+      source_member = active.find_by(uid: source_member_uid)
+      return first_active_member_by_creation unless source_member
 
-      find_next_member(source_member) || first_member_by_creation
+      find_next_active_member(source_member) || first_active_member_by_creation
     end
 
     # Find the previous member in the webring before the current one
     # If current member is the first, return the last member (ring concept)
     def find_previous(source_member_uid)
-      source_member = find_by(uid: source_member_uid)
-      return last_member_by_creation unless source_member
+      source_member = active.find_by(uid: source_member_uid)
+      return last_active_member_by_creation unless source_member
 
-      find_previous_member(source_member) || last_member_by_creation
+      find_previous_active_member(source_member) || last_active_member_by_creation
     end
 
     # Find a random member, excluding the current one if provided
     # If current member is the only one, return it
     def find_random(source_member_uid: nil)
-      return order('RANDOM()').first if source_member_uid.blank?
+      return active.order('RANDOM()').first if source_member_uid.blank?
 
       # Use exists? check to avoid loading records when not needed
-      excluded_scope = where.not(uid: source_member_uid)
+      excluded_scope = active.where.not(uid: source_member_uid)
 
       if excluded_scope.exists?
         excluded_scope.order('RANDOM()').first
       else
-        # if only one member exists (the current one), return it
-        find_by(uid: source_member_uid)
+        # if only one active member exists (the current one), return it
+        active.find_by(uid: source_member_uid)
       end
     end
 
     private
 
-    def first_member_by_creation
-      order(created_at: :asc).first
+    def first_active_member_by_creation
+      active.order(created_at: :asc).first
     end
 
-    def last_member_by_creation
-      order(created_at: :desc).first
+    def last_active_member_by_creation
+      active.order(created_at: :desc).first
     end
 
-    def find_next_member(source_member)
-      where('created_at > ?', source_member.created_at)
+    def find_next_active_member(source_member)
+      active
+        .where('created_at > ?', source_member.created_at)
         .order(created_at: :asc)
         .first
     end
 
-    def find_previous_member(source_member)
-      where('created_at < ?', source_member.created_at)
+    def find_previous_active_member(source_member)
+      active
+        .where('created_at < ?', source_member.created_at)
         .order(created_at: :desc)
         .first
     end

data/app/models/webring/member.rb

@@ -4,6 +4,9 @@ module Webring
 
     UID_LENGTH = 16 # 32-character hex string
 
+    # :active?, :disabled? -- :active!, :disabled!
+    enum :status, { active: 0, disabled: 1 }
+
     self.filter_attributes += %i[uid]
 
     validates :url, presence: true, uniqueness: true

data/lib/generators/webring/member/templates/migration.rb

@@ -5,6 +5,7 @@ class CreateWebringMembers < ActiveRecord::Migration<%= "[#{Rails::VERSION::MAJO
       t.string :name, null: false
       t.string :url, null: false
       t.text :description, null: false
+      t.integer :status, null: false, default: 0
 
       t.index :uid, unique: true
       t.index :name, unique: true

data/lib/generators/webring/member/templates/model.rb

@@ -4,6 +4,9 @@ module Webring
 
     UID_LENGTH = 16 # 32-character hex string
 
+    # :active?, :disabled? -- :active!, :disabled!
+    enum :status, { active: 0, disabled: 1 }
+
     self.filter_attributes += %i[uid]
 
     validates :url, presence: true, uniqueness: true

data/lib/generators/webring/navigation_controller/templates/navigation_controller.rb

@@ -35,7 +35,7 @@ module Webring
     end
 
     def find_member
-      @member = Webring::Member.find_by(uid: permitted_params[:source_member_uid])
+      @member = Webring::Member.active.find_by(uid: permitted_params[:source_member_uid])
       return if @member
 
       render_member_not_found
@@ -43,13 +43,13 @@ module Webring
 
     def check_member_exists
       member_uid = permitted_params[:source_member_uid]
-      return unless member_uid.present? && !Webring::Member.exists?(uid: member_uid)
+      return unless member_uid.present? && !Webring::Member.active.exists?(uid: member_uid)
 
       render_member_not_found
     end
 
     def ensure_members_exist
-      return if Webring::Member.exists?
+      return if Webring::Member.active.exists?
 
       render plain: 'No members in the webring', status: :not_found
     end
@@ -57,5 +57,12 @@ module Webring
     def render_member_not_found
       render plain: 'Member not found', status: :not_found
     end
+
+    def set_cors_headers
+      headers['Access-Control-Allow-Origin'] = '*'
+      headers['Access-Control-Allow-Methods'] = 'GET, OPTIONS'
+      headers['Access-Control-Allow-Headers'] = 'Origin, X-Requested-With, Content-Type, Accept'
+      headers['Access-Control-Max-Age'] = '86400'
+    end
   end
 end

data/lib/webring/version.rb

@@ -1,3 +1,3 @@
 module Webring
-  VERSION = '1.4.4'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webring-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Nikita Shkoda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-10 00:00:00.000000000 Z
+date: 2025-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails