Enable to autoload Util::Registrable

namusyaka · namusyaka · commit 783e834eeb2f · 2016-03-18T20:41:42.000+09:00
diff --git a/lib/grape.rb b/lib/grape.rb
@@ -77,28 +77,6 @@ module Exceptions
     autoload :MethodNotAllowed
   end
 
-  module ErrorFormatter
-    extend ActiveSupport::Autoload
-    autoload :Base
-    autoload :Json
-    autoload :Txt
-    autoload :Xml
-  end
-
-  module Formatter
-    extend ActiveSupport::Autoload
-    autoload :Json
-    autoload :SerializableHash
-    autoload :Txt
-    autoload :Xml
-  end
-
-  module Parser
-    extend ActiveSupport::Autoload
-    autoload :Json
-    autoload :Xml
-  end
-
   module Middleware
     extend ActiveSupport::Autoload
     autoload :Base
@@ -130,6 +108,29 @@ module Util
     autoload :StackableValues
     autoload :InheritableSetting
     autoload :StrictHashConfiguration
+    autoload :Registrable
+  end
+
+  module ErrorFormatter
+    extend ActiveSupport::Autoload
+    autoload :Base
+    autoload :Json
+    autoload :Txt
+    autoload :Xml
+  end
+
+  module Formatter
+    extend ActiveSupport::Autoload
+    autoload :Json
+    autoload :SerializableHash
+    autoload :Txt
+    autoload :Xml
+  end
+
+  module Parser
+    extend ActiveSupport::Autoload
+    autoload :Json
+    autoload :Xml
   end
 
   module DSL
diff --git a/lib/grape/error_formatter.rb b/lib/grape/error_formatter.rb
@@ -1,8 +1,7 @@
-require 'grape/util/registrable'
-
 module Grape
   module ErrorFormatter
-    extend Registrable
+    extend Util::Registrable
+
     class << self
       def builtin_formatters
         @builtin_formatters ||= {
diff --git a/lib/grape/formatter.rb b/lib/grape/formatter.rb
@@ -1,8 +1,6 @@
-require 'grape/util/registrable'
-
 module Grape
   module Formatter
-    extend Registrable
+    extend Util::Registrable
 
     class << self
       def builtin_formmaters
diff --git a/lib/grape/parser.rb b/lib/grape/parser.rb
@@ -1,8 +1,6 @@
-require 'grape/util/registrable'
-
 module Grape
   module Parser
-    extend Registrable
+    extend Util::Registrable
 
     class << self
       def builtin_parsers
diff --git a/lib/grape/util/registrable.rb b/lib/grape/util/registrable.rb
@@ -1,11 +1,13 @@
 module Grape
-  module Registrable
-    def default_elements
-      @default_elements ||= {}
-    end
+  module Util
+    module Registrable
+      def default_elements
+        @default_elements ||= {}
+      end
 
-    def register(format, element)
-      default_elements[format] = element unless default_elements[format]
+      def register(format, element)
+        default_elements[format] = element unless default_elements[format]
+      end
     end
   end
 end
