find_by_id and RecordNotFound

Author: Andrej Jančič

lib/creatubbles.rb

@@ -42,6 +42,7 @@ def self.instantiate_objects_from_response(response, connection)
 
 end
 
+require "creatubbles/error"
 require "creatubbles/utils/auth_details"
 require "creatubbles/content"
 require "creatubbles/contents"

lib/creatubbles/base_collection.rb

@@ -13,17 +13,23 @@ def initialize(connection)
     @connection = connection
   end
 
-  def find(id,opts={nil_404:false})
+  def find(id)
     res = @connection.get("#{self.class.type_name}/#{id}")
     Creatubbles.instantiate_object_from_response(res, @connection)
   rescue => e
-    if opts[:nil_404] && is_record_not_found_404?(e)
-      return nil
+    if is_record_not_found_404?(e)
+      raise Creatubbles::Error::RecordNotFound.new(e), "Not Found! #{self.class.type_name}/#{id}"
     else
       raise e
     end
   end
 
+  def find_by_id(id)
+    find(id)
+  rescue Creatubbles::Error::RecordNotFound
+    return nil
+  end
+
   def init_objects(response)
     Creatubbles.instantiate_objects_from_response(response, @connection)
   end

lib/creatubbles/error.rb

@@ -0,0 +1,11 @@
+module Creatubbles
+  module Error
+    #Creatubbles::Error::RecordNotFound
+    class RecordNotFound < StandardError
+      attr_reader :original
+      def initialize original
+        @original = original
+      end
+    end
+  end
+end

spec/creatubbles/base_collection_spec.rb

@@ -6,12 +6,16 @@
     client = Creatubbles::Client.dummy
 
     expect{client.test_objects.find('non-existing-object-id')}.
-      to raise_error(OAuth2::Error)
+      to raise_error(Creatubbles::Error::RecordNotFound)
 
-    expect{client.test_objects.find('non-existing-object-id', nil_404:true)}.
-      not_to raise_error
+    begin
+      client.test_objects.find('non-existing-object-id')
+    rescue => e
+      expect(e.original).to be_a(OAuth2::Error)
+      expect(e.message).to include('non-existing-object-id')
+    end
 
-    expect(client.test_objects.find('non-existing-object-id', nil_404:true)).
+    expect(client.test_objects.find_by_id('non-existing-object-id')).
       to be_nil
   end
 end