webring-rails 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9d0c282d9c70f7496be14d07208be3200af7f781cab93ea45785e99ce99572e
-  data.tar.gz: a708bacf75e46d7ca6c62edd65ded059f405afff09bb204fd72bfbbcb6a7e1b5
+  metadata.gz: b3841de2893a8fd2b1ee27cf90b95bcb095ddebb266fa47f79a9b7c845b1e26a
+  data.tar.gz: 58c76857005b4cd7639f388f3426f10fe68b4a62dbe2f593b587b81b3fcc9d83
 SHA512:
-  metadata.gz: d3f48e765f419b8e3b4189dd680de9e066a875d76aee3f3c195d867f918ee319460d69248aba07d5b773b31e8ac97045a79fc6df28fb41e978baec0cbcb1a852
-  data.tar.gz: 6de9845eef922a65f7785a57b12595e81348a4d83428d678cadead421247e463e230dc2eb21580d7ebc65bfe76010c72cb1ca3bd1095f5ab97a237cdccdf3522
+  metadata.gz: f65ae49b0328ff8c9256d1dbfc1e94dd05e21592a4be6f9eaf917b1755d888c6947ba78079181583a321f9aef89f493b98b415ee6a06775eb038b302ff7fd131
+  data.tar.gz: 6f0f3161a267c31e139d538886f0a89bb5a18e951279f17ce8c5de48e52fe6c2b9fdd123f4f22d19e3d0e1503f99ca8aed4178bd4b83fc62f5b5e995df75104c

data/app/controllers/webring/members_controller.rb

@@ -31,29 +31,29 @@ module Webring
     # PATCH/PUT /webring/members/1
     def update
       if member.update(member_params)
-        update_success_response
+        handle_update_success
       else
-        update_error_response
+        handle_update_error
       end
     end
 
     # DELETE /webring/members/1
     def destroy
-      member.destroy
+      member.destroy!
 
       redirect_to admin_panel_members_url, notice: 'Member was successfully destroyed.'
     end
 
     private
 
-    def update_success_response
+    def handle_update_success
       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
+    def handle_update_error
       respond_to do |format|
         format.html { render :edit, status: :unprocessable_entity }
         format.json { render json: { status: 'error', errors: member.errors }, status: :unprocessable_entity }
@@ -61,7 +61,7 @@ module Webring
     end
 
     def members
-      @members ||= Member.all.order(created_at: :desc)
+      @members ||= Member.order(created_at: :desc)
     end
 
     def member

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

@@ -5,50 +5,46 @@ module Webring
     # If current member is the last, return the first member (ring concept)
     def find_next(source_member_uid)
       source_member = active.find_by(uid: source_member_uid)
-      return first_active_member_by_creation unless source_member
+      return first_active_member unless source_member
 
-      find_next_active_member(source_member) || first_active_member_by_creation
+      find_next_active_member(source_member) || first_active_member
     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 = active.find_by(uid: source_member_uid)
-      return last_active_member_by_creation unless source_member
+      return last_active_member unless source_member
 
-      find_previous_active_member(source_member) || last_active_member_by_creation
+      find_previous_active_member(source_member) || last_active_member
     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 active.order('RANDOM()').first if source_member_uid.blank?
+      scope = active
+      scope = scope.where.not(uid: source_member_uid) if source_member_uid.present?
 
-      # Use exists? check to avoid loading records when not needed
-      excluded_scope = active.where.not(uid: source_member_uid)
+      return scope.order('RANDOM()').first if scope.exists?
+      return active.find_by(uid: source_member_uid) if source_member_uid.present?
 
-      if excluded_scope.exists?
-        excluded_scope.order('RANDOM()').first
-      else
-        # if only one active member exists (the current one), return it
-        active.find_by(uid: source_member_uid)
-      end
+      nil
     end
 
     private
 
-    def first_active_member_by_creation
-      active.order(created_at: :asc).first
+    def first_active_member
+      @first_active_member ||= active.order(:created_at).first
     end
 
-    def last_active_member_by_creation
-      active.order(created_at: :desc).first
+    def last_active_member
+      @last_active_member ||= active.order(created_at: :desc).first
     end
 
     def find_next_active_member(source_member)
       active
         .where('created_at > ?', source_member.created_at)
-        .order(created_at: :asc)
+        .order(:created_at)
         .first
     end
 

data/lib/generators/webring/membership_request/membership_request_generator.rb

@@ -46,19 +46,19 @@ module Webring
           { line: 'class Member < ApplicationRecord', inject_options: { after: "class Member < ApplicationRecord\n" } }
         ]
 
-        if File.exist?(member_model_path)
-          content = File.read(member_model_path)
-          options = inject_conditions.find { |condition| content.include?(condition[:line]) }&.fetch(:inject_options)
-          return if options.nil? || options.empty?
+        return unless File.exist?(member_model_path)
 
-          inject_into_file member_model_path, **options do
-            "    belongs_to :membership_request,\n" \
-            "               class_name: 'Webring::MembershipRequest',\n" \
-            "               foreign_key: :webring_membership_request_id,\n" \
-            "               optional: true,\n" \
-            "               inverse_of: :member\n" \
-            "\n"
-          end
+        content = File.read(member_model_path)
+        options = inject_conditions.find { |condition| content.include?(condition[:line]) }&.fetch(:inject_options)
+        return if options.blank?
+
+        inject_into_file member_model_path, **options do
+          "    belongs_to :membership_request,\n" \
+          "               class_name: 'Webring::MembershipRequest',\n" \
+          "               foreign_key: :webring_membership_request_id,\n" \
+          "               optional: true,\n" \
+          "               inverse_of: :member\n" \
+          "\n"
         end
       end
 

data/lib/webring/version.rb

@@ -1,3 +1,3 @@
 module Webring
-  VERSION = '1.7.3'.freeze
+  VERSION = '1.7.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webring-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Nikita Shkoda