From 27c9774d1b4859ee4ee83743aa0dfa8bc9c7923c Mon Sep 17 00:00:00 2001 From: Charlie Somerville Date: Tue, 3 Dec 2013 15:55:25 +1100 Subject: [PATCH] prefer JSON, but fall back to YAML if JSON isn't available --- lib/linguist/samples.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/linguist/samples.rb b/lib/linguist/samples.rb index 89f5a718..c623d7d5 100644 --- a/lib/linguist/samples.rb +++ b/lib/linguist/samples.rb @@ -1,4 +1,8 @@ -require 'json' +begin + require 'json' +rescue LoadError + require 'yaml' +end require 'linguist/md5' require 'linguist/classifier' @@ -14,7 +18,8 @@ module Linguist # Hash of serialized samples object if File.exist?(PATH) - DATA = JSON.load(File.read(PATH)) + serializer = defined?(JSON) ? JSON : YAML + DATA = serializer.load(File.read(PATH)) end # Public: Iterate over each sample.