Raise custom error for syntax error of catalog.json

droonga · Feb 12, 2014 · 2da7b05 · 2da7b05
1 parent 330900d
commit 2da7b05
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/droonga/catalog.rb b/lib/droonga/catalog.rb
@@ -21,4 +21,13 @@ module Droonga
   class << self
     attr_accessor :catalog
   end
+
+  class InvalidCatalog < StandardError
+    attr_reader :message, :detail
+
+    def initialize(message, detail=nil)
+      @message = message
+      @detail = detail
+    end
+  end
 end
diff --git a/lib/droonga/catalog_loader.rb b/lib/droonga/catalog_loader.rb
@@ -28,6 +28,8 @@ def load
         JSON.parse(file.read)
       end
       Catalog::Version1.new(data, File.dirname(@path))
+    rescue JSON::ParserError => error
+      raise InvalidCatalog.new("Syntax error in #{@path}", error)
     end
   end
 end