change Error interface, take options hash

Author: Pedro Belo

lib/pliny/errors.rb

@@ -9,21 +9,21 @@ def self.render(error)
         [error.status, headers, [MultiJson.encode(data)]]
       end
 
-      def initialize(message, id)
-        @id = id
-        super(message)
+      def initialize(options={})
+        @id = options[:id]
+        super(options[:message])
       end
     end
 
     class HTTPStatusError < Error
       attr_accessor :status
 
-      def initialize(message = nil, id = nil, status = nil)
-        meta    = Pliny::Errors::META[self.class]
-        message = message || meta[1] + "."
-        id      = id || meta[1].downcase.tr(' ', '_').to_sym
-        @status = status || meta[0]
-        super(message, id)
+      def initialize(options={})
+        meta = Pliny::Errors::META[self.class]
+        options[:message] ||= "#{meta[1]}."
+        options[:id] ||= meta[1].downcase.tr(' ', '_').to_sym
+        @status = options[:status] || meta[0]
+        super(options)
       end
     end
 
@@ -108,6 +108,7 @@ class GatewayTimeout < HTTPStatusError; end               # 504
       UnprocessableEntity          => [422, 'Unprocessable entity'],
       TooManyRequests              => [429, 'Too many requests'],
       InternalServerError          => [500, 'Internal server error'],
+      HTTPStatusError              => [500, 'Unspecified'],
       NotImplemented               => [501, 'Not implemented'],
       BadGateway                   => [502, 'Bad gateway'],
       ServiceUnavailable           => [503, 'Service unavailable'],

spec/errors_spec.rb

@@ -1,24 +1,28 @@
 require "spec_helper"
 
 describe Pliny::Errors do
-  it "includes a general error that requires an identifier" do
-    e = Pliny::Errors::Error.new("General error.", :general_error)
-    assert_equal "General error.", e.message
-    assert_equal :general_error, e.id
+  describe Pliny::Errors::Error do
+    it "takes a message" do
+      e = Pliny::Errors::Error.new(message: "Fail.")
+      assert_equal "Fail.", e.message
+    end
+    it "takes an identifier" do
+      e = Pliny::Errors::Error.new(id: :fail)
+      assert_equal :fail, e.id
+    end
   end
 
-  it "includes an HTTP error that will take generic parameters" do
-    e = Pliny::Errors::HTTPStatusError.new(
-      "Custom HTTP error.", :custom_http_error, 499)
-    assert_equal "Custom HTTP error.", e.message
-    assert_equal :custom_http_error, e.id
-    assert_equal 499, e.status
-  end
+  describe Pliny::Errors::HTTPStatusError do
+    it "includes an HTTP error that will take generic parameters" do
+      e = Pliny::Errors::HTTPStatusError.new(status: 499)
+      assert_equal 499, e.status
+    end
 
-  it "includes pre-defined HTTP error templates" do
-    e = Pliny::Errors::NotFound.new
-    assert_equal "Not found.", e.message
-    assert_equal :not_found, e.id
-    assert_equal 404, e.status
+    it "includes pre-defined HTTP error templates" do
+      e = Pliny::Errors::NotFound.new
+      assert_equal "Not found.", e.message
+      assert_equal :not_found, e.id
+      assert_equal 404, e.status
+    end
   end
 end