json_schema_spec 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61fb32a305dd4fdda20ea2a77787c185ff963fe4
-  data.tar.gz: 21305c280d00e355f899a99bdea50a69e40871b0
+  metadata.gz: 9c87d49db81067b8235d03f460077e16c9814a11
+  data.tar.gz: 2e2131f2ad7437e560b9d649acd0e0d7b3298ada
 SHA512:
-  metadata.gz: 9ea8a4f73760b9b45adb79243d0c23c6c53af6eaf527abab84b6471bbc0cc8112b61e2ab6433544c5ef84e7e994f351e7663c07565c8fa0feb570ccbc2d84bfc
-  data.tar.gz: c96b0c7d2fe7f7297d627513985fa958e1e813696f75a419d313eadf83cdab93b7afcea0b0a96c7310859dd3c665fd69117ff707af69b2268c1c7d5916be2735
+  metadata.gz: 5fdaf374bfeac077a0e6e001b6ed4bc9c012f84952ed75807ee8119f2f7b05c16675219885e124499f180a6f827218b4d064d50c1e4d31508c03ff7d13f064bd
+  data.tar.gz: 9309777d164ec18f1f564bb20d7c7060a56b85d355699620374156fca8c24818789b7e8385989b35ec1ce41db9ea17cb52fecb7ad68bf29f01cc3d69889cfb52

data/json_schema_spec.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "json_schema_spec"
-  spec.version       = "0.1.2"
+  spec.version       = "0.1.3"
   spec.authors       = ["Winton Welsh"]
   spec.email         = ["mail@wintoni.us"]
   spec.description   = %q{Generate fixtures from JSON schemas.}

data/lib/json_schema_spec.rb

@@ -29,9 +29,10 @@ module JsonSchemaSpec
   end
 
   def json_schema_params(resource, method, merge={})
-    schema = json_schema(resource, method)
-    params = json_schema_to_params(schema)
-    params = Util.deep_merge(params, merge)
+    required = merge[:required]
+    schema   = json_schema(resource, method)
+    params   = json_schema_to_params(schema, required: required)
+    params   = Util.deep_merge(params, merge)
 
     unless merge.empty?
       validate_json_schema(resource, method, params)
@@ -41,29 +42,36 @@ module JsonSchemaSpec
     [ params[:request], params[:response] ]
   end
 
-  def json_schema_to_params(schema, prefix=[])
+  def json_schema_to_params(schema, options={})
     return schema  unless schema.is_a?(Hash)
     
     schema.inject({}) do |memo, (key, value)|
-      memo[key] = json_schema_value(key, value, prefix.dup)
+      memo[key] = json_schema_value(key, value, options)
       memo.delete(key)  unless memo[key]
       memo
     end
   end
 
-  def json_schema_value(key, value, prefix)
-    if !value.is_a?(Hash) || value[:optional] || value[:type] == 'null'
+  def json_schema_value(key, value, options={})
+    prefix   = options[:prefix] || []
+    prefix   = prefix.dup  if prefix
+
+    required = options[:required] || []
+    required = [ required ].flatten  if required
+
+    if return_nil?(key, value, required)
       nil
     elsif value[:enum]
       value[:enum].shuffle.first
     elsif value[:type] == 'array'
-      [ json_schema_value(key, value[:items], prefix) ]
+      [ json_schema_value(key, value[:items], options) ]
     elsif value[:type] == 'boolean'
       true
     elsif value[:type] == 'integer'
       rand(1_000_000)
     elsif value[:type] == 'object'
-      json_schema_to_params(value[:properties], prefix << key)
+      prefix << key
+      json_schema_to_params(value[:properties], prefix: prefix, required: required)
     elsif value[:type] == 'string'
       json_schema_value_prefix(prefix) + key.to_s
     else
@@ -93,6 +101,14 @@ module JsonSchemaSpec
     end
   end
 
+  def return_nil?(key, value, required)
+    !required.include?(key) && (
+      !value.is_a?(Hash) ||
+      value[:optional]   ||
+      value[:type] == 'null'
+    )
+  end
+
   def validate_json_schema(resource, method, params)
     return  if RUBY_VERSION =~ /^1\.8\./
 

data/spec/fixtures/schema.yml

@@ -26,6 +26,9 @@ user.json:
           avatar:
             type: string
             optional: true
+          bio:
+            type: string
+            optional: true
           name:
             type: string
           company:

data/spec/json_schema_spec_spec.rb

@@ -4,7 +4,7 @@ describe JsonSchemaSpec do
   describe "#json_schema_params" do
 
     it "generates proper params" do
-      request, response = json_schema_params(:user, :get)
+      request, response = json_schema_params(:user, :get, :required => :bio)
 
       expect(request).to eq(
         :id    => request[:id],
@@ -14,6 +14,7 @@ describe JsonSchemaSpec do
       expect(response).to eq([{
         :id       => response[0][:id],
         :admin    => 0,
+        :bio      => "bio",
         :name     => "name",
         :company  => {
           :name   => "company:name"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_spec
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json