activerecord_json_validator 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a23791df42cc3761bf97c7582c7ba526806b2b163708e5bf1fe8250b6236d067
-  data.tar.gz: 57f080ea733883b1e83e81ed28bc28d17332b8939699a3f48cfca9ef49689ffe
+  metadata.gz: 4d73e408cd69522e53d830509f0a4772607eeee5b7a0102b25aea4a0e3f2fb62
+  data.tar.gz: 9f3b97d92b0c5f8a55608fdd590e906b576d00036c87cff151967392244b7ada
 SHA512:
-  metadata.gz: 53836d631662e35b1e864379491a11fbebfde8207318dde0a2572f83d22811add057b5f35609f4bc267e17b0d16aa3672b8e057521ec2f797d9b160cceae0b9a
-  data.tar.gz: f8806eaa64ee2bb70ff2d44a91f53b8bc2c068b26eb38138f0fd600417263b138d0f5f61f35d0d08457583129260d11bcf8f54761ae4e5fd5996885988b08472
+  metadata.gz: f2fcf0da7354630f8619d075988f904dbb8b61b977e2f2fdd87f2f29fc545d5aaf0a0331e57c5e8d2bce5eeef9913900392a3a2978f6df17dd840546b9a706ca
+  data.tar.gz: 7fd00e24032a036bccf04d1e9c677de07ae085ee7d46f658b8dcda0e2bc35d0cb0c263662b18c0fb86ed144eb3d248cfc213f9216641abae84d0c5afd9403675

data/.travis.yml

@@ -3,16 +3,24 @@ language: ruby
 rvm:
   - 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
 

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>.

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', '< 7'
+  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_schemer', '~> 0.2.18'
-  spec.add_dependency 'activerecord', '>= 4.2.0', '< 7'
+  spec.add_dependency 'activerecord', '>= 4.2.0', '< 8'
 end

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/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module JSONValidator
-    VERSION = '2.0.1'
+    VERSION = '2.1.0'
   end
 end

data/spec/json_validator_spec.rb

@@ -4,107 +4,49 @@
 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
+        validates :data, json: { schema: schema, message: ->(errors) { errors.map { |error| error['details'].to_a.flatten.join(' ') } } }
       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: { format: 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(:schema_validator) { double(:schema_validator) }
-    let(:raw_errors) { double(:raw_errors) }
-    let(:validator_errors) { double(:validator_errors) }
+    context 'with valid JSON data but schema errors' do
+      let(:user) { User.new(data: '{"city":"Quebec City"}') }
 
-    before do
-      expect(validator).to receive(:schema).with(record).and_return(schema)
-      expect(JSONSchemer).to receive(:schema).with(schema, options[:options]).and_return(schema_validator)
-      expect(schema_validator).to receive(:validate).with(value).and_return(raw_errors)
-      expect(raw_errors).to receive(:to_a).and_return(validator_errors)
-    end
-
-    context 'with JSON Schemer 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)
+      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 'without JSON Schemer 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
-
-      specify { validate_each! }
-    end
-
-    context 'without JSON Schemer 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)
-      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
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_json_validator
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-07 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: '7'
+        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: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: phare
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        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: '7'
+        version: '8'
 description: ActiveRecord::JSONValidator makes it easy to validate JSON attributes
   with a JSON schema.
 email:
@@ -182,6 +182,7 @@ files:
 - 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