rails_settlement 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5babe02d110a7be58276f8db43f444866c28348919e0395a95b18a42400f4c8
-  data.tar.gz: 072ba56c5d56d4ac8114c73e31e3ef4674ae9ceca1412d7841dd1461788ed664
+  metadata.gz: 964bf8e0f084d6dfe8f471895e49f0d812fa6c0138ed771f5c4d9ee0bc617f73
+  data.tar.gz: ed7be25b7bc3ae6544cbe6aab452135a6e71d68d82553e18910554060ec45ac5
 SHA512:
-  metadata.gz: 83560391ae6716aef1cf12455dac296600b6a3b295a72a63cf276dca52ea119d6cda3e384cf427da9650d016bd4416dcc40f3181a7ed252837d08bc92f541704
-  data.tar.gz: 132e33a061a3b536c63f56ea391d9ba85465336561145ff18cc2cb1cb4b0a685ad6b1690529e4785af255b9f9354c19c2d845632cf14b5d5de0b48db87d09799
+  metadata.gz: fe3fcefecdeb8b2ae1af0b3136bf4a1d10622c702e3e8cd4f2a9dc4a54b7782b8b080318ea979a1bcccba6ff9275b651ce1702f8f5a6e1ad9af1f2a8e74d4068
+  data.tar.gz: 1bfbce931bbc5536c2b70ed17cb9f2679ffaf34c6133682082fdb4e138062185c3939ce1efa67507f4c33b0b3ca0eb2695202cb08781dbe80d570979b380dfc7

data/lib/rails_settlement/version.rb

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

data/lib/rails_settlement.rb

@@ -15,7 +15,7 @@ module RailsSettlement
       super unless (matches = method.to_s.match(SETTABLE_REGEX))
 
       variable, raisable = _rs_handle_match_data(matches)
-      klass = _rs_klass(variable, **options.extract!(:namespace))
+      klass = _rs_klass(variable, **options.slice(:namespace))
       param_options = _rs_param_options(klass: klass, options: options)
       scoped_klass = _rs_handle_scopes(klass: klass, scopes: param_options[:scope_to])
       associated_to = _rs_handle_associated_to(options: options)
@@ -24,7 +24,7 @@ module RailsSettlement
         query = _rs_associated_scope(scoped_relation: scoped_klass, associated_to: associated_to)
 
         instance_variable_set("@#{variable}", query.find_by(param_options[:model_key] => params[param_options[:params_key]]))
-        raise ActiveRecord::RecordNotFound if raisable && instance_variable_get("@#{variable}").nil?
+        _rs_raise_record_not_found!(klass: klass, key: param_options[:model_key], id: params[param_options[:params_key]]) if raisable && instance_variable_get("@#{variable}").nil?
       end
 
       attr_reader variable
@@ -47,7 +47,7 @@ module RailsSettlement
     end
 
     def _rs_param_options(klass:, options:)
-      (klass.try(:settable_params) || {}).merge(options.extract!(:model_key, :params_key, :scope_to))
+      (klass.try(:settable_params) || {}).merge(options.slice(:model_key, :params_key, :scope_to))
     end
 
     def _rs_handle_scopes(klass:, scopes:)
@@ -71,6 +71,10 @@ module RailsSettlement
 
     scoped_relation.joins(associated_to).where(associated_to => public_send(associated_to))
   end
+
+  def _rs_raise_record_not_found!(klass:, key:, id:)
+    raise ActiveRecord::RecordNotFound.new("Couldn't find #{klass} with '#{key}'='#{id}'", klass.name, key, Array.wrap(id))
+  end
 end
 
 ActiveSupport.on_load(:action_controller) do

data/rails_settlement.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "activerecord", ">= 5.0"
-  spec.add_dependency "activesupport", ">= 5.0"
+  spec.add_dependency "activerecord", ">= 6.0"
+  spec.add_dependency "activesupport", ">= 6.0"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_settlement
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Tejas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-23 00:00:00.000000000 Z
+date: 2024-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 description: A simple way to initialize objects in rails controllers using callbacks
   and ruby magic!
 email: