MWEB-1217: separated Defaultable#default from Finders#find

Author: ryanhertz

lib/spark_api/models/defaultable.rb

@@ -19,15 +19,19 @@ class << base
       module ClassMethods
 
         def default(options = {})
-          find(DEFAULT_ID, options)
+          response = connection.get("/#{element_name}/default", options).first
+          unless response.nil?
+            response[:Id] = DEFAULT_ID if response[:Id].nil?
+            new(response)
+          end
         end
 
         def find(*arguments)
-          result = original_find(*arguments)
-          if arguments.first == DEFAULT_ID && result != nil
-            result.Id = DEFAULT_ID if result.Id.nil?
+          if arguments.first == DEFAULT_ID
+            default
+          else
+            original_find(*arguments)
           end
-          result
         end
 
       end

lib/spark_api/models/finders.rb

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

spec/unit/spark_api/models/defaultable_spec.rb

@@ -14,24 +14,33 @@ class TestClass < Base
 
   describe 'default' do
 
-    it 'calls find' do
-      expect(TestClass).to receive(:find).with('default', {})
-      TestClass.default
+    it 'returns an instance of the class' do
+      allow(TestClass).to receive(:connection).and_return(double(get: [{Name: 'foo'}]))
+      expect(TestClass.default).to be_a TestClass
     end
-    
-  end
-  
-  describe 'find' do
 
-    it "adds the id 'default'" do
-      allow(TestClass).to receive(:connection).and_return(double(get: [{Id: nil, Name: 'foo'}]))
-      default = TestClass.find(TestClass::DEFAULT_ID)
-      expect(default.Id).to eq 'default'
+    it 'returns nil when there are no results' do
+      allow(TestClass).to receive(:connection).and_return(double(get: []))
+      expect(TestClass.default).to be nil
+    end
+
+    it "assigns the default id to the instance if it doesn't have an id" do
+      allow(TestClass).to receive(:connection).and_return(double(get: [{Name: 'foo'}]))
+      expect(TestClass.default.Id).to eq TestClass::DEFAULT_ID
     end
 
     it "doesn't override the id if one is present" do
       allow(TestClass).to receive(:connection).and_return(double(get: [{Id: '5', Name: 'foo'}]))
-      expect(TestClass.find(TestClass::DEFAULT_ID).Id).to eq '5'
+      expect(TestClass.default.Id).to eq '5'
+    end
+    
+  end
+  
+  describe 'find' do
+
+    it "calls 'default' when given the default id" do
+      expect(TestClass).to receive(:default)
+      TestClass.find(TestClass::DEFAULT_ID)
     end
 
     it "calls Finders.find when given a normal id" do
@@ -40,11 +49,6 @@ 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,15 +48,6 @@ 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