Fixed parsing of empty response.

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

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/lib/kosapi_client/response_converter.rb b/lib/kosapi_client/response_converter.rb
@@ -13,6 +13,7 @@ class ResponseConverter
     # @return [ResultPage] ResultPage of domain objects
 
     def convert_paginated(items)
+      items ||= []
       converted_items = items.map{ |p| convert_type(p, detect_type(p)) }
       Entity::ResultPage.new(converted_items, 0, nil)
     end

diff --git a/lib/kosapi_client/response_preprocessor.rb b/lib/kosapi_client/response_preprocessor.rb
@@ -26,9 +26,11 @@ def merge_contents(hash)
       else
         [hash[:atom_entry]]
       end
-      entries.each do |entry|
-        content = entry.delete(:atom_content)
-        entry.merge! content if content
+      if entries
+        entries.each do |entry|
+          content = entry.delete(:atom_content)
+          entry.merge! content if content
+        end
       end
 
     end

diff --git a/spec/integration/courses_spec.rb b/spec/integration/courses_spec.rb
@@ -20,5 +20,10 @@
     expect(page.items.first.title).not_to be_nil
   end
 
+  it 'parses empty response' do
+    page = client.courses.offset(1000000)
+    expect(page.items).to eq []
+  end
+
 
 end
diff --git a/spec/kosapi_client/response_preprocessor_spec.rb b/spec/kosapi_client/response_preprocessor_spec.rb
@@ -31,4 +31,10 @@
     expect(result).to eq({atom_entry: {id: '1234', foo: :bar}})
   end
 
+  it 'handles empty response' do
+    resp = {atom_feed: {} }
+    result = preprocessor.preprocess(resp)
+    expect(result).to eq({atom_feed: {}})
+  end
+
 end