Migrated error classes into Buff::Error namespace

zph · zph · commit 693b41c8601e · 2013-07-07T17:23:14.000-07:00
diff --git a/lib/buff/core.rb b/lib/buff/core.rb
@@ -57,7 +57,7 @@ def interpret_response(response)
 
       def handle_response_code(response)
         error = Hashie::Mash.new(response.body)
-        raise Buff::APIError unless error.code
+        raise Buff::Error::APIError unless error.code
         "Buffer API Error Code: #{error.code}\n" +
         "HTTP Code: #{response.code}." +
         "Description: #{error.error}"
diff --git a/lib/buff/error.rb b/lib/buff/error.rb
@@ -1,12 +1,10 @@
 module Buff
-  #TODO: refactor errors into Error Module and fix references
-  InvalidIdLength = Class.new(ArgumentError)
-  InvalidIdContent = Class.new(ArgumentError)
-  MissingStatus = Class.new(ArgumentError)
-  APIError = Class.new(StandardError)
-  UnauthorizeRequest = Class.new(StandardError)
-
   module Error
     ConfigFileMissing = Class.new(StandardError)
+    InvalidIdLength = Class.new(ArgumentError)
+    InvalidIdContent = Class.new(ArgumentError)
+    MissingStatus = Class.new(ArgumentError)
+    APIError = Class.new(StandardError)
+    UnauthorizedRequest = Class.new(StandardError)
   end
 end
diff --git a/lib/buff/update.rb b/lib/buff/update.rb
@@ -9,7 +9,7 @@ def update_by_id(id, options = {})
 
       def updates_by_profile_id(id, options = {})
         status = options.fetch(:status) do
-          raise Buff::MissingStatus, "Include :pending or :sent in args"
+          raise Buff::Error::MissingStatus, "Include :pending or :sent in args"
         end
         options.delete(:status)
         response = get("/profiles/#{id}/updates/#{status.to_s}.json", options)
@@ -67,8 +67,8 @@ def destroy_update(update_id)
       end
 
       def check_id(id)
-        raise Buff::InvalidIdLength unless id.length == 24
-        raise Buff::InvalidIdContent unless id[/^[a-f0-9]+$/i]
+        raise Buff::Error::InvalidIdLength unless id.length == 24
+        raise Buff::Error::InvalidIdContent unless id[/^[a-f0-9]+$/i]
       end
     end
   end
diff --git a/spec/lib/buff/update_spec.rb b/spec/lib/buff/update_spec.rb
@@ -37,7 +37,7 @@
 
       it "fails without a :status arg" do
         lambda { client.updates_by_profile_id(profile_id)}.
-          should raise_error(Buff::MissingStatus)
+          should raise_error(Buff::Error::MissingStatus)
       end
 
       it "connects to the correct endpoint" do
@@ -70,7 +70,7 @@
 
       it "requires an id" do
         lambda { client.interactions_by_update_id(page: 2) }.
-          should raise_error(Buff::InvalidIdLength)
+          should raise_error(Buff::Error::InvalidIdLength)
       end
 
       it "allows optional params" do
@@ -122,15 +122,15 @@
                  to_return(:status => 200, :body => "", :headers => {})
         id = "4eb8565e0acb04bb82000004X"
         lambda { client.update_by_id(id) }.
-          should raise_error(Buff::InvalidIdLength)
+          should raise_error(Buff::Error::InvalidIdLength)
       end
 
       it "fails if id is not numbers and a-f" do
         stub_request(:get, "https://api.bufferapp.com/1/updates/4eb8565e0acb04bb8200000X.json?access_token=some_token").
                  to_return(:status => 200, :body => "", :headers => {})
         id = "4eb8565e0acb04bb8200000X"
         lambda { client.update_by_id(id) }.
-          should raise_error(Buff::InvalidIdContent)
+          should raise_error(Buff::Error::InvalidIdContent)
       end
     end
 
diff --git a/spec/lib/core_spec.rb b/spec/lib/core_spec.rb
@@ -52,7 +52,7 @@
         url = "#{base_path}/updates/#{id}.json?access_token=some_token"
         stub_with_to_return(:get, url, "update_by_id_non_auth.txt")
         lambda { client.update_by_id(id) }.
-          should raise_error(Buff::APIError)
+          should raise_error(Buff::Error::APIError)
       end
     end
   end
