Merge pull request #119 from ryanhertz/MWEB-1217-handle-nil-default

Mweb 1217 handle nil default

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
 

Guardfile

@@ -0,0 +1,6 @@
+
+guard :rspec, cmd: 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

VERSION

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

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.Id = DEFAULT_ID if result.Id.nil?
+            default
+          else
+            original_find(*arguments)
           end
-          result
         end
 
       end

spark_api.gemspec

@@ -48,5 +48,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rb-fsevent'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'simplecov-rcov'
+  s.add_development_dependency 'listen', '~> 3.0.8' # for guard-rspec with ruby 1.9.3
+  s.add_development_dependency 'guard-rspec'
 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
+
+    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
-    
-  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 "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

spec/unit/spark_api/models/finders_spec.rb

@@ -49,4 +49,5 @@ class MyResource < Base
     end
 
   end
+
 end