iry 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e650372034f89b6bd6d8187f83f7e54ec43a9fa9cf69f4c1ec07ee091b07063c
-  data.tar.gz: 0dad363e7219745a1f92a0af6fe2348a98029f3740cd6031d46535a39c742dd2
+  metadata.gz: 1cabc0965e3b746552dee09d6fcf0356bb0f166114e3cb9d696c00c033742016
+  data.tar.gz: 0171d5388f8a7ee89d942e1ea959e2e309f3ef15fc869dba804dba8e6de0877f
 SHA512:
-  metadata.gz: 460f2ebab05bbe7271634f5a7d5cb0ae6644d5f53982e3bec6ac0f8c9f6745ca5c8e3aea3f931649112a2b1641d411c788f9fc3aba643ae03c9e4f50b85784b7
-  data.tar.gz: 17a3e4033f3a731e110706db24b6b71f95b3059b7b113299cf6c651001e7f309b2402b867b7a974f9532ba89a7f499cb7533a2eebc8217bb693513923e8713af
+  metadata.gz: ef0954dca71dbdeacd8588256939faa6a18b16ff85d1b913980c23e5058c54ceaf946959de3bbb0b9f421b5b5b3f57dea5d4d001295d6e2ad17fbfeda688771d
+  data.tar.gz: cd3117ad1717f98fbe96d823920a25742aca1a3f10948f60ae47f9567a31c7e55633d7b2dc3ee8d151cb60e7416bd9cdb840211e8e81cd44d63ced15b199bdc1

data/CHANGELOG.md

@@ -1,16 +1,15 @@
-## [0.1.1](https://github.com/Fire-Dragon-DoL/iry/compare/v0.1.0...v0.1.1) (2023-07-07)
-
-
-
-# [0.1.0](https://github.com/Fire-Dragon-DoL/iry/compare/8a133c2c19b99881619a9e1c7c11076030755f66...v0.1.0) (2023-07-07)
+# [0.2.0](https://github.com/Fire-Dragon-DoL/iry/compare/8a133c2c19b99881619a9e1c7c11076030755f66...v0.2.0) (2023-07-08)
 
 
 ### Features
 
-* **constraints:** check constraint is present ([2723ad7](https://github.com/Fire-Dragon-DoL/iry/commit/2723ad70d7dbb4cea4b4c6e92ce59627fae64c27))
-* **constraints:** exclusion constraint is present ([bdb904a](https://github.com/Fire-Dragon-DoL/iry/commit/bdb904a80dd1f6b1960f2b8378490cc192deb83e))
-* **constraints:** foreign key constraint is present ([efed498](https://github.com/Fire-Dragon-DoL/iry/commit/efed4986a10b40c77dcd063d8801eb77d605d807))
-* **deps:** dependency surface is reduced ([ff4af7e](https://github.com/Fire-Dragon-DoL/iry/commit/ff4af7e365537e30a0d95bfdee84e681f54c155a))
+* **constraints:** check constraint is present ([d0cc380](https://github.com/Fire-Dragon-DoL/iry/commit/d0cc3803fdcda45df964f6431890f8831d3641e5))
+* **constraints:** exclusion constraint is present ([1894e85](https://github.com/Fire-Dragon-DoL/iry/commit/1894e85bfa11e272be9b5f0f8efc170f7ce57a48))
+* **constraints:** foreign key constraint is present ([e637b06](https://github.com/Fire-Dragon-DoL/iry/commit/e637b0603bb6fd34e2732426544fc31904bb5409))
+* **deps:** dependency surface is reduced ([2dfc595](https://github.com/Fire-Dragon-DoL/iry/commit/2dfc595ebd221aedb072398e1ace8460208d06ac))
 * **project:** setup ([8a133c2](https://github.com/Fire-Dragon-DoL/iry/commit/8a133c2c19b99881619a9e1c7c11076030755f66))
-* **ruby:** version is forced to >= 2.7 ([f386ce6](https://github.com/Fire-Dragon-DoL/iry/commit/f386ce6db3aab7399b71a15bfed8228884a82f16))
+* **ruby:** version is forced to >= 2.7 ([9b20ed8](https://github.com/Fire-Dragon-DoL/iry/commit/9b20ed8ec0ae2a9906bdefe28cf674d4700f4d67))
 * **unique-constraint:** test is implemented ([c4266b9](https://github.com/Fire-Dragon-DoL/iry/commit/c4266b910757b6adef18db41dfa5dfd9353c1037))
+
+
+

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/iry/callbacks.rb

@@ -19,7 +19,11 @@ module Iry
 
       is_handled = handler.handle(err, model)
 
-      if !is_handled
+      if is_handled
+        # Rolling back allows to keep using SQL in other callbacks, which
+        # otherwise would raise PG::InFailedSqlTransaction
+        raise ActiveRecord::Rollback
+      else
         raise
       end
     end

data/lib/iry/macros.rb

@@ -1,11 +1,9 @@
 module Iry
   # Class-level methods available to classes executing `include Iry`
   module Macros
-    # Constraints by name
-    # @return [{String => Constraint}]
-    def constraints
-      @constraints ||= {}
-    end
+    # @!method constraints
+    #   Constraints by name
+    #   @return [{String => Constraint}]
 
     # Tracks check constraint for the given key and convert constraint errors into validation errors
     # @param key [Symbol] key to apply validation errors to

data/lib/iry.rb

@@ -32,15 +32,87 @@ require_relative "iry/constraint/unique"
 #   fail_user = User.create(email: "user@example.com")
 #   fail_user.errors.details.fetch(:email) #=> [{error: :taken}]
 module Iry
+  # Raised when constraint errors have been violated and have been converted to
+  # model errors
+  class RecordInvalid < ActiveRecord::RecordInvalid
+  end
+
   # @param klass [Module]
   # @return [void]
   # @private
   def self.included(klass)
     klass.class_eval do
+      # From activesupport
+      class_attribute(:constraints)
+      self.constraints = {}
       extend(Iry::Macros)
-      # Prepend ensures around save happens before all around_save callbacks
-      # adding the errors as soon as possible
-      around_save(Iry::Callbacks, prepend: true)
     end
   end
+
+  # Executes block and in case of constraints violations on `model`, block is
+  # halted and errors are appended to `model`
+  # @param model [Handlers::Model] model object for which constraints should be
+  #   monitored and for which errors should be added to
+  # @yield block must perform the save operation, usually with `save`
+  # @return [nil, Handlers::Model] the `model` or `nil` if a  a constraint is
+  #   violated
+  def self.handle_constraints(model, &block)
+    raise ArgumentError, "Block required" if block.nil?
+
+    block.()
+
+    return model
+  rescue ActiveRecord::StatementInvalid => err
+    handler = Handlers::Null
+    case
+    when Handlers::PG.handle?(err)
+      handler = Handlers::PG
+    end
+
+    is_handled = handler.handle(err, model)
+
+    if !is_handled
+      raise
+    end
+
+    return nil
+  end
+
+  # Similar to {ActiveRecord::Base#save} but in case of constraint violations,
+  # `false` is returned and `errors` are populated.
+  # Aside from `model`, it takes the same arguments as
+  # {ActiveRecord::Base#save}
+  # @param model [Handlers::Model] model to save
+  # @return [Boolean] `true` if successful
+  def self.save(model, ...)
+    success = nil
+    constraint_model = handle_constraints(model) { success = model.save(...) }
+
+    if constraint_model
+      return success
+    end
+
+    return false
+  end
+
+  # Similar to {ActiveRecord::Base#save!} but in case of constraint violations,
+  # it raises {RecordInvalid} and `errors` are populated.
+  # Aside from `model`, it takes the same arguments as
+  # {ActiveRecord::Base#save!}
+  # @param model [Handlers::Model] model to save
+  # @return [true]
+  # @raise [RecordInvalid] {RecordInvalid} inherits from
+  #   {ActiveRecord::RecordInvalid} but it's triggered only when a constraint
+  #   violation happens
+  # @raise [ActiveRecord::RecordInvalid] triggered when a validation error is
+  #   raised, but not a constraint violation
+  def self.save!(model, ...)
+    constraint_model = handle_constraints(model) { model.save!(...) }
+
+    if constraint_model
+      return true
+    end
+
+    raise RecordInvalid.new(model)
+  end
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "iry",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "iry",
-      "version": "0.2.0",
+      "version": "0.3.0",
       "license": "MIT",
       "devDependencies": {
         "conventional-changelog-cli": ">= 3.0.0",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iry",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Transform database constraint errors into activerecord validation errors",
   "private": true,
   "main": "index.js",
@@ -10,7 +10,8 @@
     "test": "test"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "version-get": "echo \"$npm_package_version\""
   },
   "repository": {
     "type": "git",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iry
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Francesco Belladonna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-08 00:00:00.000000000 Z
+date: 2023-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord