Provide option to disable inlining attributes

Provide option to disable inlining attributes as many of these
are obsolete and the values they accept are not always
the same as CSS.

Author: slt

Makefile

@@ -0,0 +1,5 @@
+default: douceur
+
+.PHONY: douceur
+douceur:
+	CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' .

douceur.go

@@ -12,17 +12,19 @@ import (
 
 const (
 	// Version is package version
-	Version = "0.3.1"
+	Version = "0.3.2"
 )
 
 var (
-	flagVersion bool
-	cssPath     string
+	flagVersion  bool
+	noAttributes bool
+	cssPath      string
 )
 
 func init() {
 	flag.BoolVar(&flagVersion, "version", false, "Display version")
-	flag.StringVar(&cssPath, "es", "", "Include external stylesheet when inlining")
+	flag.BoolVar(&noAttributes, "n", false, "Don't inline obsolete attributes like bgcolor & valign")
+	flag.StringVar(&cssPath, "c", "", "Include external stylesheet when inlining")
 }
 
 func main() {
@@ -54,6 +56,7 @@ func main() {
 }
 
 func usage() {
+	fmt.Printf("Help: %s -h", os.Args[0])
 	fmt.Printf("Usage: %s %s %s\n", os.Args[0], "(parse|inline)", "/path/to/file")
 	fmt.Printf("Usage: %s %s < %s\n", os.Args[0], "(parse|inline)", "/path/to/file")
 }
@@ -74,13 +77,19 @@ func parseCSS(filePath string) {
 // inlines CSS into HTML and display result
 func inlineCSS(filePath string, cssPath string) {
 	htmlInput := string(read(filePath))
-	cssInput := ""
+	instance := inliner.NewInliner(htmlInput)
 
 	if cssPath != "" {
-		cssInput = string(readFile(cssPath))
+		cssInput := string(readFile(cssPath))
+		err := instance.ParseStylesheet(cssInput)
+		if err != nil {
+			fmt.Println("Inlining error: ", err)
+			os.Exit(1)
+		}
 	}
 
-	output, err := inliner.InlineWithExternalCSS(htmlInput, cssInput)
+	instance.InlineAttributes(!noAttributes)
+	output, err := instance.Inline()
 	if err != nil {
 		fmt.Println("Inlining error: ", err)
 		os.Exit(1)

inliner/element.go

@@ -68,7 +68,7 @@ func (element *Element) addStyleRule(styleRule *StyleRule) {
 }
 
 // Inline styles on element
-func (element *Element) inline() error {
+func (element *Element) inline(inlineAttributes bool) error {
 	// compute declarations
 	declarations, err := element.computeDeclarations()
 	if err != nil {
@@ -82,7 +82,9 @@ func (element *Element) inline() error {
 	}
 
 	// set additionnal attributes
-	element.setAttributesFromStyle(declarations)
+	if inlineAttributes {
+		element.setAttributesFromStyle(declarations)
+	}
 
 	return nil
 }

inliner/inliner.go

@@ -25,6 +25,9 @@ type Inliner struct {
 	// Raw HTML
 	html string
 
+	// Add obsolete attributes for older clients
+	inlineAttributes bool
+
 	// Parsed HTML document
 	doc *goquery.Document
 
@@ -44,30 +47,16 @@ type Inliner struct {
 // NewInliner instanciates a new Inliner
 func NewInliner(html string) *Inliner {
 	return &Inliner{
-		html:     html,
-		elements: make(map[string]*Element),
+		html:             html,
+		elements:         make(map[string]*Element),
+		inlineAttributes: true,
 	}
 }
 
 // Inline inlines css into html document
 func Inline(html string) (string, error) {
-	return InlineWithExternalCSS(html, "")
-}
-
-// InlineWithExternalCSS Includes external css
-func InlineWithExternalCSS(html string, css string) (string, error) {
 	inliner := NewInliner(html)
-	err := inliner.parseStylesheet(css)
-	if err != nil {
-		return "", err
-	}
-
-	result, err := inliner.Inline()
-	if err != nil {
-		return "", err
-	}
-
-	return result, nil
+	return inliner.Inline()
 }
 
 // Inline inlines CSS and returns HTML
@@ -97,6 +86,11 @@ func (inliner *Inliner) Inline() (string, error) {
 	return inliner.genHTML()
 }
 
+// InlineAttributes sets if the inliner should inline attributes
+func (inliner *Inliner) InlineAttributes(val bool) {
+	inliner.inlineAttributes = val
+}
+
 // Parses raw html
 func (inliner *Inliner) parseHTML() error {
 	doc, err := goquery.NewDocumentFromReader(strings.NewReader(inliner.html))
@@ -114,7 +108,7 @@ func (inliner *Inliner) parseStylesheets() error {
 	var result error
 
 	inliner.doc.Find("style").EachWithBreak(func(i int, s *goquery.Selection) bool {
-		result = inliner.parseStylesheet(s.Text())
+		result = inliner.ParseStylesheet(s.Text())
 		if result != nil {
 			return false
 		}
@@ -128,7 +122,8 @@ func (inliner *Inliner) parseStylesheets() error {
 	return result
 }
 
-func (inliner *Inliner) parseStylesheet(s string) error {
+// ParseStylesheet parses a stylesheet for inlining.
+func (inliner *Inliner) ParseStylesheet(s string) error {
 	stylesheet, err := parser.Parse(s)
 	if err != nil {
 		return err
@@ -188,7 +183,7 @@ func (inliner *Inliner) inlineStyleRules() error {
 		element.elt.RemoveAttr(eltMarkerAttr)
 
 		// inline element
-		err := element.inline()
+		err := element.inline(inliner.inlineAttributes)
 		if err != nil {
 			return err
 		}

inliner/inliner_test.go

@@ -47,7 +47,7 @@ func TestInliner(t *testing.T) {
 }
 
 // Simple rule inlining with two declarations
-func TestInlineWithExternalCSS(t *testing.T) {
+func TestParseStylesheet(t *testing.T) {
 	input := `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -74,7 +74,13 @@ func TestInlineWithExternalCSS(t *testing.T) {
   
 </body></html>`
 
-	output, err := InlineWithExternalCSS(input, cssInput)
+	instance := NewInliner(input)
+	err := instance.ParseStylesheet(cssInput)
+	if err != nil {
+		t.Fatal("Failed to inline html:", err)
+	}
+
+	output, err := instance.Inline()
 	if err != nil {
 		t.Fatal("Failed to inline html:", err)
 	}