MWEB-1217: handle empty arrays from default service

Author: ryanhertz

CHANGELOG

@@ -1,3 +1,6 @@
+v1.4.3
+ - Change Finders and Defaultable to handle an api response of an empty array when finding a single resource.
+
 v1.4.2
  - Added Defaultable module
 

VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

lib/spark_api/models/defaultable.rb

@@ -24,7 +24,7 @@ def default(options = {})
 
         def find(*arguments)
           result = original_find(*arguments)
-          if arguments.first == DEFAULT_ID
+          if arguments.first == DEFAULT_ID && result != nil
             result.Id = DEFAULT_ID if result.Id.nil?
           end
           result

lib/spark_api/models/finders.rb

@@ -37,7 +37,9 @@ def find_every(options)
 
       def find_single(scope, options)
         resp = connection.get("#{path}/#{scope}", options)
-        new(resp.first)
+        unless resp.first.nil?
+          new(resp.first)
+        end
       end
 
     end

spec/unit/spark_api/models/defaultable_spec.rb

@@ -40,6 +40,11 @@ class TestClass < Base
       allow(TestClass).to receive(:connection).and_return(connection)
       TestClass.find('5', foo: true)
     end
+
+    it "returns nil when the original find method returns nil" do
+      allow(TestClass).to receive(:original_find).and_return(nil)
+      expect(TestClass.find(TestClass::DEFAULT_ID)).to be nil
+    end
 
   end
 

spec/unit/spark_api/models/finders_spec.rb

@@ -48,5 +48,15 @@ class MyResource < Base
       }.should raise_error(ArgumentError)
     end
 
+    context "when finding a single resource" do
+
+      it "returns nil when no results are found" do
+        stub_api_get("/my_resource/no_results", 'no_results.json')
+        expect(MyResource.find('no_results')).to be nil
+      end
+
+    end
+
   end
+  
 end