rails_settlement 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f6997e50cad74b6bfb65514e1efc59a454db83eca5d903fed3cee4ae35326aa
-  data.tar.gz: 0f372b19be2e0f3614c9c55b01394d38b6aebb915bf9905857b6cc5c746266a5
+  metadata.gz: 2c8e94ec51585b2d83c118eadff000068b305f42e4517a92178ad5c4f6eaa71b
+  data.tar.gz: d927ccfdfa4cf67c4ea577ef7fc9683ffd99e7643e9e52d8b3c05138a8f596e9
 SHA512:
-  metadata.gz: 8bf231039431dbf2c302aab711be354ef8373cbf9570cf053d32100e3f3660b2399a9067f8be965c2dd553b303f4333a5fe06fe2ebe031ed12e54523bce86b78
-  data.tar.gz: 881deb50b91a6628596d9767a55ad4e57a15cf6055a8452d1a2275f0bd051b84eba7aa8bf429629e306fdd4b79073112a939abb73460f350c8b1a55262b0df1c
+  metadata.gz: 72504a32b9a063436ed05d73fa9e4f372e4339e63a42edb46f43064dfa8526206be729d203e0b428b2fe656ffa8cdc3387c2ced7772b792506df5f76c193869c
+  data.tar.gz: ed367d3d88d16264714db216cc995e27b83346f4d24d9ecadc744df67b3aa7e92773ee9f3af977f4c778ec449172dee34ca16c1b3850984c50aef54d05bb6418

data/.rubocop.yml

@@ -10,7 +10,7 @@ Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
 Layout/LineLength:
-  Max: 130
+  Max: 150
 
 Metrics/AbcSize:
   Max: 22

data/README.md

@@ -25,6 +25,12 @@ class UsersController < ApplicationController
   # set_user scope_to: :is_active, only: %i[show] #=> User.is_active.find_by
   # set_user! scope_to: %i[is_active is_admin] #=> User.is_active.is_admin.find_by
 
+  # You can also set a namespace for the model with the `namespace` option. It can be a string or a symbol.
+  # Suppose you have a model 'Admin::User', you can define:
+  # set_user namespace: :admin, ...
+  # If you have a model that's nested more than once, like 'Admin::Account::User', you can define as:
+  # set_user namespace: 'admin/account', ...
+
   def show
     do_something with: user # You also have an attribute reader with the same name available if the object is found. If not, it defaults to nil (unless a bang method is used, in which case an error is raised!)
   end
@@ -47,6 +53,4 @@ end
 
 This approach allows you to use any model instead of a `User`. Just follow the naming convention set_[model_name_in_snake_case]!.
 
-Note: This implementation does not support STI or any Namespaced models. If you have a solution to make them work, please submit a pull request!
-
 That's about it!

data/lib/rails_settlement/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsSettlement
-  VERSION = "1.2.0"
+  VERSION = "1.3.1"
 end

data/lib/rails_settlement.rb

@@ -10,17 +10,17 @@ module RailsSettlement
 
   SETTABLE_REGEX = /\Aset_(?<object>[a-z_]+)(?<raisable>!?)\z/.freeze
 
-  class_methods do
+  class_methods do # rubocop:disable Metrics/BlockLength
     def method_missing(method, **options)
       super unless (matches = method.to_s.match(SETTABLE_REGEX))
 
       variable, raisable = _handle_match_data(matches)
-      klass = _klass(variable)
+      klass = _klass(variable, **options.extract!(:namespace))
       param_options = _param_options(klass: klass, options: options)
+      scoped_klass = _handle_scopes(klass: klass, scopes: param_options[:scope_to])
 
       before_action(**options) do
-        klass = _handle_scopes(klass, param_options[:scope_to])
-        instance_variable_set("@#{variable}", klass.find_by(param_options[:model_key] => params[param_options[:params_key]]))
+        instance_variable_set("@#{variable}", scoped_klass.find_by(param_options[:model_key] => params[param_options[:params_key]]))
         raise ActiveRecord::RecordNotFound if raisable && instance_variable_get("@#{variable}").nil?
       end
 
@@ -37,22 +37,24 @@ module RailsSettlement
       [match_data[:object], match_data[:raisable].present?]
     end
 
-    def _klass(variable)
-      variable.classify.constantize
+    def _klass(variable, namespace: nil)
+      variable = variable.classify
+      variable = "#{namespace.to_s.classify}::#{variable}" if namespace.present?
+      variable.constantize
     end
 
     def _param_options(klass:, options:)
       (klass.try(:settable_params) || {}).merge(options.extract!(:model_key, :params_key, :scope_to))
     end
-  end
 
-  def _handle_scopes(klass, scopes)
-    return klass if scopes.blank?
+    def _handle_scopes(klass:, scopes:)
+      return klass if scopes.blank?
 
-    scopes = [scopes] unless scopes.is_a?(Array)
-    scopes.each { |scope| klass = klass.public_send(scope) }
+      scopes = [scopes] unless scopes.is_a?(Array)
+      scopes.each { |scope| klass = klass.public_send(scope) }
 
-    klass
+      klass
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_settlement
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Tejas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-11 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord