activerecord_json_validator 0.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e916b93c42c1f418b5138f0680f1f3c6da4caca6
-  data.tar.gz: 891634217d8bf1d6430a919500bc05e0559e058a
+  metadata.gz: e122734c159cf841ab43d38bdc6efd2e4d554605
+  data.tar.gz: 96c99ba0cde8902483245991ccab6b2bc03870d6
 SHA512:
-  metadata.gz: dcb7b8ae91f3eca385eab1d8480b9ad60072c6f5ec9cf777565e5279db47946a17f8c280deae9972fdeec22e3e81caa7fc221dee89d19cc1a821b27d7729fd74
-  data.tar.gz: 3eeda53bedb220bd51ea5cacf5e476cb6875acb8ef83fc78222f74e436ca4c3d89cd119544c904edae98a53e76cddd643a339b5654a8335acbc4fd20872c9e77
+  metadata.gz: 3d060208f9aebadac25bd9b6c3a72db71eb689e775c9a3be343c45f05d0e5d7a5e36c4b91a6341b2823c3b6b7bce7a2c2efe7a3b1972a0b4d97a618b3da2a759
+  data.tar.gz: 5aff819411acfe4a894c3e5f4d6422f7ffdef61c78cf07b8551025c8b7d0ab6794ed51283e9d90a1f4c479c32fe65622e2c548fd526ef7e2f0059ed560d04a72

data/lib/active_record/json_validator/validator.rb

@@ -56,11 +56,16 @@ protected
     end
   end
 
-  def schema(record)
-    schema = options.fetch(:schema)
-    return schema unless schema.is_a?(Proc)
+  # Return a valid schema for JSON::Validator.fully_validate, recursively calling
+  # itself until it gets a non-Proc/non-Symbol value.
+  def schema(record, schema = nil)
+    schema ||= options.fetch(:schema)
 
-    record.instance_exec(&schema)
+    case schema
+      when Proc then schema(record, record.instance_exec(&schema))
+      when Symbol then schema(record, record.send(schema))
+      else schema
+    end
   end
 
   def validatable_value(value)

data/lib/active_record/json_validator/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module JSONValidator
-    VERSION = '0.5'
+    VERSION = '0.5.1'
   end
 end

data/spec/json_validator_spec.rb

@@ -93,25 +93,47 @@ describe JsonValidator do
     let(:options) { { attributes: [:foo], schema: schema_option } }
     let(:schema) { validator.send(:schema, record) }
 
-    context 'with non-Proc schema' do
+    context 'with String schema' do
       let(:schema_option) { double(:schema) }
       let(:record) { double(:record) }
 
       it { expect(schema).to eql(schema_option) }
     end
 
-    context 'with Proc schema' do
+    context 'with Proc schema returning a Proc returning a Proc' do
       let(:schema_option) { -> { dynamic_schema } }
       let(:record) { record_class.new }
       let(:record_class) do
         Class.new do
           def dynamic_schema
-            :yay
+            -> { another_dynamic_schema }
+          end
+
+          def another_dynamic_schema
+            -> { what_another_dynamic_schema }
+          end
+
+          def what_another_dynamic_schema
+            'yay'
+          end
+        end
+      end
+
+      it { expect(schema).to eql('yay') }
+    end
+
+    context 'with Symbol schema' do
+      let(:schema_option) { :dynamic_schema }
+      let(:record) { record_class.new }
+      let(:record_class) do
+        Class.new do
+          def dynamic_schema
+            'foo'
           end
         end
       end
 
-      it { expect(schema).to eql(:yay) }
+      it { expect(schema).to eql('foo') }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_json_validator
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler