activerecord_json_validator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21b3da5123efa04feb0b954cb2300a241de8f091
-  data.tar.gz: ce13d50fd4ef460f12ed57ab732834133425e254
+  metadata.gz: 2333a21aa351ea4a53b99e11d40f48b9fb6fa145
+  data.tar.gz: d306555e99f6aa8fb57af47c616c75c6f7c4f43a
 SHA512:
-  metadata.gz: b47ebab5fb3d2d4575d2c659201d83e300d7627ece382276429bc0eb7e37a0c104976578a645e74c1a2eaf80a017dbc1de78f2f2dd5f9f38e8bc7989fb91756c
-  data.tar.gz: fd32b8a98506390f1fae3b3acb8dd4f073edf4c7ec60f3aaad8d1bd5703e1547c006f3cc4363ba3080facbf20f1383a16005a02b9764eb73e8fcc767eaea662b
+  metadata.gz: 163af0746e0533ebbf10a67d38583afc3a77107bbf248e10ea4dda9b4b463616ba3449a0613b4bca0744d71f304b45cd9a7cd981bc98ea596d944ce21baba507
+  data.tar.gz: 4f1635fc39554eda8e821bb81bde46d1df33762938e9b690ddfec2c72cf2541a9cac0eb285c8af6abf34702985779b4e7c095224d586c345468f3058a1be1504

data/.travis.yml

@@ -17,3 +17,6 @@ before_script:
   - psql -c 'create database activerecord_json_validator_test;' -U postgres
 
 script: "echo 'DO IT' && bundle exec rake spec"
+
+addons:
+  postgresql: 9.3

data/lib/active_record/json_validator/validator.rb

@@ -5,24 +5,13 @@ class JsonValidator < ActiveModel::EachValidator
     @attributes = options[:attributes]
 
     super
+
+    inject_setter_method(options[:class], @attributes) if options[:class]
   end
 
-  # Redefine the setter method for the attributes, since we want to
-  # catch any MultiJson::LoadError errors.
+  # Only respond to `#setup` if we’re in Rails 4.0 or less
   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
+    inject_setter_method(model, @attributes)
   end
 
   # Validate the JSON value with a JSON schema path or String
@@ -39,4 +28,24 @@ class JsonValidator < ActiveModel::EachValidator
       record.errors.add(attribute, options.fetch(:message), value: value)
     end
   end
+
+protected
+
+  # Redefine the setter method for the attributes, since we want to
+  # catch any MultiJson::LoadError errors.
+  def inject_setter_method(klass, attributes)
+    attributes.each do |attribute|
+      klass.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
 end

data/lib/active_record/json_validator/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module JSONValidator
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   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 # Change this to `t.json` when Travis supports PostgreSQL 9.2+
+        t.text :profile
       end
     end
 
@@ -27,21 +27,21 @@ describe JsonValidator do
 
   context 'with blank JSON value' do
     let(:attributes) { { name: 'Samuel Garneau', profile: {} } }
-    it { expect(User.new(attributes)).to_not be_valid }
+    it { expect(User.create(attributes)).to_not be_valid }
   end
 
   context 'with invalid JSON value' do
     let(:attributes) { { name: 'Samuel Garneau', profile: { city: 'Quebec City' } } }
-    it { expect(User.new(attributes)).to_not be_valid }
+    it { expect(User.create(attributes)).to_not be_valid }
   end
 
   context 'with valid JSON value' do
     let(:attributes) { { name: 'Samuel Garneau', profile: { country: 'CA' } } }
-    it { expect(User.new(attributes)).to be_valid }
+    it { expect(User.create(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 }
+    it { expect(User.create(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.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler