Merge pull request #13 from lukewendling/master

trim newlines in ERB closing tags

lib/roboto/content_provider.rb

@@ -10,7 +10,7 @@ def contents(custom_binding = nil)
 
       @contents = File.read(path)
       if path.extname == '.erb'
-        @contents = ERB.new(@contents).result(custom_binding ? custom_binding : binding)
+        @contents = ERB.new(@contents, nil, '>').result(custom_binding ? custom_binding : binding)
       end
       @contents
     end

spec/roboto/content_provider_spec.rb

@@ -29,6 +29,13 @@
     content_provider.contents.should eql(Rails.env)
   end
 
+  it 'strips newlines in closing erb tags' do
+    path = Rails.root.join("config/robots/test.txt.erb")
+    File.open(path, 'wb') { |f| f.write("<% if true %>\n<%= Rails.env %>\n<% end %>") }
+    content_provider.path.should eql(path)
+    content_provider.contents.should eql(Rails.env)
+  end
+
   it 'uses the default robots file if found in the rails root' do
     path = Rails.root.join(relative_path_to_default)
     FileUtils.touch(path)