json_schema-faker 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ebcb70af9b5de9a47ba9a6a8d539add9631e80e
-  data.tar.gz: 8c7d300c7562ef22fa6d29788f53dd464f742cde
+  metadata.gz: 55f8ba801612ccb07d821cc0428a9909b3ddff4c
+  data.tar.gz: 7c4f071e4a7c0e0ba22025dc6d5334d7a6a3c32f
 SHA512:
-  metadata.gz: afea57d43a6f1862473597c5f4ec93ce9ae5a88f8abee2107b77b9d7c8c872544f098f0e4c2a62131e13ddcf8ebbd6de4a87c4657dcc3662e2ef83ad4f6228db
-  data.tar.gz: '09ee363bb4a24a32f8cd26f690335a0f25fe019b4e63ec6db4e311da07fe8e32a8370d6a13bc8e12c844c9d6e69d98b02fb2042e2873f874e4b40d2f071f6dec'
+  metadata.gz: '04390e5b4ab6c4a3a9782f32a55656465d6b0c4ecdfebd5507eca7cff91177acaa7ecc16eceb0d2be8e3773915dd156265530820693ccc713723ab2dcd02077b'
+  data.tar.gz: 664d28afe382ea2764198fab2a811129c78b01cbafae64b97668fb367ced53abdaa6db2fa0381c8ef6e6564d7644168731f1e9d2cf12fd8afe37a3d7e7043bfc

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.1
+
+* Fixed
+ * hint-example descending
+
 ## 0.6.0
 
 * Added

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

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

@@ -8,7 +8,7 @@ module JsonSchema::Faker::Strategy
         hint[:example].each.with_object({}) do |(key, value), hash|
           if value.is_a?(Hash)
             if schema.properties.has_key?(key)
-              hash[key] =  generate(schema.properties[key], hint: { example: hint[:example][key] }, position: "#{position}/#{key}")
+              hash[key] = generate(schema.properties[key], hint: { example: hint[:example][key] }, position: "#{position}/#{key}")
             else
               # TODO: support pattern properties
               hash[key] = value

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

@@ -18,6 +18,19 @@ module JsonSchema::Faker::Strategy
       end
     end
 
+    def hint_descend(hint, key)
+      if hint && hint[:example]
+        hint_without_example = hint.reject{|k,v|k == :example}
+        if hint[:example][key]
+          hint_without_example.merge(example: hint[:example][key])
+        else
+          hint_without_example
+        end
+      else
+        hint
+      end
+    end
+
     def call(schema, hint: nil, position:)
       if ::JsonSchema::Faker::Configuration.logger
         ::JsonSchema::Faker::Configuration.logger.debug "current position: #{position}"
@@ -56,7 +69,7 @@ module JsonSchema::Faker::Strategy
         hint[:example].each.with_object({}) do |(key, value), hash|
           if value.is_a?(Hash)
             if schema.properties.has_key?(key)
-              hash[key] =  generate(schema.properties[key], hint: { example: hint[:example][key] }, position: "#{position}/#{key}")
+              hash[key] = generate(schema.properties[key], hint: { example: hint[:example][key] }, position: "#{position}/#{key}")
             else
               # TODO: support pattern properties
               hash[key] = value
@@ -75,7 +88,7 @@ module JsonSchema::Faker::Strategy
         required_length = schema.min_properties || keys.length
 
         (keys - object.keys).each.with_object(object) do |key, hash|
-          hash[key] = generate(schema.properties[key], hint: hint, position: "#{position}/#{key}")
+          hash[key] = generate(schema.properties[key], hint: hint_descend(hint, key), position: "#{position}/#{key}")
         end
       else
         required_length = schema.min_properties || schema.max_properties || 0
@@ -84,7 +97,7 @@ module JsonSchema::Faker::Strategy
         keys -= hint[:not_have_keys] if hint && hint[:not_have_keys]
 
         keys.first(required_length).each.with_object(object) do |key, hash|
-          hash[key] = generate(schema.properties[key], hint: hint, position: "#{position}/#{key}")
+          hash[key] = generate(schema.properties[key], hint: hint_descend(hint, key), position: "#{position}/#{key}")
         end
       end
 
@@ -93,10 +106,10 @@ module JsonSchema::Faker::Strategy
         (required_length - object.keys.length).times.each.with_object(object) do |i, hash|
           if schema.pattern_properties.empty?
             key = (schema.properties.keys - object.keys).first
-            hash[key] = generate(schema.properties[key], hint: hint, position: "#{position}/#{key}")
+            hash[key] = generate(schema.properties[key], hint: hint_descend(hint, key), position: "#{position}/#{key}")
           else
             name = ::Pxeger.new(schema.pattern_properties.keys.first).generate
-            hash[name] = generate(schema.pattern_properties.values.first, hint: hint, position: "#{position}/#{name}")
+            hash[name] = generate(schema.pattern_properties.values.first, hint: hint_descend(hint, name), position: "#{position}/#{name}")
           end
         end
       else
@@ -112,7 +125,7 @@ module JsonSchema::Faker::Strategy
         # 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)
+            hash[additional_key] = generate(schema.properties[additional_key], hint: hint_descend(hint, additional_key), position: "#{position}/dependencies/#{key}/#{additional_key}") unless object.has_key?(additional_key)
           end
         end
       else

metadata

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