json_schema_tools 0.5.0 → 0.5.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTI1OGYwODJjNzlkNDQ2ODMwYTZjZmFiY2Q4MTY0NTAyYTU3Yzk4Mg==
+    MTVkNGZkMjUxMjk5YTQ0ZTg5NzFlMTg4OGU4MGJmMjQ3NWVkOGVhOQ==
   data.tar.gz: !binary |-
-    YTIyNWFkYjk2NTJiNmQ2YzcxZjEwN2VlODY2MDQyOTkzOTc4YzlkYg==
+    NTFlMjliNzNkMGZiYzFmOWRjYjM3ODQ3MTBiYzQ5YjQ4ODdjN2EwYg==
 SHA512:
   metadata.gz: !binary |-
-    NmQxOGI5ZDBjOGJiZjYyODQ0NWY4ODllNTkxODMwN2M4YmFmNWM3M2JjN2Rm
-    NDg0OGY1YTA5NzI4ODU4ZjJmNzllYzdhYmJkYTI3NzFiOTFhMWVmNDAxOGQ4
-    MDM2ODc4Njk3NGRkMGY2MjczMmI5MTVhNmJlZjlmN2Q5MThkMzY=
+    M2UyNTA5ZWQyMjcxYzQ2YTliNjgwZGQ2MWM1MmQ0NDUzNzY0ZDNiN2M2MTg3
+    MWE5YzZjN2VkMWI2MmVkNWE1ZGI4ZmU2OTc1YWY2ZTIwNDY0YTYwZDU0NzRh
+    ZTMzOTVhZjUyM2VkZmE0NmY2OWVjM2RhMGVkYzVlZjg4NWI5ZWI=
   data.tar.gz: !binary |-
-    YjMyZTc0OWFhNGUxOTAwZTNjYmRjOTEyMTY0MzQ3MzNiZDNhNDM4NDFmZmI0
-    NDljYzExNmJlMDc1NDY5ZmFiNGM0YWY1Mzc2OWUwZGUzYTAwYTIwOTYwNDc4
-    ODM1NDhiYTNmY2ZiMzdlNGM1ZTNkMWMyYjlkNTcwNTUwMDY0OTc=
+    OWRhYzZiMzk1NjgzNmRkMWE1OWVjZTk4M2FhZTc3MzJkOTNlYzczOTU5OTNm
+    MjAyOTU0NWVlZmIzYzNjYzgzY2QwNjJmZGRlZGQxMGFjZmQ3MTIwY2IyOTA2
+    MjAyNzhjNzEyNTJmMTY5NzMzOTkzYzkzZTM1OWFiMTViYjUzNTM=

data/lib/schema_tools/modules/attributes.rb

@@ -84,9 +84,10 @@ module SchemaTools
             next unless obj.respond_to?(key)
             # set values to raw schema attributes, even if there are no setters
             # assuming this objects comes from a remote site
-            # TODO type conversion string/integer/number/date/datetime?
             field_props = self.schema['properties']["#{key}"]
-            conv_val = if field_props['type'] == 'string'
+            conv_val = if val.nil?
+                         val
+                       elsif field_props['type'] == 'string'
                          if field_props['format'] == 'date'
                           Date.parse(val) # or be explicit? Date.strptime('2001-02-03', '%Y-%m-%d')
                          elsif field_props['format'] == 'date-time'

data/lib/schema_tools/modules/hash.rb

@@ -80,7 +80,9 @@ module SchemaTools
             next unless obj.respond_to?(field)
             raw_val = obj.send(field)
             # convert field to schema type if set
-            conv_val = if prop['type'] == 'string'  # rely on .to_s for format from date/datetime
+            conv_val = if raw_val.nil?
+                         raw_val
+                       elsif prop['type'] == 'string'  # rely on .to_s for format from date/datetime
                          "#{raw_val}"
                        elsif prop['type'] == 'integer'
                          raw_val.to_i

data/lib/schema_tools/version.rb

@@ -1,3 +1,3 @@
 module SchemaTools
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/spec/schema_tools/hash_spec.rb

@@ -12,8 +12,8 @@ class Address
 end
 
 class Contact
-  attr_accessor :first_name, :last_name, :addresses, :id
-  end
+  attr_accessor :first_name, :last_name, :addresses, :id, :organisation
+end
 
 class OneOfDefinition
   attr_accessor :person
@@ -48,6 +48,18 @@ describe SchemaTools::Hash do
       hash['last_name'].should == 'Paul'
     end
 
+    it 'keeps nil values' do
+      hash = SchemaTools::Hash.from_schema(contact)
+      hash.keys.should include('organisation')
+      hash['organisation'].should be_nil
+      # hash['birthday'].should be_nil
+    end
+    it 'skips unknown fields values' do
+      hash = SchemaTools::Hash.from_schema(contact)
+      # not defined in the Contact class above, but defined in the contact.json schema
+      hash.keys.should_not include('birthday')
+    end
+
     it 'should use custom schema path' do
       custom_path = File.expand_path('../../fixtures/schemata', __FILE__)
       hash = SchemaTools::Hash.from_schema(contact, path: custom_path)

data/spec/schema_tools/modules/attributes_spec.rb

@@ -101,6 +101,12 @@ describe SchemaTools::Modules::Attributes do
       expect(obj.birthday.class).to eq Date
     end
 
+    it 'skips nil values' do
+      hash = { created_at: nil}
+      obj = TestClient.from_hash(hash)
+      expect(obj.created_at).to eq nil
+    end
+
     it 'converts datetime' do
       hash = { created_at: "2014-12-06T04:30:26+01:00"}
       obj = TestClient.from_hash(hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Georg Leciejewski