Fixed parsing of empty collection.

cvut · Jul 17, 2014 · e526e9d · e526e9d
1 parent 9746394
commit e526e9d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/lib/kosapi_client/entity/data_mappings.rb b/lib/kosapi_client/entity/data_mappings.rb
@@ -74,10 +74,15 @@ def set_mapped_attribute(instance, name, source_hash, mapping_options)
           value = source_hash[key]
           if value.nil?
             raise "Missing value for attribute #{name}" if mapping_options[:required]
-            return
+            if mapping_options[:type].is_a?(Array)
+              value = []
+            else
+              return
+            end
+          else
+            value = convert_type(value, mapping_options[:type])
           end
-          value = convert_type(value, mapping_options[:type])
-          instance.send("#{name}=".to_sym, value)
+            instance.send("#{name}=".to_sym, value)
         end
 
         def convert_type(value, type)

diff --git a/spec/kosapi_client/entity/data_mappings_spec.rb b/spec/kosapi_client/entity/data_mappings_spec.rb
@@ -70,6 +70,12 @@
       expect(parsed.foo).to eq :bar
     end
 
+    it 'parses nil collection as empty array' do
+      dummy_class.map_data :foo, [Integer]
+      parsed = dummy_class.parse({ })
+      expect(parsed.foo).to eq []
+    end
+
   end
 
   describe '.map_data' do