activerecord_json_validator 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79e0a6948c155c358b3345637b6df84dc3b77ac1ea22ded1db53b35eefa4ad7c
-  data.tar.gz: 1a4c6092ee7635dd0b43767d08272a5b389c10ce9daa7ff379e89e04d4ee6766
+  metadata.gz: f6f85c2656b56c867aa06f583528e3d315026c0537369311d6302adaeda42ad6
+  data.tar.gz: 34894b9ed770db328de8011be097b72f59bb08431b45ddeb3024af01d1cf29b3
 SHA512:
-  metadata.gz: 1f4f46c2db2c1b5f808fc98e003c4728b07a958a233218b1c565cb71a0bcf50118b7c1fb921735b4ee4e071f51fe458dca0e85e2267f262f30815c7b816afaac
-  data.tar.gz: 823a2e6c404e9939976177d6c0221d2ed1d0762315ec1767721492ce764302f734c0563c4e04d2f1ccf114ac40aeeb07027550dc48f1977616df548882fcf4d7
+  metadata.gz: db0d5e91cbbefb083b7c55d2633ef82e87868943a54dd09254f27b4ab85a5d6474eaa277ab0e23ad988a6b7f6bfc35ca870a0b735d9007b32ef5ce638fe9e198
+  data.tar.gz: a5cc28a84fd2037ec6623fce0cbbb665723a8481b89afb07139c46e6c7a8a047c885dfb1848aca667542196cd0e6c29fabf81081ad7b98c633644dbe4af4de7b

data/README.md

@@ -70,6 +70,7 @@ user.profile_invalid_json # => '{invalid JSON":}'
 | Option     | Description                                                                                                                    |
 | ---------- | ------------------------------------------------------------------------------------------------------------------------------ |
 | `:schema`  | The JSON schema to validate the data against (see **Schema** section)                                                          |
+| `:value`   | The actual value to use when validating (see **Value** section)                                                                |
 | `:message` | The ActiveRecord message added to the record errors (see **Message** section)                                                  |
 | `:options` | A `Hash` of [`json_schemer`](https://github.com/davishmcclurg/json_schemer#options)-supported options to pass to the validator |
 
@@ -111,6 +112,34 @@ class User < ActiveRecord::Base
 end
 ```
 
+##### Value
+
+By default, the validator will use the “getter” method to the fetch attribute
+value and validate the schema against it.
+
+```ruby
+# Will validate `self.foo`
+validates :foo, json: { schema: SCHEMA }
+```
+
+But you can change this behavior if the getter method doesn’t return raw JSON data (a `Hash`):
+
+```ruby
+# Will validate `self[:foo]`
+validates :foo, json: { schema: SCHEMA, value: ->(record, _, _) { record[:foo] } }
+```
+
+You could also implement a “raw getter” if you want to avoid the `value` option:
+
+```ruby
+# Will validate `self[:foo]`
+validates :raw_foo, json: { schema: SCHEMA }
+
+def raw_foo
+  self[:foo]
+end
+```
+
 ##### Message
 
 Like any other ActiveModel validation, you can specify either a `Symbol` or

data/lib/active_record/json_validator/validator.rb

@@ -5,6 +5,7 @@ class JsonValidator < ActiveModel::EachValidator
     options.reverse_merge!(message: :invalid_json)
     options.reverse_merge!(schema: nil)
     options.reverse_merge!(options: {})
+    options.reverse_merge!(value: ->(_record, _attribute, value) { value })
     @attributes = options[:attributes]
 
     super
@@ -13,9 +14,9 @@ class JsonValidator < ActiveModel::EachValidator
   end
 
   # Validate the JSON value with a JSON schema path or String
-  def validate_each(record, attribute, _value)
+  def validate_each(record, attribute, value)
     # Get the _actual_ attribute value, not the getter method value
-    value = record[attribute]
+    value = options.fetch(:value).call(record, attribute, value)
 
     # Validate value with JSON Schemer
     errors = JSONSchemer.schema(schema(record), **options.fetch(:options)).validate(value).to_a

data/lib/active_record/json_validator/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module JSONValidator
-    VERSION = '2.1.2'
+    VERSION = '2.1.3'
   end
 end

data/spec/json_validator_spec.rb

@@ -28,7 +28,7 @@ describe JsonValidator do
         serialize :other_data, JSON
         validates :data, json: { schema: schema, message: ->(errors) { errors } }
         validates :other_data, json: { schema: schema, message: ->(errors) { errors.map { |error| error['details'].to_a.flatten.join(' ') } } }
-        validates :smart_data, json: { schema: schema, message: ->(errors) { errors } }
+        validates :smart_data, json: { value: ->(record, _, _) { record[:smart_data] }, schema: schema, message: ->(errors) { errors } }
 
         def smart_data
           OpenStruct.new(self[:smart_data])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_json_validator
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler