diff --git a/Gemfile.lock b/Gemfile.lock index 2d8095a..67e13c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,7 +13,7 @@ GEM fakefs (0.3.2) git (1.2.5) jeweler (1.6.0) - bundler (~> 1.0.0) + bundler (~> 1.1.0) git (>= 1.2.5) rake mocha (0.9.12) diff --git a/juicer.gemspec b/juicer.gemspec index 5548e14..1fa62bc 100644 --- a/juicer.gemspec +++ b/juicer.gemspec @@ -5,7 +5,7 @@ Gem::Specification.new do |s| s.name = %q{juicer} - s.version = "1.0.13" + s.version = "1.0.14" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Christian Johansen"] diff --git a/lib/juicer.rb b/lib/juicer.rb index 2783b12..9f6cb87 100644 --- a/lib/juicer.rb +++ b/lib/juicer.rb @@ -3,7 +3,7 @@ module Juicer # :stopdoc: - VERSION = '1.0.13' + VERSION = '1.0.14' LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR LOGGER = Logger.new(STDOUT) diff --git a/lib/juicer/merger/base.rb b/lib/juicer/merger/base.rb index ed33d5f..ccab6ac 100644 --- a/lib/juicer/merger/base.rb +++ b/lib/juicer/merger/base.rb @@ -67,7 +67,7 @@ def resolve_dependencies(file) # Fetch contents of a single file. May be overridden in subclasses to provide # custom content filtering def merge(file) - IO.read(file) + "\n" + IO.read(file, {"mode" => "r:bom|utf-8"}) + "\n" end end end