json_test_data 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac719ac362b258edeb0f24b3b1881fbf22cf6a7e
-  data.tar.gz: 574370a7adcc59916a5511eddaffc0e7b9cae0c2
+  metadata.gz: 4c5f6f0377bba24e8f816a1f8b3b327e144822d1
+  data.tar.gz: f53bf688aa2652360877105f3f1024d6a165df52
 SHA512:
-  metadata.gz: 231e12051d09c67f053cffed733bda7df18be80e248808ef91677ad0ea9f924fd3b4b6c194998e9de1cedf4ac196b360a8a13d34b58a6c5ec6d1a088ffc6abe9
-  data.tar.gz: 3ef5d40037be62780f5037e43e001e31bc4be49f3d5639e549a0661d3226bde01a2361e3743916b2cfab4315cd887de4cccf0eec97ddb99b59d27a550ea9cd42
+  metadata.gz: 31f89873ed4f158663b44f77f89f8b42ef23ec177e28a938471e71bb08febe2a4dc6551ab68c4d72423f38119e8ba23428ae48c7d396ff0ec29dc2c8f9c1df6c
+  data.tar.gz: cf50baf1ce792786b37bce046a8de4a142587773eb24dbe93cd9e413d3c952bf799b9b9d94b31264ba23d8586eafcc52133b1393f44cf75234d6017bf809c7ce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_test_data (0.9.0)
+    json_test_data (1.0.0)
       regexp-examples (~> 1.2)
 
 GEM

data/features/conditional_properties.feature

@@ -0,0 +1,76 @@
+Feature: Assign values conditionally
+  Scenario: Multiple schemas inline
+    Given the following JSON schema:
+      """
+      {
+        "$schema": "http://json-schema.org/draft-04/schema#",
+        "type": "object",
+        "oneOf": [
+          {
+            "required": [ "foo", "bar" ],
+            "properties": {
+              "foo": { "type": "string" },
+              "bar": { "type": "integer" }
+            }
+          },
+          {
+            "required": [ "baz", "qux" ],
+            "properties": {
+              "baz": { "type": "string" },
+              "qux": { "type": "string" }
+            }
+          }
+        ]
+      }
+      """
+    When I run the JSON data generator
+    Then the output should match the schema
+
+  Scenario: Multiple schemas with refs
+    Given the following JSON schema:
+      """
+      {
+        "$schema": "http://json-schema.org/draft-04/schema#",
+        "type": "object",
+        "oneOf": [
+          { "$ref": "#/definitions/californiaAddress" },
+          { "$ref": "#/definitions/floridaAddress"}
+        ],
+        "definitions": {
+          "californiaAddress": {
+            "required": [ "city", "state" ],
+            "properties": {
+              "city": {
+                "type": "string",
+                "enum": [
+                  "San Diego",
+                  "Los Angeles"
+                ]
+              },
+              "state": {
+                "type": "string",
+                "enum": [ "CA" ]
+              }
+            }
+          },
+          "floridaAddress": {
+            "required": [ "city", "state" ],
+            "properties": {
+              "city": {
+                "type": "string",
+                "enum": [
+                  "Miami",
+                  "Orlando"
+                ]
+              },
+              "state": {
+                "type": "string",
+                "enum": [ "FL" ]
+              }
+            }
+          }
+        }
+      }
+      """
+    When I run the JSON data generator
+    Then the output should match the schema

data/lib/json_test_data.rb

@@ -1,7 +1,7 @@
-require 'json'
-require 'regexp-examples'
+require "json"
+require "regexp-examples"
 
-require_relative './json_test_data/json_schema'
+require_relative "./json_test_data/json_schema"
 
 module JsonTestData
   def self.generate!(schema, opts={})

data/lib/json_test_data/json_schema.rb

@@ -45,9 +45,24 @@ module JsonTestData
         property.fetch(:type, nil) == "array"
       end
 
+      def resolve_ref(object, ref)
+        ref = ref.split("/").map(&:to_sym)[1..-1]
+        ref.each {|key| object = object.fetch(key) }
+        object
+      end
+
+      def set_object(obj, schema)
+        schema.has_key?(:"$ref") ? resolve_ref(obj, schema.fetch(:"$ref")) : schema
+      end
+
       def generate_object(object)
         obj = {}
 
+        if object.has_key?(:oneOf)
+          schema_to_be_used = object.fetch(:oneOf).sample
+          object = set_object(object, schema_to_be_used)
+        end
+
         if object.has_key?(:properties)
           object.fetch(:properties).each do |k, v|
             obj[k]  = nil unless v.has_key?(:type)

data/spec/json_test_data/json_schema_spec.rb

@@ -60,7 +60,6 @@ describe JsonTestData::JsonSchema do
 
     describe "bigger examples" do
       context "when schema describes an object" do
-
         let(:schema) do
           {
             :"$schema"  => "http://json-schema.org/draft-04/schema#",
@@ -108,6 +107,69 @@ describe JsonTestData::JsonSchema do
       end
     end
 
+    describe "multiple possible schemas" do
+      let(:schema) do
+        {
+          :"$schema" => "http://json-schema.org/draft-04/schema#",
+          :type      => "object",
+          :oneOf     => [
+            { :"$ref" => "#/definitions/foo" },
+            { :"$ref" => "#/definitions/bar" }
+          ],
+          :definitions => {
+            :foo => {
+              :type => "object",
+              :required => [ "name", "age" ],
+              :properties => {
+                :name => { :type => "string", :enum => [ "Foo" ] },
+                :age => { :type => "integer" }
+              }
+            },
+            :bar => {
+              :type => "object",
+              :required => [ "first_name", "last_name" ],
+              :properties => {
+                :first_name => { :type => "string", :enum => [ "Bar" ] },
+                :last_name => { :type => "string" }
+              }
+            }
+          }
+        }.to_json
+      end
+
+      let(:foo_schema) do
+        {
+          :type => "object",
+          :required => [ "name", "age" ],
+          :properties => {
+            :name => { :type => "string", :enum => [ "Foo" ] },
+            :age => { :type => "integer" }
+          }
+        }.to_json
+      end
+
+      let(:bar_schema) do
+        {
+          :type => "object",
+          :required => [ "first_name", "last_name" ],
+          :properties => {
+            :first_name => { :type => "string", :enum => [ "Bar" ] },
+            :last_name => { :type => "string" }
+          }
+        }
+      end
+
+      it "generates an object" do
+        output = JsonTestData::JsonSchema.new(schema).generate_example
+        expect(JSON.parse(output)).to be_a Hash
+      end
+
+      it "matches one of the given schemas" do
+        output = JsonTestData::JsonSchema.new(schema).generate_example
+        expect(JSON.parse(output)).to match_one_of([foo_schema, bar_schema])
+      end
+    end
+
     describe "data type support" do
       context "numbers" do
 

data/spec/matchers/json_schema_matchers.rb

@@ -1,8 +1,14 @@
 require "rspec/expectations"
 require "json-schema"
 
-RSpec::Matchers.define :match_schema do |expected|
+RSpec::Matchers.define :match_schema do |schema|
   match do |actual|
-    JSON::Validator.validate(expected, actual)
+    JSON::Validator.validate!(schema, actual)
+  end
+end
+
+RSpec::Matchers.define :match_one_of do |schemas|
+  match do |actual|
+    JSON::Validator.validate(schemas[0], actual) || JSON::Validator.validate(schemas[1], actual)
   end
 end

data/version.rb

@@ -1,3 +1,3 @@
 module JsonTestData
-  VERSION = '0.9.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_test_data
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Dana Scheider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regexp-examples
@@ -125,6 +125,7 @@ files:
 - README.md
 - Rakefile
 - features/array_constraints.feature
+- features/conditional_properties.feature
 - features/data_types.feature
 - features/generate_data.feature
 - features/generate_empty_objects.feature
@@ -173,9 +174,10 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: json_test_data-0.9.0
+summary: json_test_data-1.0.0
 test_files:
 - features/array_constraints.feature
+- features/conditional_properties.feature
 - features/data_types.feature
 - features/generate_data.feature
 - features/generate_empty_objects.feature