json_schema_tools 0.4.3 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODY5MGJkODcxM2MxNzFjMmI2ZTdlMjU5YjI5NmI4NmQ4ZTYwOTZlYw==
+    YTI1OGYwODJjNzlkNDQ2ODMwYTZjZmFiY2Q4MTY0NTAyYTU3Yzk4Mg==
   data.tar.gz: !binary |-
-    MDY3YTg5NDliYTliOGI1NjgxZDZlMTVlZmVmMDg1Y2EzMzQ4MWIwOQ==
+    YTIyNWFkYjk2NTJiNmQ2YzcxZjEwN2VlODY2MDQyOTkzOTc4YzlkYg==
 SHA512:
   metadata.gz: !binary |-
-    MjQxODIyMmI3Njg5MzIzZmZmYjE0NDk3M2YzZTc3NTY1MTgyYjA2N2I2NjI3
-    MmFlMjRkMzdmNTVkYjFiOGFhMDFiYjFmMTEwNTRlOWY3OWQ4ODU0ZTc2NTli
-    ZDNhY2FiNmZmNWRmZmFhMzgzNGEwOGJmYTlmMjI1MmJhZjc0OWM=
+    NmQxOGI5ZDBjOGJiZjYyODQ0NWY4ODllNTkxODMwN2M4YmFmNWM3M2JjN2Rm
+    NDg0OGY1YTA5NzI4ODU4ZjJmNzllYzdhYmJkYTI3NzFiOTFhMWVmNDAxOGQ4
+    MDM2ODc4Njk3NGRkMGY2MjczMmI5MTVhNmJlZjlmN2Q5MThkMzY=
   data.tar.gz: !binary |-
-    YzVlZGY3MTJmMjYyZjA1MDYyN2Q3NjI3ZWFmYzFiMTY5ZTUzNzM5ODI0ZTkw
-    Y2M5NWY1N2Q3MzVlZGQ3MGI5ZDE5ODc5NTJjNDM4Mzk2ZGE4ZjBjMjdjMTRj
-    NmZiNTUwODg2NTA4Yjk0NGFlODk0ODNhMDIzNjg2MmIxZWY3YTU=
+    YjMyZTc0OWFhNGUxOTAwZTNjYmRjOTEyMTY0MzQ3MzNiZDNhNDM4NDFmZmI0
+    NDljYzExNmJlMDc1NDY5ZmFiNGM0YWY1Mzc2OWUwZGUzYTAwYTIwOTYwNDc4
+    ODM1NDhiYTNmY2ZiMzdlNGM1ZTNkMWMyYjlkNTcwNTUwMDY0OTc=

data/CHANGELOG.md

@@ -1,19 +1,25 @@
 # Changelog JSON Schema Tools
 
-2014-11
+##2014-12
+
+* object.as_schema_hash converts values to types defined in the schema e.g  strings, integers
+* Object.from_hash casts object(json) field values into their ruby type for string, integer, date, date-time
+
+
+##2014-11
 
 * add from_json method to attributes module, to create new objects from a json string
 * remove as_json method(alias of as_schema_json) conflicting with active_resource/active_record. Nothing stops one from using/aliasing it in his own code.
 
-2014-10
+##2014-10
 
 * handle circular dependencies in $ref arguments, so schema.to_h always resolves $refs properly
 
-2014-09
+##2014-09
 
 * add Schema class to represent a single schema, replaces simple Hash usage. Potentially breaks usage if you've gone crazy with Hash methods in your client.
 
-2014-09
+##2014-09
 
 * refactor Reader to de-reference all pointers when initialized
 * remove :exclude_root option for object to schema_hash BREAKING change if you want nesting define your schema accordingly
@@ -21,28 +27,28 @@
 * support items definition for array type properties - BREAKING you must change old simple property definitions
 * support oneOf definitions
 
-2014-08
+##2014-08
 
 * add $ref resolver to merge property definitions from another file
 
-2013-10
+##2013-10
 
 * allow all object properties in link href placeholders => contacts/{id}/{number}
 * add base_url option to schema hash creation. Prepends an url to all links of a rendered object
 * add to_schema_json for simpler model to json conversion
 * add option to exclude_root in to_schema hash method
 
-2013-06
+##2013-06
 
 * *has_schema_attr :schema=>{schema as ruby hash}* allow pass a schema as hash
 * *SchemaTools::Reader.read('name', {Schema Hash}|'String Path'  )*  init a schema from hash additionally to passing a string as schema path
 * rails 4 (ActiveModel) compatibility
 * Testing with different ActiveModel Versions
 
-2013-02
+##2013-02
 
 * add validations for classes generated by KlassFactory
 
-2012-12
+##2012-12
 
 * initial version with reader, hasher, params cleaner, attributes module

data/lib/schema_tools/modules/attributes.rb

@@ -85,8 +85,22 @@ module SchemaTools
             # 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?
-            obj.schema_attrs["#{key}"] = val
-            # TODO if val is a hash / array => look for nested class
+            field_props = self.schema['properties']["#{key}"]
+            conv_val = if 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'
+                           Time.parse(val) # vs Time.strptime
+                         else
+                          "#{val}"
+                         end
+                       elsif field_props['type'] == 'integer'
+                         val.to_i
+                       else # rely on preceding call e.g from_json for boolean, number
+                         val
+                       end
+                      # TODO if val is a hash / array => look for nested class & cast
+            obj.schema_attrs["#{key}"] = conv_val
           end
           obj
         end

data/lib/schema_tools/modules/hash.rb

@@ -77,7 +77,17 @@ module SchemaTools
             opts.delete(:class_name)
             data[field] = parse_object(obj, field, prop, opts)
           else # a simple field is only added if the object knows it
-            data[field] = obj.send(field) if obj.respond_to?(field)
+            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
+                         "#{raw_val}"
+                       elsif prop['type'] == 'integer'
+                         raw_val.to_i
+                       else # bool / number rely on .to_s in json lib
+                         raw_val
+                      end
+            data[field] = conv_val
           end
         end
         data

data/lib/schema_tools/version.rb

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

data/spec/fixtures/data/contact_plain.json

@@ -3,7 +3,8 @@
   "contact_source": "website",
   "organisation": "My super-company",
   "last_name": "Meier",
-  "first_name": "Peter"
+  "first_name": "Peter",
+  "birthday": "1975-11-17"
 }
 
 

data/spec/fixtures/schemata/contact.json

@@ -28,6 +28,15 @@
       "description": "First name of a person.",
       "type":"string",
       "maxLength": 50
+    },
+    "birthday":{
+      "description": "Date of birth",
+      "type":"string",
+      "format": "date"
+    },
+    "click_count":{
+      "description": "Count of clicks",
+      "type":"integer"
     }
   }
 }

data/spec/schema_tools/hash_spec.rb

@@ -94,7 +94,7 @@ describe SchemaTools::Hash do
       a1.zip = 50733
       client.addresses = [a1]
       hash = SchemaTools::Hash.from_schema(client)
-      hash['addresses'].should == [{"city"=>"Cologne", "zip"=>50733}]
+      hash['addresses'].should == [{"city"=>"Cologne", "zip"=>"50733"}]
     end
 
     it 'has nested array values without root' do
@@ -103,7 +103,7 @@ describe SchemaTools::Hash do
       a1.zip = 50733
       client.addresses = [a1]
       hash = SchemaTools::Hash.from_schema(client, exclude_root: true)
-      hash['addresses'].should == [{"city"=>"Cologne", "zip"=>50733}]
+      hash['addresses'].should == [{"city"=>"Cologne", "zip"=>"50733"}]
     end
 
     it 'has nested object value' do
@@ -112,7 +112,7 @@ describe SchemaTools::Hash do
       a1.zip = 50733
       client.work_address = a1
       hash = SchemaTools::Hash.from_schema(client)
-      hash['work_address'].should == {"city"=>"Cologne", "zip"=>50733}
+      hash['work_address'].should == {"city"=>"Cologne", "zip"=>"50733"}
     end
 
     it 'has nested oneOf type object ' do

data/spec/schema_tools/modules/attributes_spec.rb

@@ -81,7 +81,39 @@ describe SchemaTools::Modules::Attributes do
       expect(obj.contact_source).to eq hash['contact']['contact_source']
       expect(obj.first_name).to eq hash['contact']['first_name']
       expect(obj.last_name).to eq hash['contact']['last_name']
-   end
+    end
+
+    it 'converts strings' do
+      hash = { organisation: 123}
+      obj = TestContact.from_hash(hash)
+      expect(obj.organisation).to eq '123'
+    end
+
+    it 'converts integers' do
+      hash = { click_count: '23'}
+      obj = TestContact.from_hash(hash)
+      expect(obj.click_count).to eq 23
+    end
+
+    it 'converts dates' do
+      hash = { birthday: "1975-11-17"}
+      obj = TestContact.from_hash(hash)
+      expect(obj.birthday.class).to eq Date
+    end
+
+    it 'converts datetime' do
+      hash = { created_at: "2014-12-06T04:30:26+01:00"}
+      obj = TestClient.from_hash(hash)
+      expect(obj.created_at.class).to eq Time
+      expect(obj.created_at.zone).to eq 'CET'
+      expect(obj.created_at.year).to eq 2014
+
+      hash = { created_at: "2014-12-04T10:39:50.000Z"}
+      obj = TestClient.from_hash(hash)
+      expect(obj.created_at.zone).to eq 'UTC'
+      expect(obj.created_at.hour).to eq 10
+    end
+
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Georg Leciejewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json