activerecord_json_validator 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aefb212198c5482c5fcc13ac5617c07a0bf0ea0a
-  data.tar.gz: c96cd0fc7fd5ee1206a820b368cc7b820d3ce240
+SHA256:
+  metadata.gz: d9dce365377ebd51d3f5b8156e3cf928507014ed1278c0ca794675b4fecd3d2c
+  data.tar.gz: b1f58a7b215df70ff616dd80ee31dd24dd8fa0b0020189ee99318fb577a38621
 SHA512:
-  metadata.gz: 1f8335b9236577517e50934d4fb3cd356e64bcb07c70ffdb8fbed564e6abc35316a8aa6032eb07b914dd0f815cfbe86c11a317f79509bbe11a9b5fbb453f6ec6
-  data.tar.gz: 044eb0b74afe8a73799dcbc3e5c4a4d30f4b723ff3548afa9f99a262993cf22ccef3319f4d21575ee5b99d8be82fc2c762243b3db69063cbf426df2df2209e42
+  metadata.gz: 3b0f0f8e654453f06fd16d31324b8d3cfa069411e206cbc3b58575987984bda9ece9156411121d5202c701fd4dcece6ed5ab7b40eac5d5116a02f3347f2e0a4c
+  data.tar.gz: 355f0fec168526d3e881efb0b9ef5434089d2bc531adeb6f6dc9af61ea96dbb4a30600d744babd82dd57df2b6157d36a1d4e9ed837af902295d8419b7e5bfe91

data/.travis.yml

@@ -1,15 +1,25 @@
 language: ruby
 
 rvm:
-  - 2.2.2
-  - 2.3.1
+  - 2.4.6
+  - 2.6.3
 
 gemfile:
   - gemfiles/Gemfile.activerecord-4.2.x
   - gemfiles/Gemfile.activerecord-5.0.x
+  - gemfiles/Gemfile.activerecord-6.0.x
+
+matrix:
+  exclude:
+  - gemfile: gemfiles/Gemfile.activerecord-6.0.x
+    rvm: 2.4.6
 
 sudo: false
 
+services:
+  - mysql
+  - postgresql
+
 env:
   - DB_ADAPTER=mysql2
   - DB_ADAPTER=postgresql
@@ -21,6 +31,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/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

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   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', '< 7'
   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 'activerecord', '>= 4.2.0', '< 7'
 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/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)
@@ -61,6 +63,7 @@ protected
 
   def validatable_value(value)
     return value if value.is_a?(String)
+
     ::ActiveSupport::JSON.encode(value)
   end
 

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 = '1.3.0'
   end
 end

data/lib/activerecord_json_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'json-schema'
 

data/spec/json_validator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Metrics/BlockLength
 require 'spec_helper'
 
@@ -94,7 +96,7 @@ describe JsonValidator do
 
       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(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)
@@ -173,7 +175,7 @@ describe JsonValidator 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 +184,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_json_validator
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   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: '7'
 - !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: '6'
+        version: '7'
   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: '7'
 description: ActiveRecord::JSONValidator makes it easy to validate JSON attributes
   with a JSON schema.
 email:
@@ -181,6 +181,7 @@ files:
 - activerecord_json_validator.gemspec
 - gemfiles/Gemfile.activerecord-4.2.x
 - gemfiles/Gemfile.activerecord-5.0.x
+- gemfiles/Gemfile.activerecord-6.0.x
 - lib/active_record/json_validator/validator.rb
 - lib/active_record/json_validator/version.rb
 - lib/activerecord_json_validator.rb
@@ -210,8 +211,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.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord::JSONValidator makes it easy to validate JSON attributes with