json_schema_tools 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5a291270b106ca221fdc0f91804fdf60cdd614
-  data.tar.gz: 4a2b44c9bbfe7a4266a61d02429089a88f5e670d
+  metadata.gz: 2117356ee68c91b5dc2fab298dd331852f706050
+  data.tar.gz: 1871def586732a52a657ce2e703170090f79a3ac
 SHA512:
-  metadata.gz: a634c484dcc2aae2faa7db335b47b09f732fd48c13c26e6bf59b4ff9047467c710f6a672f1146a7ba3c109fbd58c9b80783d8ec538b2958fa1f3efb5e549e8e1
-  data.tar.gz: 1308a7ff3314b2333ce993a353dbd678b579fdb0dccb4c7d0cde62f64d5589152ae25ac5e98f786d3237278e225eb4c9eede30094a323d87f374eaec9413df59
+  metadata.gz: 63bb2363a46cb8daae284574050138ae4c33217fa00ecfed11ce08ff1199601b3e5f5fdf9eea08824d105a7e6e2fc42a3e4f8e86e0ece32475dc89ef15cb2285
+  data.tar.gz: b51afad29cf08a7dd75d08e2f39dac0b9561b298a7bf7e8143a43abf666486da2522ba3d1369ecb0203a149a70076ea9c99fee880dc7264491e202396a835d83

data/lib/schema_tools/modules/attributes.rb

@@ -37,9 +37,10 @@ module SchemaTools
 
           self.schema= reader.read(schema_name, schema_location)
           self.schema_name(schema_name)
-          # make getter / setter methods
+          # create getter/setter methods, reading/writing to schema_attrs hash
           self.schema[:properties].each do |key, prop|
             define_method(key) { schema_attrs[key] }
+            # TODO convert string values to int/date/datetime?? or use from_hash for it?
             define_method("#{key}=") { |value| schema_attrs[key] = value } unless prop['readOnly']
           end
         end
@@ -75,7 +76,8 @@ module SchemaTools
         #
         # @param [Hash{String=>Mixed}] json string or hash
         # @param [Object] obj if you want to update an existing objects
-        # attributes. e.g during an update
+        # attributes. e.g during an update beware that this also updates read-only
+        # properties
         def from_hash(hash, obj=nil)
           # test if hash is nested and shift up
           if hash.length == 1 && hash["#{schema_name}"]
@@ -98,7 +100,7 @@ module SchemaTools
               when 'object'
                 conv_val = process_object_type(key, val)
               when 'array'
-                conv_val = process_array_type(key, val)
+                conv_val = process_array_type(key, val, obj)
               else
                 conv_val = val
               end
@@ -137,14 +139,34 @@ module SchemaTools
           end
         end
 
-        def process_array_type(field_name, value)
-          if nested_class(field_name.to_s.singularize)
-            value.map do |element|
-              nested_class(field_name.to_s.singularize).from_hash(element)
+        # @param [Symbol|String] field_name
+        # @param [Array<Hash>] values
+        # @param [Object] field_name
+        # @param [Object] obj the current object containing the nested values
+        def process_array_type(field_name, values, obj)
+          nested_klass = nested_class(field_name.to_s.singularize)
+          return values unless nested_klass
+          res = []
+          # check for existing nested objects and update them
+          if schema['properties']["#{field_name}"]['items'] && schema['properties']["#{field_name}"]['items']['type'] == 'object'
+            # detect an update of existing which have an ID
+            existing_objs = obj.public_send(field_name)
+            values.each do |new_hash|
+              if new_hash['id'].present? || new_hash[:id].present?
+                # update existing if found
+                existing_obj = existing_objs && existing_objs.detect{|i| "#{i.id}" == "#{new_hash[:id] || new_hash['id']}" }
+                # existing_obj can be nil in this case a new object is created
+                res << nested_klass.from_hash(new_hash, existing_obj)
+              else # create new
+                res << nested_klass.from_hash(new_hash)
+              end
+            end
+          else #create new
+            values.map do |element|
+              res << nested_klass.from_hash(element)
             end
-          else
-            value
           end
+          res
         end
 
         def nested_class(field_name)

data/lib/schema_tools/modules/validations.rb

@@ -19,6 +19,7 @@ module SchemaTools
       # Runs all the validations within the specified context.
       # @return [Boolean] true if  no errors are found, false otherwise
       def valid?
+        # TODO validate nested objects
         output = super
         errors.empty? && output
       end
@@ -40,6 +41,7 @@ module SchemaTools
             validates_numericality_of key, validate_number_opts(val, is_required) if val['type'] == 'number' || val['type'] == 'integer'
             #TODO array minItems, max unique,  null, string
             # format: date-time, regex color style, email,uri,  ..
+            #TODO validate nested objects, ary of nested objs
           end
         end
 

data/lib/schema_tools/version.rb

@@ -1,3 +1,3 @@
 module SchemaTools
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

data/spec/fixtures/schemata/item_collection.json

@@ -1,10 +1,13 @@
 {
   "type" : "object",
   "properties" : {
-    "items" : {
+    "line_items" : {
       "type" : "array",
-      "properties" : {
-        "$ref" : "item.json#properties"
+      "items" : {
+        "type" : "object",
+        "properties":{
+          "$ref": "line_item.json#properties"
+        }
       }
     }
   }

data/spec/fixtures/schemata/line_item.json

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

data/spec/schema_tools/modules/attributes_spec.rb

@@ -25,9 +25,9 @@ class ItemCollection
   has_schema_attrs :item_collection
 end
 
-class Item
+class LineItem
   include SchemaTools::Modules::Attributes
-  has_schema_attrs :item
+  has_schema_attrs :line_item
 end
 
 describe SchemaTools::Modules::Attributes do
@@ -142,9 +142,9 @@ describe SchemaTools::Modules::Attributes do
     end
 
     it 'makes nested array of objects if there are nested arrays of hashes' do
-      hash = {items: [{}, {}]}
+      hash = {line_items: [{}, {}]}
       obj = ItemCollection.from_hash(hash)
-      expect(obj.items.first).to be_an_instance_of(Item)
+      expect(obj.line_items.first).to be_an_instance_of(LineItem)
     end
 
     it 'updates an object' do
@@ -157,6 +157,37 @@ describe SchemaTools::Modules::Attributes do
       expect(obj.last_name).to eq 'Hulk'
     end
 
+    it 'updates nested array of objects' do
+      obj = ItemCollection.from_hash(
+        {
+          line_items:[
+            {id: 1},
+            {id: '2'}
+        ]
+        } )
+      expect(obj.line_items[0].id).to eq "1"
+
+      update_params = {
+        line_items:[
+          {
+            id: 1,
+           name: 'Item one'
+          },
+          {
+            id: '2',
+            name: 'Item two'
+          },
+          {
+            name: 'New item'
+          },
+        ]
+      }
+      ItemCollection.from_hash( update_params, obj)
+      expect(obj.line_items[0].name).to eq 'Item one'
+      expect(obj.line_items[1].name).to eq 'Item two'
+      expect(obj.line_items[2].name).to eq 'New item'
+    end
+
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Georg Leciejewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -105,9 +105,9 @@ files:
 - spec/fixtures/schemata/contact.json
 - spec/fixtures/schemata/includes_basic_definitions.json
 - spec/fixtures/schemata/includes_deep_nested_refs.json
-- spec/fixtures/schemata/item.json
 - spec/fixtures/schemata/item_collection.json
 - spec/fixtures/schemata/lead.json
+- spec/fixtures/schemata/line_item.json
 - spec/fixtures/schemata/nested_object_no_properties.json
 - spec/fixtures/schemata/nested_schemas/person.json
 - spec/fixtures/schemata/one_of_definition.json

data/spec/fixtures/schemata/item.json

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