activerecord_json_validator 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de25bab4216c8a05a29a0383db78dff2940a0758
-  data.tar.gz: dd70493947020e865ca313d334c0a85b3dc43835
+  metadata.gz: 22cf2432dfb4427ba383de56c603a6ab9a02ff74
+  data.tar.gz: eb005d90645dcf4e6471d7bd784523d67146418d
 SHA512:
-  metadata.gz: c01dbb7d8ee0cf98794ad9111eed29109b67f89dce709e62d4cccb9007c3c06661cdcf56384a5d1a738f10d6d98dd748147d80c4666b8d2c011891e961e1eadb
-  data.tar.gz: 017034733e383eddb894ef52b1728ecd0fa6ad7d31731cf48fa464dbd2abede7057e9b401fda4bc6ce06643f755cf7d4b64144250d07a82317793f7176d43c5d
+  metadata.gz: 637ba361b8d482dbe0edea5e27a96a815af724b9cfa5a2cdf7504d0f7f64a26b0e82e3228ad34a044b3e5ea64129f36556889dfa23a6a8d01d22830feb706705
+  data.tar.gz: 910b92a51b66a283b60a15d79854ca58c05104c786de9d0a7a578e21c9ef782c5a5e0bba46ef88df12aed68d5a80f6ec03e71156e4610751cd16dee254a05461

data/.travis.yml

@@ -1,13 +1,14 @@
 language: ruby
 
 rvm:
-  - 2.0.0
-  - 1.9.3
+  - 2.2
+  - 2.1
 
 gemfile:
-  - gemfiles/Gemfile.activerecord-4.1.0.beta1
-  - gemfiles/Gemfile.activerecord-4.0
-  - gemfiles/Gemfile.activerecord-3.2.x
+  - gemfiles/Gemfile.activerecord-4.2.x
+  - gemfiles/Gemfile.activerecord-4.1.x
+
+sudo: false
 
 env:
   - DB_ADAPTER=mysql2

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Mirego
+Copyright (c) 2013-2015, Mirego
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -2,9 +2,8 @@
 
 `ActiveRecord::JSONValidator` makes it easy to validate JSON attributes against a JSON schema.
 
-<a href="https://rubygems.org/gems/activerecord_json_validator"><img src="https://badge.fury.io/rb/activerecord_json_validator.png" /></a>
-<a href="https://travis-ci.org/mirego/activerecord_json_validator"><img src="https://travis-ci.org/mirego/activerecord_json_validator.png?branch=master" /></a>
-<a href='https://coveralls.io/r/mirego/activerecord_json_validator?branch=master'><img src='https://coveralls.io/repos/mirego/activerecord_json_validator/badge.png?branch=master' alt='Coverage Status' /></a>
+[![Gem Version](http://img.shields.io/gem/v/activerecord_json_validator.svg)](https://rubygems.org/gems/activerecord_json_validator)
+[![Build Status](http://img.shields.io/travis/mirego/activerecord_json_validator.svg)](https://travis-ci.org/mirego/activerecord_json_validator)
 
 ## Installation
 
@@ -39,7 +38,7 @@ end
 
 class User < ActiveRecord::Base
   # Constants
-  PROFILE_JSON_SCHEMA = Rails.root.join('config', 'schemas', 'profile.json_schema')
+  PROFILE_JSON_SCHEMA = Rails.root.join('config', 'schemas', 'profile.json_schema').to_s
 
   # Validations
   validates :name, presence: true
@@ -51,11 +50,15 @@ user.valid? # => false
 
 user = User.new(name: 'Samuel Garneau', profile: { city: 'Quebec City', country: 'Canada' })
 user.valid? # => true
+
+user = User.new(name: 'Samuel Garneau', profile: '{invalid JSON":}')
+user.valid? # => false
+user.profile_invalid_json # => '{invalid JSON":}'
 ```
 
 ## License
 
-`ActiveRecord::JSONValidator` is © 2013 [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-2015 [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.
 
 ## About Mirego
 

data/activerecord_json_validator.gemspec

@@ -20,13 +20,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'mysql2'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'activesupport', '>= 3.0.0'
+  spec.add_development_dependency 'activesupport', '>= 4.1.0', '< 5'
 
-  spec.add_dependency 'json-schema', '~> 2.1'
-  spec.add_dependency 'activerecord', '>= 3.0.0'
+  spec.add_dependency 'json-schema', '~> 2.5'
+  spec.add_dependency 'activerecord', '>= 4.1.0', '< 5'
   spec.add_dependency 'multi_json', '~> 1.8.2'
 end

data/gemfiles/{Gemfile.activerecord-3.2.x → Gemfile.activerecord-4.1.x}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'activerecord', '~> 3.2.0'
+gem 'activerecord', '~> 4.1'

data/gemfiles/{Gemfile.activerecord-4.0 → Gemfile.activerecord-4.2.x}

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

data/lib/active_record/json_validator/validator.rb

@@ -30,7 +30,7 @@ class JsonValidator < ActiveModel::EachValidator
 
     errors = ::JSON::Validator.fully_validate(options.fetch(:schema), json_value)
 
-    if errors.any? || instance_variable_get(:"@_#{attribute}_sane_json") == false
+    if errors.any? || record.send(:"#{attribute}_invalid_json").present?
       record.errors.add(attribute, options.fetch(:message), value: value)
     end
   end
@@ -42,13 +42,16 @@ protected
   def inject_setter_method(klass, attributes)
     attributes.each do |attribute|
       klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        attr_reader :"#{attribute}_invalid_json"
+
         define_method "#{attribute}=" do |args|
           begin
-            @_#{attribute}_sane_json = true
+            @#{attribute}_invalid_json = nil
+            args = ::ActiveSupport::JSON.decode(args) if args.is_a?(::String)
             super(args)
           rescue MultiJson::LoadError, JSON::ParserError
-            @_#{attribute}_sane_json = false
-            super({})
+            @#{attribute}_invalid_json = args
+            super(invalid_json: true)
           end
         end
       RUBY

data/lib/active_record/json_validator/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module JSONValidator
-    VERSION = '0.2'
+    VERSION = '0.3'
   end
 end

data/spec/json_validator_spec.rb

@@ -25,23 +25,43 @@ describe JsonValidator do
     end
   end
 
+  let(:user) { User.create(attributes) }
+
   context 'with blank JSON value' do
     let(:attributes) { { name: 'Samuel Garneau', profile: {} } }
-    it { expect(User.create(attributes)).to_not be_valid }
+    it { expect(user).to_not be_valid }
   end
 
   context 'with invalid JSON value' do
-    let(:attributes) { { name: 'Samuel Garneau', profile: { city: 'Quebec City' } } }
-    it { expect(User.create(attributes)).to_not be_valid }
+    context 'as Ruby Hash' do
+      let(:attributes) { { name: 'Samuel Garneau', profile: { city: 'Quebec City' } } }
+      it { expect(user).to_not be_valid }
+    end
+
+    context 'as JSON string' do
+      let(:attributes) { { name: 'Samuel Garneau', profile: '{ "city": "Quebec City" }' } }
+      it { expect(user).to_not be_valid }
+    end
   end
 
   context 'with valid JSON value' do
-    let(:attributes) { { name: 'Samuel Garneau', profile: { country: 'CA' } } }
-    it { expect(User.create(attributes)).to be_valid }
+    context 'as Ruby Hash' do
+      let(:attributes) { { name: 'Samuel Garneau', profile: { country: 'CA' } } }
+      it { expect(user).to be_valid }
+    end
+
+    context 'as JSON string' do
+      let(:attributes) { { name: 'Samuel Garneau', profile: '{ "country": "CA" }' } }
+      it { expect(user).to be_valid }
+    end
   end
 
-  context 'with malformed JSON value' do
+  context 'with malformed JSON string' do
     let(:attributes) { { name: 'Samuel Garneau', profile: 'foo:}bar' } }
-    it { expect(User.create(attributes)).to_not be_valid }
+
+    specify do
+      expect(user).to_not be_valid
+      expect(user.profile_invalid_json).to eql('foo:}bar')
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
 $:.unshift File.expand_path('../lib', __FILE__)
 
-require 'coveralls'
-Coveralls.wear!
-
 require 'active_support/all'
 require 'rspec'
 require 'mysql2'

metadata

@@ -1,153 +1,151 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_json_validator
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
 description: ActiveRecord::JSONValidator makes it easy to validate JSON attributes
@@ -158,17 +156,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
 - activerecord_json_validator.gemspec
-- gemfiles/Gemfile.activerecord-3.2.x
-- gemfiles/Gemfile.activerecord-4.0
-- gemfiles/Gemfile.activerecord-4.1.0.beta1
+- gemfiles/Gemfile.activerecord-4.1.x
+- gemfiles/Gemfile.activerecord-4.2.x
 - lib/active_record/json_validator/validator.rb
 - lib/active_record/json_validator/version.rb
 - lib/activerecord_json_validator.rb
@@ -189,17 +186,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord::JSONValidator makes it easy to validate JSON attributes with

data/gemfiles/Gemfile.activerecord-4.1.0.beta1

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