json_schema-faker 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfafb79a64676037970d45ea495b3c5dd601ba44
-  data.tar.gz: c5e69abcb15a816b5e90ee5cd9c08752082ab8f5
+  metadata.gz: 86004c55c41bf6565a1352415755ad096271acc1
+  data.tar.gz: 7bd049df4f6b5fcf5d9d6b0eb9ac7e3903420690
 SHA512:
-  metadata.gz: 96ef98bb3d841808674fdbe71d4e7781604f3aba3e731696ef7eebb181a0051091fd98bec9dbe9f273229508b3a0b893e90a87d3a0f13d3a673f30a11b8d6c64
-  data.tar.gz: fa77f0ea527055174ad18b868029f597f07652e41daed123710c25f6c7f8985209f00111abdd85e40f5bde46a8c80e0bb20a0d1f94bd8781b0fac337d12f9564
+  metadata.gz: cf5aa0f7718587a6f509bb436b8c7830a9aeb8eab5ec8b7bbee1269ecb39641ea774a2d592fd0ddcaf9085ce1892e0accf7af81afda0a5150d8610e34d0ddc18
+  data.tar.gz: e5ebca434d25c2ecae25f77f49a363bbe406bcecee211614674f760a495d22acef38195fc7e1747e1b9111ae23a9e9c0cce6e8651fa90064d48b8287b7ee6a26

data/CHANGELOG.md

@@ -1,7 +1,16 @@
+## 0.5.2
+
+* Added
+  * support of schema dependency for JsonSchema::Faker::Strategy::Simple
+  * validate default and return only if valid
+* Fixed
+  * fixes bug of disruption in JsonSchema::Faker::Util.take_logical_and_of_schema
+  * fixes bug of not merged in JsonSchema::Faker::Strategy::Simple#compact_schema
+
 ## 0.5.1
 
 * Added
- * support for copying pattern in take_logical_and_of_schema
+  * support for copying pattern in take_logical_and_of_schema
 
 ## 0.5.0
 

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/json_schema/faker/strategy/simple.rb

@@ -22,7 +22,7 @@ module JsonSchema::Faker::Strategy
       ::JsonSchema::Faker::Configuration.logger.debug schema.inspect_schema if ::JsonSchema::Faker::Configuration.logger
       schema = compact_schema(schema, position: position)
 
-      return schema.default if schema.default
+      return schema.default if schema.default && schema.validate(schema.default).first
       return self.class.formats[schema.format].call(schema, hint: hint, position: position) if self.class.formats.has_key?(schema.format)
 
       if schema.not
@@ -100,19 +100,27 @@ module JsonSchema::Faker::Strategy
 
       # consider dependency
       depended_keys = object.keys & schema.dependencies.keys
+      if depended_keys.all? {|key| schema.dependencies[key].is_a?(Array) }
+        # FIXME: circular dependency is not supported
+        depended_keys.each.with_object(object) do |key, hash|
+          schema.dependencies[key].each do |additional_key|
+            hash[additional_key] = generate(schema.properties[additional_key], hint: hint, position: "#{position}/dependencies/#{key}/#{additional_key}") unless object.has_key?(additional_key)
+          end
+        end
+      else
+        ::JsonSchema::Faker::Configuration.logger.info "generate again because of dependended keys exists: #{depended_keys}" if ::JsonSchema::Faker::Configuration.logger
 
-      # FIXME: circular dependency is not supported
-      depended_keys.each.with_object(object) do |key, hash|
-        dependency = schema.dependencies[key]
-
-        if dependency.is_a?(::JsonSchema::Schema)
-          # too difficult we just merge
-          hash.update(generate(schema.dependencies[key], hint: nil, position: "#{position}/dependencies/#{key}"))
-        else
-          dependency.each do |additional_key|
-            object[additional_key] = generate(schema.properties[additional_key], hint: hint, position: "#{position}/dependencies/#{key}/#{additional_key}") unless object.has_key?(additional_key)
+        merged_schema = ::JsonSchema::Schema.new.tap {|s| s.copy_from(schema) }
+        depended_keys.each do |key|
+          dependency = schema.dependencies[key]
+          if dependency.is_a?(::JsonSchema::Schema)
+            merged_schema = compact_schema(take_logical_and_of_schema(merged_schema, dependency), position: position)
+          else
+            merged_schema.required = (merged_schema.required + dependency).uniq
           end
         end
+        merged_schema.dependencies = nil # XXX: recursive dependency will fail
+        generate_for_object(merged_schema, hint: hint, position: position)
       end
     end
 
@@ -248,7 +256,7 @@ module JsonSchema::Faker::Strategy
           end
         end
 
-        merged_schema = unless schema.one_of.empty? && schema.any_of.empty?
+        unless schema.one_of.empty? && schema.any_of.empty?
           ::JsonSchema::Faker::Configuration.logger.info "find from one_of and any_of which satiffy all_of" if ::JsonSchema::Faker::Configuration.logger
           one_of_candidate = schema.one_of.find do |s|
             s2 = take_logical_and_of_schema(s, all_of)
@@ -262,13 +270,13 @@ module JsonSchema::Faker::Strategy
 
           unless one_of_candidate || any_of_candidate
             ::JsonSchema::Faker::Configuration.logger.error "failed to find condition which satfisfy all_of in one_of and any_of" if ::JsonSchema::Faker::Configuration.logger
-            take_logical_and_of_schema(merged_schema, all_of, a_position: position, b_position: "#{position}/all_of")
+            merged_schema = take_logical_and_of_schema(merged_schema, all_of, a_position: position, b_position: "#{position}/all_of")
           else
-            take_logical_and_of_schema(merged_schema, one_of_candidate, a_position: position, b_position: "#{position}/one_of") if one_of_candidate
-            take_logical_and_of_schema(merged_schema, any_of_candidate, a_position: position, b_position: "#{position}/any_of") if any_of_candidate
+            merged_schema = take_logical_and_of_schema(merged_schema, one_of_candidate, a_position: position, b_position: "#{position}/one_of") if one_of_candidate
+            merged_schema = take_logical_and_of_schema(merged_schema, any_of_candidate, a_position: position, b_position: "#{position}/any_of") if any_of_candidate
           end
         else
-          take_logical_and_of_schema(merged_schema, all_of, a_position: position, b_position: "#{position}/all_of")
+          merged_schema = take_logical_and_of_schema(merged_schema, all_of, a_position: position, b_position: "#{position}/all_of")
         end
       else
         unless schema.one_of.empty?

data/lib/json_schema/faker/util.rb

@@ -82,8 +82,11 @@ class JsonSchema::Faker
       if b.items
         if a.items
           if a.items.is_a?(Array) && b.items.is_a?(Array)
-            [ a.items.size, b.items.size ].max.times do |i|
-              ai, bi = a.items[i], b.items[i]
+            original_a_items = a.items
+            a.items = [] # avoid disruptive
+            [ original_a_items.size, b.items.size ].max.times do |i|
+              # XXX:
+              ai, bi = original_a_items[i], b.items[i]
               if ai && bi
                 a.items[i] = take_logical_and_of_schema(ai, bi)
               else
@@ -143,8 +146,10 @@ class JsonSchema::Faker
       end
       # properties
       if !b.properties.empty?
-        ( a.properties.keys + b.properties.keys ).uniq.each do |key|
-          a.properties[key] = take_logical_and_of_schema(a.properties[key], b.properties[key])
+        original_a_properties = a.properties
+        a.properties = {} # avoid disruptive
+        ( original_a_properties.keys + b.properties.keys ).uniq.each do |key|
+          a.properties[key] = take_logical_and_of_schema(original_a_properties[key], b.properties[key])
         end
       end
       # additionalProperties, patternProperties, dependencies

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema-faker
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - okitan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema