activerecord_json_validator 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e29421d6ac9835c09df419b687bdc6b018314d7c
-  data.tar.gz: 7aa8a0cb8c45e9869a245b3db8da51df08e28393
+  metadata.gz: 21b3da5123efa04feb0b954cb2300a241de8f091
+  data.tar.gz: ce13d50fd4ef460f12ed57ab732834133425e254
 SHA512:
-  metadata.gz: 43bc39dab8b9630be6bbfbf242b1e71374a51e59a192597b81eabe3751633c4b7f15f164f4bf728bee99aa3c1d376b6b40a6e6f913d2b393798efa97f3bedbcd
-  data.tar.gz: 97ca990aeb1785b15e0ce2db84b9301e26dea7267680f140dd2e22ddb2aab7e3bf0c7984dfae7947bf2e1cea5fad051bdbbfb621f6a64647e59620a5486bf9b9
+  metadata.gz: b47ebab5fb3d2d4575d2c659201d83e300d7627ece382276429bc0eb7e37a0c104976578a645e74c1a2eaf80a017dbc1de78f2f2dd5f9f38e8bc7989fb91756c
+  data.tar.gz: fd32b8a98506390f1fae3b3acb8dd4f073edf4c7ec60f3aaad8d1bd5703e1547c006f3cc4363ba3080facbf20f1383a16005a02b9764eb73e8fcc767eaea662b

data/Rakefile

@@ -9,3 +9,13 @@ desc 'Run all specs'
 RSpec::Core::RakeTask.new(:spec) do |task|
   task.pattern = 'spec/**/*_spec.rb'
 end
+
+desc 'Start an IRB session with the gem'
+task :console do
+  $:.unshift File.expand_path('..', __FILE__)
+  require 'activerecord_json_validator'
+  require 'irb'
+
+  ARGV.clear
+  IRB.start
+end

data/lib/active_record/json_validator/validator.rb

@@ -2,15 +2,40 @@ class JsonValidator < ActiveModel::EachValidator
   def initialize(options)
     options.reverse_merge!(message: :invalid_json)
     options.reverse_merge!(schema: nil)
+    @attributes = options[:attributes]
 
     super
   end
 
+  # Redefine the setter method for the attributes, since we want to
+  # catch any MultiJson::LoadError errors.
+  def setup(model)
+    @attributes.each do |attribute|
+      model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        define_method "#{attribute}=" do |args|
+          begin
+            @_#{attribute}_sane_json = true
+            super(args)
+          rescue MultiJson::LoadError
+            @_#{attribute}_sane_json = false
+            super({})
+          end
+        end
+      RUBY
+    end
+  end
+
+  # Validate the JSON value with a JSON schema path or String
   def validate_each(record, attribute, value)
-    json_value = JSON.dump(value)
+    begin
+      json_value = JSON.dump(value)
+    rescue JSON::GeneratorError
+      json_value = ''
+    end
+
     errors = ::JSON::Validator.fully_validate(options.fetch(:schema), json_value)
 
-    if errors.any?
+    if errors.any? || instance_variable_get(:"@_#{attribute}_sane_json") == false
       record.errors.add(attribute, options.fetch(:message), value: value)
     end
   end

data/lib/active_record/json_validator/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module JSONValidator
-    VERSION = '0.1'
+    VERSION = '0.1.1'
   end
 end

data/spec/json_validator_spec.rb

@@ -5,7 +5,7 @@ describe JsonValidator do
     run_migration do
       create_table(:users, force: true) do |t|
         t.string :name
-        t.text :profile
+        t.text :profile # Change this to `t.json` when Travis supports PostgreSQL 9.2+
       end
     end
 
@@ -39,4 +39,9 @@ describe JsonValidator do
     let(:attributes) { { name: 'Samuel Garneau', profile: { country: 'CA' } } }
     it { expect(User.new(attributes)).to be_valid }
   end
+
+  context 'with malformed JSON value' do
+    let(:attributes) { { name: 'Samuel Garneau', profile: 'foo:}bar' } }
+    it { expect(User.new(attributes)).to_not be_valid }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_json_validator
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler