json_schema-faker 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7ebcb70af9b5de9a47ba9a6a8d539add9631e80e
-  data.tar.gz: 8c7d300c7562ef22fa6d29788f53dd464f742cde
+SHA256:
+  metadata.gz: a4f6fbdc7ca4c32a0a702ccfb5736acbcdefc121f6498deebd896ab80e1d723e
+  data.tar.gz: 7891a2f2e045b2e12bbb2d0766bd5fb0ee852665d814d2b72da16990b25596bb
 SHA512:
-  metadata.gz: afea57d43a6f1862473597c5f4ec93ce9ae5a88f8abee2107b77b9d7c8c872544f098f0e4c2a62131e13ddcf8ebbd6de4a87c4657dcc3662e2ef83ad4f6228db
-  data.tar.gz: '09ee363bb4a24a32f8cd26f690335a0f25fe019b4e63ec6db4e311da07fe8e32a8370d6a13bc8e12c844c9d6e69d98b02fb2042e2873f874e4b40d2f071f6dec'
+  metadata.gz: 53041ee71b24a655fb688813223f21ebb441cb829610421f322fd5a3470ed4ccc53b208ee48b798033f03812f04012569d826f1011fcc9cb9f80f9d723aa691f
+  data.tar.gz: 14b6f30ccb927e521aaf129c856ba1e2396a289a250dd9c2a63c876e154772343a7dab4a9ec4062f00f211752773c043874377364018f53a7e620668a27f7e11

data/CHANGELOG.md

@@ -1,50 +1,60 @@
+## 0.6.2
+
+- Fixed
+  - #16
+
+## 0.6.1
+
+- Fixed
+- hint-example descending
+
 ## 0.6.0
 
-* Added
- * support of default faker against format
- * support for copying format in take_logical_and_of_schema
+- Added
+- support of default faker against format
+- support for copying format in take_logical_and_of_schema
 
 ## 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
+- 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
+- Added
+  - support for copying pattern in take_logical_and_of_schema
 
 ## 0.5.0
 
-* Added
-  * ::JsonSchema::Faker::Util. utility for json_schema
-* Removed
-  * ::JsonSchema::Faker::Strategy::Simple.merge_schema! is removed. use ::JsonSchema::Faker::Util.take_logical_and_of_schema instead.
+- Added
+  - ::JsonSchema::Faker::Util. utility for json_schema
+- Removed
+  - ::JsonSchema::Faker::Strategy::Simple.merge_schema! is removed. use ::JsonSchema::Faker::Util.take_logical_and_of_schema instead.
 
 ## 0.4.0
 
-* Added
-  * Greedy strategy to use properties as much as possible (suitable to response generation)
+- Added
+  - Greedy strategy to use properties as much as possible (suitable to response generation)
 
 ## 0.3.0
 
-* Added
-  * can add faker to format
+- Added
+  - can add faker to format
 
 ## 0.2.0
 
-* Added
-  * support example as hint
+- Added
+  - support example as hint
 
 ## 0.1.1
 
-* Added
-  * refactor and improve generation
+- Added
+  - refactor and improve generation
 
 ## 0.1.0
 
-* initial release
+- initial release

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.2

data/json_schema-faker.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pxeger"
   spec.add_dependency "faker"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
 
   # test

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

data/lib/json_schema/faker/util.rb

@@ -105,7 +105,7 @@ class JsonSchema::Faker
         a.additonal_items = false
       else
         if b.additional_items.is_a?(::JsonSchema::Schema)
-          if a.additional_items.is_a?(::JsonSchem::Schema)
+          if a.additional_items.is_a?(::JsonSchema::Schema)
             ::JsonSchema::Faker::Configuration.logger.warn "not support merging additionalItems" if ::JsonSchema::Faker::Configuration.logger
           else
             a.additional_items = b.additional_items
@@ -157,7 +157,7 @@ class JsonSchema::Faker
         a.additional_properties = false
       else
         if b.additional_properties.is_a?(::JsonSchema::Schema)
-          if a.additional_properties.is_a?(::JsonSchem::Schema)
+          if a.additional_properties.is_a?(::JsonSchema::Schema)
             ::JsonSchema::Faker::Configuration.logger.warn "not support merging additionalProperties" if ::JsonSchema::Faker::Configuration.logger
           else
             a.additional_properties = b.additional_properties

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.2
 platform: ruby
 authors:
 - okitan
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ homepage: https://github.com/okitan/json_schema-faker
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -212,9 +212,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: generate fake data from json schema
 test_files: []