json_schema_tools 0.6.2 → 0.6.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzRiOTM3ZmEzMGQzMThiMmE0NjJiZThmY2JiNmM2OTBjMmVhYzU3OA==
+    ZDg0NTQ4YzQwN2QzYjhhYTMzMDM2NmJlMDgzOGM2NDU0MWExOTdlMQ==
   data.tar.gz: !binary |-
-    ZTNjNGQ5ZThkMGQ1ODc0NjFlNTE5OWRiYWRiY2Q2NmYwZjJkOTAzZA==
+    ZmQ5MTNhYTUwNWY2NWQ5Zjc3ODk1MTQzMjcwNDk0Yzg3NmM0NzZkMw==
 SHA512:
   metadata.gz: !binary |-
-    MDIwMmFlNGMzMWMyNTE3NmM5MjJmOWYzY2Q4MjA4NGM1NWJlNmEzNWFiM2Uw
-    MjIwZTk3ZDdkMmJlODMxOGM2ZmFkMTA0ZWU5ZTAwZDk0OTQ0OTVlMmE2MDI2
-    MzdkY2UxMTE0MGEyZjdjNjAyZTc3ZjFlNTdiNDgzMWNiMjUwYjU=
+    YzhlNWJhNTJmYTQyMjc5YzQwZWQxMzkzMDQ4MThhNGI0OTNhYmNiNTI0NjQz
+    ZDU0MjQ3YTExMDlmMGYzZmQzZGNiMmQwNzUzZDlhYjg3MDE5NmI1NmQ1Yjg4
+    NDY3M2NhNjQ1MjMzNjM3NmRkMmMwMzUwN2VlNzI0MmQxYjE2YWI=
   data.tar.gz: !binary |-
-    ZDlhNGY2ZGM1MDM2ZjliMjk5YjY3NzVjNDEzNjYxZGY0M2EzNzFmMTQ4Yjkx
-    NmVkNjVmOWNmN2QwYjc3ZmFmNjAwNzVhN2UzYzM4NjY4NWYwZTA2NzVjZGEx
-    YjFhN2QxZmU1MzA0Y2VjODFhZDM0MGI2NmY4ZDU0ZjljNDRhNjk=
+    OGQ4MTBhYTMzZWI0YTRjYzI5ZWRlOWRiYzBlMWM5ZjYwYzVlM2UyNTVjZTlj
+    ZjM1YTZmN2I3MjA3OTY0MDcxM2YwNDMyZTVkNzI4MWM4NGU0MDM0N2QwNzYw
+    NjQ1MDgwYjkzM2UxYjczNTU5Mzk3MWI2Njk0NTYzNzIxNjM4MjY=

data/CHANGELOG.md

@@ -2,7 +2,10 @@
 
 ##2015-04
 
-* use schema definition in nested items array Thanks @VidurMalik
+Thanks @VidurMalik
+* use schema definition in nested items array
+* exclude keys for nil(blank) nested objects
+* allow arbitrary key/values for a nested object without properties definition in the schema
 
 ##2015-03
 

data/lib/schema_tools/modules/hash.rb

@@ -83,7 +83,7 @@ module SchemaTools
             data[field] = parse_list(obj, field, prop, opts)
           elsif prop['type'] == 'object' # a singular related object
             opts.delete(:class_name)
-            data[field] = parse_object(obj, field, prop, opts)
+            data[field] = parse_object(obj, field, prop, opts) if parse_object?(obj, field)
           else # a simple field is only added if the object knows it
             next unless obj.respond_to?(field)
             raw_val = obj.send(field)
@@ -176,11 +176,8 @@ module SchemaTools
       # @param [Hash] opts to_schema options
       # @return [Array<Hash{String=>String}>]
       def parse_object(obj, field, prop, opts)
-        return if !obj.respond_to?( field )
         rel_obj = obj.send( field )
-        return if !rel_obj
-
-        res = if prop['properties']
+        res = if prop['properties'].present?
                 opts[:schema] = prop
                 from_schema(rel_obj, opts)
               elsif prop['oneOf']
@@ -188,10 +185,22 @@ module SchemaTools
                 # Simpler than detecting the object type or $ref to use inside the
                 # oneOf array
                 from_schema(rel_obj, opts)
+              elsif prop['properties'].blank?
+                rel_obj
               end
         res
       end
 
+      private
+
+      def parse_object?(obj, field)
+        if obj.respond_to?( field )
+          rel_obj = obj.send( field )
+          rel_obj.present?
+        else
+          false
+        end
+      end
     end
   end
 end

data/lib/schema_tools/version.rb

@@ -1,3 +1,3 @@
 module SchemaTools
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

data/spec/fixtures/schemata/nested_object_no_properties.json

@@ -0,0 +1,7 @@
+{
+  "type" : "object",
+  "properties" : {
+    "id" : { "type" : "string" },
+    "user_data" : { "type" : "object" }
+  }
+}

data/spec/schema_tools/hash_spec.rb

@@ -33,6 +33,10 @@ class AnotherAddress
   has_schema_attrs 'address'
 end
 
+class NestedObjectNoProperties
+ include SchemaTools::Modules::Attributes
+ has_schema_attrs 'nested_object_no_properties'
+end
 
 describe SchemaTools::Hash do
 
@@ -113,9 +117,9 @@ describe SchemaTools::Hash do
       hash['addresses'].should == []
     end
 
-    it 'has nil if nested object is missing' do
+    it 'does not have the key if nested object is missing' do
       hash = SchemaTools::Hash.from_schema(client)
-      hash['work_address'].should be_nil
+      hash.has_key?('work_address').should == false
     end
 
     it 'has nested array values' do
@@ -170,9 +174,9 @@ describe SchemaTools::Hash do
       hash['addresses'].should == []
     end
 
-    it 'has nil if nested object is missing' do
+    it 'does not have the key if nested object is missing' do
       hash = SchemaTools::Hash.from_schema(client)
-      hash['work_address'].should be_nil
+      hash.has_key?('work_address').should == false
     end
 
     it 'has nested array values' do
@@ -266,7 +270,16 @@ describe SchemaTools::Hash do
       hash = SchemaTools::Hash.from_schema(client, base_url: 'http://json-hell.com', links: true)
       hash['_links'].last['href'].should == 'http://json-hell.com/clients/123/Peter'
     end
+  end
 
+  context 'with a nested object that does not have properties' do
+    let(:input_hash) { { foo: 'bar', baz: 'boom' } }
+    let(:nested_object_no_properties) { NestedObjectNoProperties.from_hash(user_data: input_hash) }
+
+    it 'should output the input hash' do
+      hash = SchemaTools::Hash.from_schema(nested_object_no_properties)
+      hash['user_data'].should == input_hash
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Georg Leciejewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -106,6 +106,7 @@ files:
 - spec/fixtures/schemata/includes_basic_definitions.json
 - spec/fixtures/schemata/includes_deep_nested_refs.json
 - spec/fixtures/schemata/lead.json
+- spec/fixtures/schemata/nested_object_no_properties.json
 - spec/fixtures/schemata/nested_schemas/person.json
 - spec/fixtures/schemata/one_of_definition.json
 - spec/fixtures/schemata/page.json