Make it easy to refer "ErrorMessage::*" classes from plugins

droonga · Feb 19, 2014 · 5aeea47 · 5aeea47
1 parent b7079df
commit 5aeea47
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/lib/droonga/adapter.rb b/lib/droonga/adapter.rb
@@ -16,10 +16,12 @@
 require "droonga/pluggable"
 require "droonga/plugin/metadata/adapter_input_message"
 require "droonga/plugin/metadata/adapter_output_message"
+require "droonga/error_messages"
 
 module Droonga
   class Adapter
     extend Pluggable
+    include ErrorMessages
 
     class << self
       def input_message

diff --git a/lib/droonga/collector.rb b/lib/droonga/collector.rb
@@ -15,10 +15,12 @@
 
 require "droonga/pluggable"
 require "droonga/plugin/metadata/collector_message"
+require "droonga/error_messages"
 
 module Droonga
   class Collector
     extend Pluggable
+    include ErrorMessages
 
     class << self
       def message

diff --git a/lib/droonga/handler.rb b/lib/droonga/handler.rb
@@ -16,10 +16,12 @@
 require "droonga/pluggable"
 require "droonga/plugin/metadata/input_message"
 require "droonga/plugin/metadata/handler_action"
+require "droonga/error_messages"
 
 module Droonga
   class Handler
     extend Pluggable
+    include ErrorMessages
 
     class << self
       def message

diff --git a/lib/droonga/planner.rb b/lib/droonga/planner.rb
@@ -16,10 +16,12 @@
 require "droonga/pluggable"
 require "droonga/plugin/metadata/planner_message"
 require "droonga/distributed_command_planner"
+require "droonga/error_messages"
 
 module Droonga
   class Planner
     extend Pluggable
+    include ErrorMessages
 
     class << self
       def message

diff --git a/lib/droonga/plugins/crud.rb b/lib/droonga/plugins/crud.rb
@@ -50,33 +50,33 @@ def plan(message)
       class Handler < Droonga::Handler
         message.type = "add"
 
-        class MissingTableParameter < ErrorMessages::BadRequest
+        class MissingTableParameter < BadRequest
           def initialize
             super("\"table\" must be specified.")
           end
         end
 
-        class MissingPrimaryKeyParameter < ErrorMessages::BadRequest
+        class MissingPrimaryKeyParameter < BadRequest
           def initialize(table_name)
             super("\"key\" must be specified. " +
                     "The table #{table_name.inspect} requires a primary key for a new record.")
           end
         end
 
-        class UnknownTable < ErrorMessages::NotFound
+        class UnknownTable < NotFound
           def initialize(table_name)
             super("The table #{table_name.inspect} does not exist in the dataset.")
           end
         end
 
-        class InvalidValue < ErrorMessages::BadRequest
+        class InvalidValue < BadRequest
           def initialize(column, value, request)
             super("The column #{column.inspect} cannot store the value #{value.inspect}.",
                   request)
           end
         end
 
-        class UnknownColumn < ErrorMessages::NotFound
+        class UnknownColumn < NotFound
           def initialize(column, table, request)
             super("The column #{column.inspect} does not exist in the table #{table.inspect}.",
                   request)