Merge pull request #280 from jekyll/encoding

Fix encoding bug

Author: mertkahyaoglu

Gemfile

@@ -4,6 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 # Site dependencies
-gem 'minima'
 gem 'jekyll-seo-tag'
 gem 'jekyll-sitemap'

lib/jekyll-admin/data_file.rb

@@ -30,7 +30,7 @@ def relative_path
 
     # Returns unparsed content as it exists on disk
     def raw_content
-      @raw_content ||= File.read(absolute_path)
+      @raw_content ||= File.open(absolute_path, "r:UTF-8", &:read)
     end
 
     # Returnes (re)parsed content using Jekyll's native parsing mechanism

spec/jekyll-admin/server/configuration_spec.rb

@@ -15,7 +15,7 @@ def app
   it "updates the configuration" do
     config_path   = File.expand_path "_config.yml", fixture_path("site")
     config_body   = File.read(config_path)
-    config_before = YAML.load(config_body)
+    config_before = SafeYAML.load(config_body)
     config = config_before.dup
 
     config["foo"] = "bar2"
@@ -33,7 +33,7 @@ def app
   it "doesn't inject the default collections" do
     config_path   = File.expand_path "_config.yml", fixture_path("site")
     config_body   = File.read(config_path)
-    config_before = YAML.load(config_body)
+    config_before = SafeYAML.load(config_body)
 
     config = config_before.dup
     config["collections"]["test"] = { "foo" => "bar" }