json_schema_tools 0.6.1 → 0.6.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDI3MjBjMGQ2NjA2YjJkN2Y1ZjFiN2NjZTM2NTMzMTJlYmEwNzE5Mg==
+    MzRiOTM3ZmEzMGQzMThiMmE0NjJiZThmY2JiNmM2OTBjMmVhYzU3OA==
   data.tar.gz: !binary |-
-    YTk0Mjg5NTU4MjlkNzA5YzJlYzExNDAyNWVlNDI0MDM5ZmQ1YzI3Nw==
+    ZTNjNGQ5ZThkMGQ1ODc0NjFlNTE5OWRiYWRiY2Q2NmYwZjJkOTAzZA==
 SHA512:
   metadata.gz: !binary |-
-    YWZlOGQyODY4MTg0ZDBkMGYzZGFhMDlmZWMyOTE0ZTA1OTY2YTk4NWUxNTA1
-    OTIzYWYxYWEwYzJkMjI5YjY0NmM2MjIzNzczNzViMGZiODgzMTcyZTIwNTNi
-    OWM3YTdmNWRkMTRkYzBkYWJlZjMyNzJhOGY1YTA4ZjJiNmMwOTI=
+    MDIwMmFlNGMzMWMyNTE3NmM5MjJmOWYzY2Q4MjA4NGM1NWJlNmEzNWFiM2Uw
+    MjIwZTk3ZDdkMmJlODMxOGM2ZmFkMTA0ZWU5ZTAwZDk0OTQ0OTVlMmE2MDI2
+    MzdkY2UxMTE0MGEyZjdjNjAyZTc3ZjFlNTdiNDgzMWNiMjUwYjU=
   data.tar.gz: !binary |-
-    ZDJiZGQ2NWQ5YmIxN2FjMTVmMTVhOGQxYWNhOWU5NDM5NDkxYjY2OWE3ZjJl
-    YTNkMmQ2ODFjNzI2NGU4M2U0YmIyODgzNTBlZGU4MDZlMDJmY2RhZWE3MzJk
-    MGFmZGVlNDlkMmQ1ZjA1YmEzYTAwOTAzMzYxZDdiZjgzY2NlNzI=
+    ZDlhNGY2ZGM1MDM2ZjliMjk5YjY3NzVjNDEzNjYxZGY0M2EzNzFmMTQ4Yjkx
+    NmVkNjVmOWNmN2QwYjc3ZmFmNjAwNzVhN2UzYzM4NjY4NWYwZTA2NzVjZGEx
+    YjFhN2QxZmU1MzA0Y2VjODFhZDM0MGI2NmY4ZDU0ZjljNDRhNjk=

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog JSON Schema Tools
 
+##2015-04
+
+* use schema definition in nested items array Thanks @VidurMalik
+
 ##2015-03
 
-* allow $refs to include plain schema file name
+* allow $refs to include plain schema file name without #suffix
 
 ##2015-01
 

data/lib/schema_tools/modules/hash.rb

@@ -155,7 +155,10 @@ module SchemaTools
           if SCHEMA_BASE_TYPES.include?(prop['items']['type'])
             res = rel_objects
           elsif prop['items']['type'] == 'object'
-            rel_objects.each { |rel_obj| res << from_schema(rel_obj, opts) }
+            rel_objects.each do |rel_obj|
+              opts[:schema] = prop['items']
+              res << from_schema(rel_obj, opts)
+            end
           end
         end
 
@@ -191,4 +194,4 @@ module SchemaTools
 
     end
   end
-end
+end

data/lib/schema_tools/version.rb

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

data/spec/schema_tools/hash_spec.rb

@@ -28,6 +28,11 @@ class Conversion
   attr_accessor :from, :to
 end
 
+class AnotherAddress
+  include SchemaTools::Modules::Attributes
+  has_schema_attrs 'address'
+end
+
 
 describe SchemaTools::Hash do
 
@@ -100,6 +105,62 @@ describe SchemaTools::Hash do
 
   end
 
+  context 'with nested values referencing a schema that is different from the class name' do
+    let(:client){Client.new}
+
+    it 'has an empty array if values are missing' do
+      hash = SchemaTools::Hash.from_schema(client)
+      hash['addresses'].should == []
+    end
+
+    it 'has nil if nested object is missing' do
+      hash = SchemaTools::Hash.from_schema(client)
+      hash['work_address'].should be_nil
+    end
+
+    it 'has nested array values' do
+      a1 = AnotherAddress.new
+      a1.city = 'Cologne'
+      a1.zip = 50733
+      client.addresses = [a1]
+      hash = SchemaTools::Hash.from_schema(client)
+      hash['addresses'].should == [{"id" => nil,
+                                    "city"=>"Cologne",
+                                    "address1" => nil,
+                                    "zip"=>"50733",
+                                    "country" => nil,
+                                    "address_type" => nil}]
+    end
+
+    it 'has nested array values without root' do
+      a1 = AnotherAddress.new
+      a1.city = 'Cologne'
+      a1.zip = 50733
+      client.addresses = [a1]
+      hash = SchemaTools::Hash.from_schema(client, exclude_root: true)
+      hash['addresses'].should == [{"id" => nil,
+                                    "city"=>"Cologne",
+                                    "address1" => nil,
+                                    "zip"=>"50733",
+                                    "country" => nil,
+                                    "address_type" => nil}]
+    end
+
+    it 'has nested object value' do
+      a1 = AnotherAddress.new
+      a1.city = 'Cologne'
+      a1.zip = 50733
+      client.work_address = a1
+      hash = SchemaTools::Hash.from_schema(client)
+      hash['work_address'].should == {"id" => nil,
+                                      "city"=>"Cologne",
+                                      "address1" => nil,
+                                      "zip"=>"50733",
+                                      "country" => nil,
+                                      "address_type" => nil}
+    end
+  end
+
   context 'with nested values referencing a schema' do
 
     let(:client){Client.new}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Georg Leciejewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json