rails_ops 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cbedc7c32b0c2426655e10cc0976a0156d7558fc7ddf60e12a04a554ebd3955
-  data.tar.gz: 06e926c30fb1b8228eb6f818910392ef9d0509fd610e16effca49f0f49d8389a
+  metadata.gz: dcc75b6ab31d484ef579cb73510e759c4b5f85074a491954b991648e9c9d678a
+  data.tar.gz: 6c1b1fec40de9cc92ac28b417acd33cc7ca9a61d936a3ecef9b9131758005cd2
 SHA512:
-  metadata.gz: cdc2260ce72809585f7bd5b68311d84e9342afdc27dee51f5fb402e9431285a166d9610bc5479f6b5e0837f1c7ec1638da58002e28a912ab4e89447b81da668c
-  data.tar.gz: 580e14d0f3aa76014e806e64efbb575f9f8287dcbf0460fe4d3ae3baed162e7b0d1e444d3d2e21fc4c88dad1cc169cb8cff5bb7c1393428201255a35e49637fd
+  metadata.gz: 369d58ccd929715e12b62cea2b38e42bd629accf5f1b1ed7c00bd9b4e8e58eb947b999c7410959262c647052faac33c3ae84cf502cf1d724954c3e8c51189690
+  data.tar.gz: 7eddc5780ab3daa372af54140b03d7c80d51d6bb2465b6022e3b1eb4a605af11e97b47f9a681be79fe8c12b8f60e0abc87eee42cda5e86dd51e2885a3efaadc5

data/.github/workflows/rubocop.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.0
+          ruby-version: 3.2.0
           bundler-cache: true
       - name: Run rubocop
         run: bundle exec rubocop

data/CHANGELOG.md

@@ -1,14 +1,21 @@
 # Changelog
 
+## 1.7.7 (2026-02-24)
+
+* Fix `find_model_relation` to merge the returned relation's conditions
+  into the operation's model class. Previously, overriding the method
+  with a relation on the base class (e.g. `User.where(...)`) would
+  bypass model extensions defined via `model do ... end`. The loaded
+  record is now always an instance of the correct (possibly extended)
+  model type.
+
 ## 1.7.6 (2026-02-24)
 
 * Add `find_model_relation` hook to `RailsOps::Operation::Model::Load`.
   This protected method can be overridden in subclasses to customize the
   relation used for looking up the model, e.g. to apply scopes or use a
   different base query. Since `Update` and `Destroy` inherit from `Load`,
-  the hook is available in all model operations that load a record. The
-  default implementation returns `self.class.model`, preserving existing
-  behavior.
+  the hook is available in all model operations that load a record.
 
 ## 1.7.5 (2026-02-18)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_ops (1.7.6)
+    rails_ops (1.7.7)
       active_type (>= 1.3.0)
       minitest
       rails (> 4)

data/README.md

@@ -1169,15 +1169,21 @@ end
 
 #### Customizing the Lookup Relation
 
-By default, `Load` operations look up the model using the relation returned
-by `self.class.model` (i.e. the model class itself). If you need to use a
-custom relation — for example to apply a scope, join additional tables, or
-restrict visibility — you can override the `protected` method
-`find_model_relation`.
+By default, `Load` operations look up the model using the class specified
+via the `model` DSL method. If you need to customize the lookup — for
+example to apply a scope, join additional tables, or restrict visibility
+— you can override the `protected` method `find_model_relation`.
 
-Since `Update` and `Destroy` operations inherit from `Load`, this hook is
-available in all of them. For example, you can scope an `Update` operation
-so that it only finds records belonging to the current user's organization:
+The conditions from the returned relation are **merged** into the
+operation's model class, so the loaded record is always an instance of
+the correct (possibly extended) model type. This means model extensions
+defined via `model do ... end` (e.g. validations, callbacks) are always
+preserved.
+
+Since `Update` and `Destroy` operations inherit from `Load`, this hook
+is available in all of them. For example, you can scope an `Update`
+operation so that it only finds records belonging to the current user's
+organization:
 
 ```ruby
 class Operations::User::Update < RailsOps::Operation::Model::Update
@@ -1191,9 +1197,8 @@ class Operations::User::Update < RailsOps::Operation::Model::Update
 end
 ```
 
-The returned object must be an ActiveRecord relation (or the model class
-itself, which acts as one). Locking and eager loading via `model_includes`
-are applied on top of whatever relation this method returns.
+Locking and eager loading via `model_includes` are applied on top of
+the merged relation.
 
 #### Locking
 

data/VERSION

@@ -1 +1 @@
-1.7.6
+1.7.7

data/lib/rails_ops/operation/model/load.rb

@@ -79,8 +79,10 @@ class RailsOps::Operation::Model::Load < RailsOps::Operation::Model
       fail "Param #{model_id_field.inspect} must be given."
     end
 
-    # Obtain relation
-    relation = find_model_relation
+    # Obtain relation, always starting from the operation's model class
+    # to ensure the loaded record is of the correct (possibly extended)
+    # type, then merge in any custom conditions from find_model_relation.
+    relation = self.class.model.all.merge(find_model_relation)
 
     # Express intention to lock if required
     relation = lock_relation(relation)
@@ -112,23 +114,25 @@ class RailsOps::Operation::Model::Load < RailsOps::Operation::Model
 
   protected
 
-  # Returns the base relation used by {#find_model} to look up the model
-  # record. Override this method in subclasses to customize the lookup
-  # relation, e.g. to apply scopes or restrict visibility.
+  # Returns a relation whose conditions are merged into the operation's
+  # model class when looking up the record. Override this method in
+  # subclasses to customize the lookup, e.g. to apply scopes or
+  # restrict visibility.
   #
-  # The returned object must respond to `find_by!` (i.e. be an
-  # `ActiveRecord::Relation` or the model class itself). Locking and
-  # eager loading via {.model_includes} are applied on top of this
-  # relation.
+  # The conditions from this relation are merged onto
+  # `self.class.model`, so the loaded record is always an instance of
+  # the operation's (possibly extended) model class. This means model
+  # extensions defined via `model do ... end` are preserved.
   #
-  # @return [ActiveRecord::Relation] the relation to query against
+  # @return [ActiveRecord::Relation] the relation whose conditions are
+  #   merged into the model class
   #
   # @example Scoping to the current user's organization
   #   def find_model_relation
   #     User.where(organization: context.user.organization)
   #   end
   def find_model_relation
-    self.class.model
+    self.class.model.all
   end
 
   private

data/rails_ops.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: rails_ops 1.7.6 ruby lib
+# stub: rails_ops 1.7.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rails_ops".freeze
-  s.version = "1.7.6"
+  s.version = "1.7.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/test/dummy/app/models/group.rb

@@ -1,2 +1,3 @@
 class Group < ApplicationRecord
+  has_many :users
 end

data/test/dummy/db/schema.rb

@@ -15,6 +15,11 @@ ActiveRecord::Schema.define do
     t.boolean :planted, null: false, default: true
   end
 
+  create_table :users, force: true do |t|
+    t.string :name
+    t.references :group
+  end
+
   create_table :computers, force: true do |t|
     t.string :name
     t.references :mainboard

data/test/unit/rails_ops/operation/model/load_test.rb

@@ -74,7 +74,7 @@ class RailsOps::Operation::Model::LoadTest < ActiveSupport::TestCase
     assert_equal g, op.model
   end
 
-  def test_find_model_relation_override
+  def test_find_model_relation_with_where
     g1 = Group.create(name: 'visible')
     g2 = Group.create(name: 'hidden')
 
@@ -94,4 +94,49 @@ class RailsOps::Operation::Model::LoadTest < ActiveSupport::TestCase
       cls.new(id: g2.id)
     end
   end
+
+  def test_find_model_relation_with_joins
+    g1 = Group.create(name: 'with_users')
+    g2 = Group.create(name: 'empty')
+    User.create(name: 'Alice', group: g1)
+
+    cls = Class.new(RailsOps::Operation::Model::Load) do
+      model Group
+
+      protected
+
+      def find_model_relation
+        Group.joins(:users).where(users: { name: 'Alice' })
+      end
+    end
+
+    assert_equal g1, cls.new(id: g1.id).model
+
+    assert_raise ActiveRecord::RecordNotFound do
+      cls.new(id: g2.id)
+    end
+  end
+
+  def test_find_model_relation_preserves_model_extensions
+    g = Group.create(name: 'test')
+
+    cls = Class.new(RailsOps::Operation::Model::Load) do
+      model Group do
+        def custom_method
+          'extended'
+        end
+      end
+
+      protected
+
+      def find_model_relation
+        Group.where(name: 'test')
+      end
+    end
+
+    op = cls.new(id: g.id)
+    assert_equal 'extended', op.model.custom_method
+    assert op.model.class < Group
+    assert_not_equal Group, op.model.class
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_ops
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Sitrox