activerecord_json_validator 1.2.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aefb212198c5482c5fcc13ac5617c07a0bf0ea0a
-  data.tar.gz: c96cd0fc7fd5ee1206a820b368cc7b820d3ce240
+SHA256:
+  metadata.gz: 4d73e408cd69522e53d830509f0a4772607eeee5b7a0102b25aea4a0e3f2fb62
+  data.tar.gz: 9f3b97d92b0c5f8a55608fdd590e906b576d00036c87cff151967392244b7ada
 SHA512:
-  metadata.gz: 1f8335b9236577517e50934d4fb3cd356e64bcb07c70ffdb8fbed564e6abc35316a8aa6032eb07b914dd0f815cfbe86c11a317f79509bbe11a9b5fbb453f6ec6
-  data.tar.gz: 044eb0b74afe8a73799dcbc3e5c4a4d30f4b723ff3548afa9f99a262993cf22ccef3319f4d21575ee5b99d8be82fc2c762243b3db69063cbf426df2df2209e42
+  metadata.gz: f2fcf0da7354630f8619d075988f904dbb8b61b977e2f2fdd87f2f29fc545d5aaf0a0331e57c5e8d2bce5eeef9913900392a3a2978f6df17dd840546b9a706ca
+  data.tar.gz: 7fd00e24032a036bccf04d1e9c677de07ae085ee7d46f658b8dcda0e2bc35d0cb0c263662b18c0fb86ed144eb3d248cfc213f9216641abae84d0c5afd9403675

data/.travis.yml

@@ -1,15 +1,33 @@
 language: ruby
 
 rvm:
-  - 2.2.2
-  - 2.3.1
+  - 2.4.6
+  - 2.6.3
+  - 2.7.5
 
 gemfile:
   - gemfiles/Gemfile.activerecord-4.2.x
   - gemfiles/Gemfile.activerecord-5.0.x
+  - gemfiles/Gemfile.activerecord-6.0.x
+  - gemfiles/Gemfile.activerecord-7.0.x
+
+matrix:
+  exclude:
+  - gemfile: gemfiles/Gemfile.activerecord-6.0.x
+    rvm: 2.4.6
+  - gemfile: gemfiles/Gemfile.activerecord-7.0.x
+    rvm: 2.4.6
+  - gemfile: gemfiles/Gemfile.activerecord-7.0.x
+    rvm: 2.6.3
+  - gemfile: gemfiles/Gemfile.activerecord-4.2.x
+    rvm: 2.7.5
 
 sudo: false
 
+services:
+  - mysql
+  - postgresql
+
 env:
   - DB_ADAPTER=mysql2
   - DB_ADAPTER=postgresql
@@ -21,6 +39,3 @@ before_script:
 script:
   - 'echo "Checking code style" && bundle exec phare'
   - 'echo "Running tests" && bundle exec rake spec'
-
-addons:
-  postgresql: 9.3

data/Gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://github.com/mirego/activerecord_json_validator">
-    <img src="https://cloud.githubusercontent.com/assets/11348/6099354/cffcf35e-afc3-11e4-9a4d-d872941bbcf6.png" alt="" />
+    <img src="https://user-images.githubusercontent.com/11348/126779905-3468eb15-d554-46d5-925b-235f68169d86.png" alt="" />
   </a>
   <br />
   <code>ActiveRecord::JSONValidator</code> makes it easy to validate<br /> JSON attributes against a <a href="http://json-schema.org/">JSON schema</a>.
@@ -16,17 +16,19 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'activerecord_json_validator'
+gem 'activerecord_json_validator', '~> 2.0.0'
 ```
 
 ## Usage
 
 ### JSON Schema
 
+Schemas should be a JSON file
+
 ```json
 {
   "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
+  "$schema": "http://json-schema.org/draft-04/schema#",
   "properties": {
     "city": { "type": "string" },
     "country": { "type": "string" }
@@ -45,7 +47,7 @@ end
 
 class User < ActiveRecord::Base
   # Constants
-  PROFILE_JSON_SCHEMA = Rails.root.join('config', 'schemas', 'profile.json_schema').to_s
+  PROFILE_JSON_SCHEMA = Pathname.new(Rails.root.join('config', 'schemas', 'profile.json'))
 
   # Validations
   validates :name, presence: true
@@ -65,17 +67,16 @@ user.profile_invalid_json # => '{invalid JSON":}'
 
 #### Options
 
-| Option     | Description
-|------------|-----------------------------------------------------
-| `:schema`  | The JSON schema to validate the data against (see **Schema** section)
-| `:message` | The ActiveRecord message added to the record errors (see **Message** section)
-| `:options` | A `Hash` of [`json-schema`](https://github.com/ruby-json-schema/json-schema)-supported options to pass to the validator
+| Option     | Description                                                                                                                    |
+| ---------- | ------------------------------------------------------------------------------------------------------------------------------ |
+| `:schema`  | The JSON schema to validate the data against (see **Schema** 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 |
 
 ##### Schema
 
-`ActiveRecord::JSONValidator` uses the `json-schema` gem to validate the JSON
-data against a JSON schema. You can use [any value](https://github.com/ruby-json-schema/json-schema/tree/master#usage) that
-`JSON::Validator.validate` would take as the `schema` argument.
+`ActiveRecord::JSONValidator` uses the [json_schemer](https://github.com/davishmcclurg/json_schemer) gem to validate the JSON
+data against a JSON schema.
 
 Additionally, you can use a `Symbol` or a `Proc`. Both will be executed in the
 context of the validated record (`Symbol` will be sent as a method and the
@@ -122,7 +123,7 @@ user.errors.full_messages
 
 ## License
 
-`ActiveRecord::JSONValidator` is © 2013-2016 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/activerecord_json_validator/blob/master/LICENSE.md) file.
+`ActiveRecord::JSONValidator` is © 2013-2016 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause). See the [`LICENSE.md`](https://github.com/mirego/activerecord_json_validator/blob/master/LICENSE.md) file.
 
 The tree logo is based on [this lovely icon](http://thenounproject.com/term/tree/51004/) by [Sara Quintana](http://thenounproject.com/sara.quintana.75), from The Noun Project. Used under a [Creative Commons BY 3.0](http://creativecommons.org/licenses/by/3.0/) license.
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 require 'rake'
 require 'bundler/gem_tasks'
@@ -12,7 +14,7 @@ end
 
 desc 'Start an IRB session with the gem'
 task :console do
-  $LOAD_PATH.unshift File.expand_path('..', __FILE__)
+  $LOAD_PATH.unshift File.expand_path(__dir__)
   require 'activerecord_json_validator'
   require 'irb'
 

data/activerecord_json_validator.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'bundler', '>= 1.12'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'activesupport', '>= 4.2.0', '< 6'
+  spec.add_development_dependency 'activesupport', '>= 4.2.0', '< 8'
   spec.add_development_dependency 'phare'
   spec.add_development_dependency 'rubocop', '~> 0.28'
 
-  spec.add_dependency 'json-schema', '~> 2.8'
-  spec.add_dependency 'activerecord', '>= 4.2.0', '< 6'
+  spec.add_dependency 'json_schemer', '~> 0.2.18'
+  spec.add_dependency 'activerecord', '>= 4.2.0', '< 8'
 end

data/gemfiles/Gemfile.activerecord-4.2.x

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec path: '../'
 
 gem 'activerecord', '~> 4.2'
+gem 'pg', '~> 0.15'

data/gemfiles/Gemfile.activerecord-6.0.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 6.0'

data/gemfiles/Gemfile.activerecord-7.0.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 7.0.0.rc1'

data/lib/active_record/json_validator/validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class JsonValidator < ActiveModel::EachValidator
   def initialize(options)
     options.reverse_merge!(message: :invalid_json)
@@ -12,8 +14,8 @@ class JsonValidator < ActiveModel::EachValidator
 
   # Validate the JSON value with a JSON schema path or String
   def validate_each(record, attribute, value)
-    # Validate value with JSON::Validator
-    errors = ::JSON::Validator.fully_validate(schema(record), validatable_value(value), options.fetch(:options))
+    # Validate value with JSON Schemer
+    errors = JSONSchemer.schema(schema(record), **options.fetch(:options)).validate(value).to_a
 
     # Everything is good if we don’t have any errors and we got valid JSON value
     return if errors.empty? && record.send(:"#{attribute}_invalid_json").blank?
@@ -47,7 +49,7 @@ protected
     end
   end
 
-  # Return a valid schema for JSON::Validator.fully_validate, recursively calling
+  # Return a valid schema, recursively calling
   # itself until it gets a non-Proc/non-Symbol value.
   def schema(record, schema = nil)
     schema ||= options.fetch(:schema)
@@ -59,11 +61,6 @@ protected
     end
   end
 
-  def validatable_value(value)
-    return value if value.is_a?(String)
-    ::ActiveSupport::JSON.encode(value)
-  end
-
   def message(errors)
     message = options.fetch(:message)
 

data/lib/active_record/json_validator/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module JSONValidator
-    VERSION = '1.2.0'.freeze
+    VERSION = '2.1.0'
   end
 end

data/lib/activerecord_json_validator.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'active_record'
-require 'json-schema'
+require 'json_schemer'
 
 require 'active_record/json_validator/version'
 require 'active_record/json_validator/validator'

data/spec/json_validator_spec.rb

@@ -1,106 +1,52 @@
+# frozen_string_literal: true
+
 # rubocop:disable Metrics/BlockLength
 require 'spec_helper'
 
 describe JsonValidator do
-  describe :initialize do
-    # NOTE: We do not explicitely call `JsonValidator.new` in the tests,
-    # because we let Rails (ActiveModel::Validations) do that when we call
-    # `validates … json: true` on the model.
-    #
-    # This allows us to test the constructor behavior when executed in
-    # different Rails versions that do not pass the same arguments to it.
+  describe :validate_each do
     before do
       run_migration do
         create_table(:users, force: true) do |t|
-          t.string :name
           t.text :data
         end
       end
 
       spawn_model 'User' do
+        schema = '
+        {
+          "type": "object",
+          "properties": {
+            "city": { "type": "string" },
+            "country": { "type": "string" }
+          },
+          "required": ["country"]
+        }
+        '
         serialize :data, JSON
-        validates :data, json: true
-      end
-
-      record.data = data
-    end
-
-    let(:record) { User.new }
-
-    context 'with valid JSON data' do
-      let(:data) { 'What? This is not JSON at all.' }
-      it { expect(record.data_invalid_json).to eql(data) }
-    end
-
-    context 'with invalid JSON data' do
-      let(:data) { { foo: 'bar' } }
-      it { expect(record.data_invalid_json).to be_nil }
-    end
-  end
-
-  describe :validate_each do
-    let(:validator) { JsonValidator.new(options) }
-    let(:options) { { attributes: [attribute], options: { strict: true } } }
-    let(:validate_each!) { validator.validate_each(record, attribute, value) }
-
-    # Doubles
-    let(:attribute) { double(:attribute, to_s: 'attribute_name') }
-    let(:record) { double(:record, errors: record_errors) }
-    let(:record_errors) { double(:errors) }
-    let(:value) { double(:value) }
-    let(:schema) { double(:schema) }
-    let(:validatable_value) { double(:validatable_value) }
-    let(:validator_errors) { double(:validator_errors) }
-
-    before do
-      expect(validator).to receive(:schema).with(record).and_return(schema)
-      expect(validator).to receive(:validatable_value).with(value).and_return(validatable_value)
-      expect(::JSON::Validator).to receive(:fully_validate).with(schema, validatable_value, options[:options]).and_return(validator_errors)
-    end
-
-    context 'with JSON::Validator errors' do
-      before do
-        expect(validator_errors).to receive(:empty?).and_return(false)
-        expect(record).not_to receive(:"#{attribute}_invalid_json")
-        expect(record_errors).to receive(:add).with(attribute, options[:message], value: value)
+        validates :data, json: { schema: schema, message: ->(errors) { errors.map { |error| error['details'].to_a.flatten.join(' ') } } }
       end
-
-      specify { validate_each! }
     end
 
-    context 'without JSON::Validator errors but with invalid JSON data' do
-      before do
-        expect(validator_errors).to receive(:empty?).and_return(true)
-        expect(record).to receive(:"#{attribute}_invalid_json").and_return('foo"{]')
-        expect(record_errors).to receive(:add).with(attribute, options[:message], value: value)
-      end
+    context 'with valid JSON data but schema errors' do
+      let(:user) { User.new(data: '{"city":"Quebec City"}') }
 
-      specify { validate_each! }
-    end
-
-    context 'without JSON::Validator errors and valid JSON data' do
-      before do
-        expect(validator_errors).to receive(:empty?).and_return(true)
-        expect(record).to receive(:"#{attribute}_invalid_json").and_return(nil)
-        expect(record_errors).not_to receive(:add)
+      specify do
+        expect(user).not_to be_valid
+        expect(user.errors.full_messages).to eql(['Data missing_keys country'])
+        expect(user.data).to eql({ 'city' => 'Quebec City' })
+        expect(user.data_invalid_json).to be_nil
       end
-
-      specify { validate_each! }
     end
 
-    context 'with multiple error messages' do
-      let(:options) { { attributes: [attribute], message: message, options: { strict: true } } }
-      let(:message) { ->(errors) { errors.to_a } }
+    context 'with invalid JSON data' do
+      let(:data) { 'What? This is not JSON at all.' }
+      let(:user) { User.new(data: data) }
 
-      before do
-        expect(validator_errors).to receive(:empty?).and_return(false)
-        expect(validator_errors).to receive(:to_a).and_return(%i(first_error second_error))
-        expect(record).not_to receive(:"#{attribute}_invalid_json")
-        expect(record_errors).to receive(:add).with(attribute, :first_error, value: value)
-        expect(record_errors).to receive(:add).with(attribute, :second_error, value: value)
+      specify do
+        expect(user.data_invalid_json).to eql(data)
+        expect(user.data).to eql({})
       end
-
-      specify { validate_each! }
     end
   end
 
@@ -153,27 +99,11 @@ describe JsonValidator do
     end
   end
 
-  describe :validatable_value do
-    let(:validator) { JsonValidator.new(options) }
-    let(:options) { { attributes: [:foo] } }
-    let(:validatable_value) { validator.send(:validatable_value, value) }
-
-    context 'with non-String value' do
-      let(:value) { { foo: 'bar' } }
-      it { expect(validatable_value).to eql('{"foo":"bar"}') }
-    end
-
-    context 'with String value' do
-      let(:value) { '{\"foo\":\"bar\"}' }
-      it { expect(validatable_value).to eql(value) }
-    end
-  end
-
   describe :message do
     let(:validator) { JsonValidator.new(options) }
     let(:options) { { attributes: [:foo], message: message_option } }
     let(:message) { validator.send(:message, errors) }
-    let(:errors) { %i(first_error second_error) }
+    let(:errors) { %i[first_error second_error] }
 
     context 'with Symbol message' do
       let(:message_option) { :invalid_json }
@@ -182,7 +112,7 @@ describe JsonValidator do
 
     context 'with String value' do
       let(:message_option) { ->(errors) { errors } }
-      it { expect(message).to eql(%i(first_error second_error)) }
+      it { expect(message).to eql(%i[first_error second_error]) }
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 
 require 'active_support/all'
 require 'rspec'
@@ -8,7 +10,7 @@ require 'pg'
 require 'activerecord_json_validator'
 
 # Require our macros and extensions
-Dir[File.expand_path('../../spec/support/macros/**/*.rb', __FILE__)].map(&method(:require))
+Dir[File.expand_path('../spec/support/macros/**/*.rb', __dir__)].map(&method(:require))
 
 RSpec.configure do |config|
   # Include our macros

data/spec/support/macros/database/database_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DatabaseAdapter
   def initialize(opts = {})
     @database = opts[:database]

data/spec/support/macros/database/mysql_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'database_adapter'
 
 class Mysql2Adapter < DatabaseAdapter

data/spec/support/macros/database/postgresql_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'database_adapter'
 
 class PostgresqlAdapter < DatabaseAdapter

data/spec/support/macros/database_macros.rb

@@ -1,8 +1,16 @@
+# frozen_string_literal: true
+
 module DatabaseMacros
   # Run migrations in the test database
   def run_migration(&block)
+    migration_class = if ActiveRecord::Migration.respond_to?(:[])
+                        ActiveRecord::Migration[4.2]
+                      else
+                        ActiveRecord::Migration
+                      end
+
     # Create a new migration class
-    klass = Class.new(ActiveRecord::Migration)
+    klass = Class.new(migration_class)
 
     # Create a new `up` that executes the argument
     klass.send(:define_method, :up) { instance_exec(&block) }

data/spec/support/macros/model_macros.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModelMacros
   # Create a new model class
   def spawn_model(klass_name, parent_klass = ActiveRecord::Base, &block)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_json_validator
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
@@ -89,7 +89,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: phare
   requirement: !ruby/object:Gem::Requirement
@@ -129,19 +129,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.28'
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: json_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 0.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 0.2.18
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -161,7 +161,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
 description: ActiveRecord::JSONValidator makes it easy to validate JSON attributes
   with a JSON schema.
 email:
@@ -181,6 +181,8 @@ files:
 - activerecord_json_validator.gemspec
 - gemfiles/Gemfile.activerecord-4.2.x
 - gemfiles/Gemfile.activerecord-5.0.x
+- gemfiles/Gemfile.activerecord-6.0.x
+- gemfiles/Gemfile.activerecord-7.0.x
 - lib/active_record/json_validator/validator.rb
 - lib/active_record/json_validator/version.rb
 - lib/activerecord_json_validator.rb
@@ -210,8 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord::JSONValidator makes it easy to validate JSON attributes with