Raise MultiJson::LoadError on blank input

fixes #135
intridea · Sep 8, 2013 · 49aa2d8 · 49aa2d8
1 parent 46684cf
commit 49aa2d8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/multi_json/adapter.rb b/lib/multi_json/adapter.rb
@@ -16,6 +16,7 @@ def defaults(action, value)
       end
 
       def load(string, options={})
+        raise self::ParseError if blank?(string)
         instance.load(string, collect_load_options(options).clone)
       end
 
@@ -43,6 +44,12 @@ def cache(method, options)
         MultiJson.cached_options[cache_key] ||= yield
       end
 
+    private
+
+      def blank?(input)
+        input.nil? || /\A\s*\z/ === input
+      end
+
     end
   end
 end
diff --git a/spec/shared/adapter.rb b/spec/shared/adapter.rb
@@ -169,6 +169,12 @@ def to_json(*)
       expect{MultiJson.load('{"abc"}')}.to raise_error(MultiJson::LoadError)
     end
 
+    it 'raises MultiJson::LoadError in blank input' do
+      [nil, ' ', "\t\t\t", "\n"].each do |input|
+        expect{MultiJson.load(input)}.to raise_error(MultiJson::LoadError)
+      end
+    end
+
     it 'raises MultiJson::LoadError with data on invalid JSON' do
       data = '{invalid}'
       begin