From f18c9588c91708fc7d6c31b73223fbb7493ea401 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 17 Aug 2015 12:30:29 +0300 Subject: [PATCH 01/19] - add maven central dependency --- README.md | 6 ++---- lib/osbcp-css-parser-1.4.jar | Bin 25606 -> 0 bytes pom.xml | 12 ++++++++++-- .../java/com/leonty/test/CSSInlinerTest.java | 7 ++++++- 4 files changed, 18 insertions(+), 7 deletions(-) delete mode 100644 lib/osbcp-css-parser-1.4.jar diff --git a/README.md b/README.md index 579440c..0f1e8a1 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,8 @@ If used for email, 'class' attributes can be removed: ##Build -The dependency com.osbcp.cssparser:cssparser:1.4 is not available -in maven central. Deploy the jar from lib/osbcp-css-parser-1.4.jar -to your own maven repository so that it fits the dependency -declaration in the pom. +The dependency com.osbcp:cssparser:1.5 is now available +in maven central. ##Changes diff --git a/lib/osbcp-css-parser-1.4.jar b/lib/osbcp-css-parser-1.4.jar deleted file mode 100644 index 72ca8132af4788fa3d44d3390e0b1a27d979dcd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25606 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 i{1JMbs5}Kg`~OT^6lGxlc?stk&a?D~mWuA1.8.1 - com.osbcp.cssparser + com.osbcp cssparser - 1.4 + 1.5 org.testng testng 6.8.8 +test + \ No newline at end of file diff --git a/src/test/java/com/leonty/test/CSSInlinerTest.java b/src/test/java/com/leonty/test/CSSInlinerTest.java index 76e2f12..9e9338c 100644 --- a/src/test/java/com/leonty/test/CSSInlinerTest.java +++ b/src/test/java/com/leonty/test/CSSInlinerTest.java @@ -25,7 +25,12 @@ public void test() throws Exception { String inlinedHtml = readFile("inlined.html"); - assertEquals(CSSInliner.inlineCss(html, css, true), inlinedHtml); + //assertEquals(CSSInliner.inlineCss(html, css, true), inlinedHtml); + assertEquals(normalized(inlinedHtml), normalized(CSSInliner.inlineCss(html, css, true))); + } + + private String normalized(String text) { + return text.replaceAll("[\n\r]+", "\n"); } @Test(dataProvider = "selectorPrecedenceData") From b15f05cdc94d10c7bb3de0cf2dc6e3907500672a Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 17 Aug 2015 12:39:03 +0300 Subject: [PATCH 02/19] - add bintray repository --- pom.xml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e99f623..3051303 100644 --- a/pom.xml +++ b/pom.xml @@ -32,14 +32,29 @@ org.testng testng 6.8.8 -test + test - + --> + + + jcenter-bintray + Bintray JCenter Maven Repository + default + https://jcenter.bintray.com/ + + true + + + false + + + \ No newline at end of file From dfad61701949981911125253916624e4f91e1912 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 17 Aug 2015 12:40:54 +0300 Subject: [PATCH 03/19] - remove eclipse settings --- .classpath | 12 ------- .project | 36 ------------------- .settings/org.eclipse.jdt.core.prefs | 12 ------- .settings/org.eclipse.m2e.core.prefs | 4 --- .settings/org.eclipse.wst.common.component | 6 ---- ....eclipse.wst.common.project.facet.core.xml | 5 --- .settings/org.jboss.ide.eclipse.as.core.prefs | 2 -- 7 files changed, 77 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.m2e.core.prefs delete mode 100644 .settings/org.eclipse.wst.common.component delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 .settings/org.jboss.ide.eclipse.as.core.prefs diff --git a/.classpath b/.classpath deleted file mode 100644 index 8e189f0..0000000 --- a/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index 9f35eb7..0000000 --- a/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - CSSInliner - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 107056a..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index 84d23c8..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles=nexus -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 5439c8a..0000000 --- a/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 5c9bd75..0000000 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.settings/org.jboss.ide.eclipse.as.core.prefs b/.settings/org.jboss.ide.eclipse.as.core.prefs deleted file mode 100644 index cf3aa3a..0000000 --- a/.settings/org.jboss.ide.eclipse.as.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.jboss.ide.eclipse.as.core.singledeployable.deployableList= From 69f0d56550c3edd8d378e7da10e6afa75d9b5f87 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 17 Aug 2015 12:42:05 +0300 Subject: [PATCH 04/19] - license is described in pom --- LICENSE | 203 -------------------------------------------------------- NOTICE | 24 ------- 2 files changed, 227 deletions(-) delete mode 100644 LICENSE delete mode 100644 NOTICE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 6b0b127..0000000 --- a/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 5fe1301..0000000 --- a/NOTICE +++ /dev/null @@ -1,24 +0,0 @@ -CSSInliner -Copyright 2012 Leonty Belskiy, leonti@eleonti.com. - - - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - - - -This project includes PMD, Copyright (c) 2002-2009, InfoEther, Inc. -All rights reserved. http://pmd.sourceforge.net/ - -This product includes software developed in part by support from the Defense -Advanced Research Project Agency (DARPA) From 34766c21fcefc70f01ee80d5433b26b99b3d64e1 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 17 Aug 2015 12:51:17 +0300 Subject: [PATCH 05/19] - fix pom file to be able to realase to bintray --- pom.xml | 118 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 104 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 3051303..ed1b24f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,20 +3,55 @@ 4.0.0 com.leonty CSSInliner - 1.0 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - 1.7 - 1.7 - - - - + 1.1-SNAPSHOT + Java CSS Inliner + Utility to inline css styles in html document to be used in emails. + ${github.url} + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + Leonti + https://github.com/Leonti + + + Tocco AG + https://www.tocco.ch + + + Costin Grigore + raisercostin@gmail.com + brainlight + http://raisercostin.org + + + + 7 + UTF-8 + raisercostin + CSSInliner + https://github.com/${github.user}/${github.repo} + raisercostin + maven + CSSInliner + + + + scm:git:${github.url}.git + scm:git:${github.url}.git + ${github.url} + HEAD + + + + bintray + https://api.bintray.com/maven/${bintray.user}/${bintray.repo}/${bintray.package} + + org.jsoup @@ -43,6 +78,61 @@ --> + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + maven-release-plugin + 2.5.2 + + false + release + true + + + + + + + release + + + + maven-source-plugin + + + attach-sources + + jar + + + + + + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + jcenter-bintray From 3efea67218aa4b813801fee0e5060923d4ddfb19 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 17 Aug 2015 12:53:06 +0300 Subject: [PATCH 06/19] [maven-release-plugin] prepare release CSSInliner-1.1 --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ed1b24f..719e78b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,8 @@ - + 4.0.0 com.leonty CSSInliner - 1.1-SNAPSHOT + 1.1 Java CSS Inliner Utility to inline css styles in html document to be used in emails. ${github.url} @@ -44,7 +43,7 @@ scm:git:${github.url}.git scm:git:${github.url}.git ${github.url} - HEAD + CSSInliner-1.1 From ea36e4665bf05990e0fbf5d75e4096f86cfbd81e Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 17 Aug 2015 12:53:13 +0300 Subject: [PATCH 07/19] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 719e78b..092fb8b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.leonty CSSInliner - 1.1 + 1.2-SNAPSHOT Java CSS Inliner Utility to inline css styles in html document to be used in emails. ${github.url} @@ -43,7 +43,7 @@ scm:git:${github.url}.git scm:git:${github.url}.git ${github.url} - CSSInliner-1.1 + HEAD From 35ef75233736eded97154fa977d833098e7a3651 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 17 Aug 2015 13:32:17 +0300 Subject: [PATCH 08/19] - fix java version --- pom.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 092fb8b..87a385d 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,8 @@ - 7 + 1.7 + 1.7 UTF-8 raisercostin CSSInliner @@ -68,14 +69,12 @@ 6.8.8 test - @@ -83,10 +82,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.3 - ${java.version} - ${java.version} + ${source.java.version} + ${target.java.version} ${project.build.sourceEncoding} From 4b6ac450b6c12e916b362c06c3066e63340a90e2 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Tue, 18 Aug 2015 22:02:41 +0300 Subject: [PATCH 09/19] - fix pom --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 87a385d..276fd70 100644 --- a/pom.xml +++ b/pom.xml @@ -29,8 +29,8 @@ - 1.7 - 1.7 + 1.7 + 1.7 UTF-8 raisercostin CSSInliner @@ -61,7 +61,7 @@ com.osbcp cssparser - 1.5 + 1.7 org.testng From c7cfd80c5e3ba57ec4f237822513031e9c6066bd Mon Sep 17 00:00:00 2001 From: raisercostin Date: Wed, 19 Aug 2015 09:48:19 +0300 Subject: [PATCH 10/19] - add logging - download external css files - use big production html file --- pom.xml | 5 + src/main/java/com/leonty/CSSInliner.java | 140 +++++++++++----- src/main/java/com/leonty/Try.java | 75 +++++++++ .../java/com/leonty/test/CSSInlinerTest.java | 22 ++- .../java/com/leonty/test/SelectorTest.java | 7 +- .../com/leonty/test/test2-inlined.html | 92 +++++++++++ src/test/resources/com/leonty/test/test2.html | 150 ++++++++++++++++++ 7 files changed, 447 insertions(+), 44 deletions(-) create mode 100644 src/main/java/com/leonty/Try.java create mode 100644 src/test/resources/com/leonty/test/test2-inlined.html create mode 100644 src/test/resources/com/leonty/test/test2.html diff --git a/pom.xml b/pom.xml index 276fd70..f206d5d 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,11 @@ cssparser 1.7 + + ch.qos.logback + logback-classic + 1.1.3 + org.testng testng diff --git a/src/main/java/com/leonty/CSSInliner.java b/src/main/java/com/leonty/CSSInliner.java index 3cbcb45..1e8cc32 100644 --- a/src/main/java/com/leonty/CSSInliner.java +++ b/src/main/java/com/leonty/CSSInliner.java @@ -1,5 +1,6 @@ package com.leonty; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -12,32 +13,56 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; +import org.jsoup.select.Selector.SelectorParseException; +import org.slf4j.LoggerFactory; import com.osbcp.cssparser.CSSParser; import com.osbcp.cssparser.PropertyValue; import com.osbcp.cssparser.Rule; public class CSSInliner { + public static final org.slf4j.Logger LOG = LoggerFactory + .getLogger(CSSInliner.class); public static String inlineCss(String html, String css) throws Exception { return inlineCss(html, css, false); } - - public static String inlineCss(String html, String css, Boolean removeAttributes) throws Exception { + + public static String cleanup(String html) { + Document doc = Jsoup.parse(html); + return doc.html(); + } + + public static String inlineCss(String html, String css, + Boolean removeAttributes) throws Exception { + Document doc = Jsoup.parse(html); + HashMap> selected = new HashMap>(); + + css += getDocumentStyles(doc); + extractSelectors(css, doc, selected); + + mergeCss(removeAttributes, selected); + + return doc.html(); + } + + public static String inlineCss(String html, Boolean removeAttributes) + throws Exception { Document doc = Jsoup.parse(html); HashMap> selected = new HashMap>(); - + String css = readDocumentStyles(doc); css += getDocumentStyles(doc); - extractSelectors(css, doc, selected); - - mergeCss(removeAttributes, selected); - + extractSelectors(css, doc, selected); + + mergeCss(removeAttributes, selected); + return doc.html(); } private static void mergeCss(Boolean removeAttributes, HashMap> selected) { - Iterator>> it = selected.entrySet().iterator(); + Iterator>> it = selected.entrySet() + .iterator(); while (it.hasNext()) { Map.Entry> pair = it.next(); @@ -52,66 +77,107 @@ private static void mergeCss(Boolean removeAttributes, if (initialStyle != null && !initialStyle.isEmpty()) { style += initialStyle; } - + pair.getKey().attr("style", style); - + // if this is used for email we don't need id and style attributes // as all of our styles are already inline if (removeAttributes) { - pair.getKey().removeAttr("class"); + pair.getKey().removeAttr("class"); } } } private static void extractSelectors(String css, Document doc, HashMap> selected) throws Exception { - List rules = CSSParser.parse(css); + extractSelectors(css, doc, selected, false); + } + private static void extractSelectors(String css, Document doc, + HashMap> selected, boolean debug) + throws Exception { + LOG.trace("extract selectors from [{}]", css); + List rules = CSSParser.parse(css); + ArrayList ignored = new ArrayList(); for (Rule rule : rules) { - for (com.osbcp.cssparser.Selector selector : rule.getSelectors()) { - - Elements elements = doc.select(selector.toString()); - - for (Element element : elements) { - - // list of selectors to apply to this element - ArrayList selectors = new ArrayList(); - - // this element already has selectors attached to it - get reference to the list of existing selectors - if (selected.containsKey(element)) { - selectors = selected.get(element); + Try validSelector = select(doc, selector.toString()); + if (validSelector.isDefined()) { + Elements elements = validSelector.get(); + for (Element element : elements) { + + // list of selectors to apply to this element + ArrayList selectors = new ArrayList(); + + // this element already has selectors attached to it + // - + // get + // reference to the list of existing selectors + if (selected.containsKey(element)) { + selectors = selected.get(element); + } + + // add new selector containing styles to this dom + // element + selectors.add(new Selector(selector.toString(), + getStyleString(rule))); + + selected.put(element, selectors); } - - // add new selector containing styles to this dom element - selectors.add(new Selector(selector.toString(), getStyleString(rule))); - - selected.put(element, selectors); + } else { + ignored.add(selector); + if (debug) + LOG.warn("Couldn't select with [" + selector.toString() + + "]", validSelector.failure()); } } } + LOG.warn("{} selectors where ignored while {} where returned. Switch to trace to get a list.",ignored.size(),selected.size()); + LOG.trace("The following selectors where ignored {}",ignored); } - - public static String getDocumentStyles(Document doc) { + + private static Try select(Document doc, String selector) { + try { + return Try.success(doc.select(selector)); + } catch (SelectorParseException e) { + return Try.failure(e); + } + } + + private static String readDocumentStyles(Document doc) throws IOException { + Elements elements = doc + .select("link[rel=stylesheet],link[type=text/css]"); + StringBuilder styles = new StringBuilder(); + for (Element style : elements) { + String url = style.attr("href"); + LOG.info("Download external css from [{}]", url); + String cssContent = Jsoup.connect(url).execute().body(); + styles.append(cssContent).append("\n"); + } + return styles.toString(); + } + + public static String getDocumentStyles(Document doc) throws IOException { Elements elements = doc.select("style"); - + String styles = ""; for (Element style : elements) { styles += style.html(); } - + // we don't need style elements anymore elements.remove(); return styles; } - + public static String getStyleString(Rule rule) { String style = ""; - + for (PropertyValue propertyValue : rule.getPropertyValues()) { - style += propertyValue.getProperty() + ": " + propertyValue.getValue() + "; "; + style += propertyValue.getProperty() + ": " + + propertyValue.getValue() + "; "; } - + return style; } } diff --git a/src/main/java/com/leonty/Try.java b/src/main/java/com/leonty/Try.java new file mode 100644 index 0000000..3a0b9a3 --- /dev/null +++ b/src/main/java/com/leonty/Try.java @@ -0,0 +1,75 @@ +package com.leonty; + +abstract class Try { + + public abstract T get(); + + public abstract Throwable failure(); + + public abstract boolean isDefined(); + + public static Try success(T value) { + return new Success(value); + } + + public static Try failure(Throwable e) { + return new Failure(e); + } + + private static class Success extends Try { + private final T value; + + public Success(T value) { + this.value = value; + } + + @Override + public T get() { + return value; + } + + @Override + public boolean isDefined() { + return true; + } + + @Override + public String toString() { + return "Success(" + value + ")"; + } + + @Override + public Throwable failure() { + throw new RuntimeException( + "The result is success. Cannot get a failure."); + } + } + + private static class Failure extends Try { + public final Throwable error; + + public Failure(Throwable error) { + this.error = error; + } + + @Override + public T get() { + throw new RuntimeException("Try thrown an exception.", error); + } + + @Override + public boolean isDefined() { + return false; + } + + @Override + public String toString() { + return "Failure(" + error + ")"; + } + + @Override + public Throwable failure() { + return error; + } + } +} \ No newline at end of file diff --git a/src/test/java/com/leonty/test/CSSInlinerTest.java b/src/test/java/com/leonty/test/CSSInlinerTest.java index 9e9338c..19b7dc9 100644 --- a/src/test/java/com/leonty/test/CSSInlinerTest.java +++ b/src/test/java/com/leonty/test/CSSInlinerTest.java @@ -12,10 +12,11 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; +import static org.junit.Assert.*; +import org.junit.Test; +//import org.testng.annotations.Test; +//import static org.testng.AssertJUnit.assertEquals; public class CSSInlinerTest { @Test @@ -29,11 +30,22 @@ public void test() throws Exception { assertEquals(normalized(inlinedHtml), normalized(CSSInliner.inlineCss(html, css, true))); } + @Test + public void test2() throws Exception { + String html = readFile("test2.html"); + //String css = readFile("test.css"); + + String inlinedHtml = readFile("test2-inlined.html"); + + //assertEquals(CSSInliner.inlineCss(html, css, true), inlinedHtml); + assertEquals(normalized(CSSInliner.cleanup(inlinedHtml)), normalized(CSSInliner.inlineCss(html, true))); + } + private String normalized(String text) { - return text.replaceAll("[\n\r]+", "\n"); + return text.replaceAll("\\r\\n|\\n|\\r", "\n").replaceAll("\\t"," ").replaceAll("\\s+\\n","\n"); } - @Test(dataProvider = "selectorPrecedenceData") + @org.testng.annotations.Test(dataProvider = "selectorPrecedenceData") public void testSelectorPrecedence(String css, String initialStyleAttribute, String expectedStyleAttribute) throws Exception { String html = "\n" + diff --git a/src/test/java/com/leonty/test/SelectorTest.java b/src/test/java/com/leonty/test/SelectorTest.java index d51b5ff..3407df5 100644 --- a/src/test/java/com/leonty/test/SelectorTest.java +++ b/src/test/java/com/leonty/test/SelectorTest.java @@ -1,9 +1,12 @@ package com.leonty.test; import com.leonty.Selector; -import org.testng.annotations.Test; -import static org.testng.AssertJUnit.assertEquals; +import static org.junit.Assert.*; +import org.junit.Test; + +//import org.testng.annotations.Test; +//import static org.testng.AssertJUnit.assertEquals; public class SelectorTest { diff --git a/src/test/resources/com/leonty/test/test2-inlined.html b/src/test/resources/com/leonty/test/test2-inlined.html new file mode 100644 index 0000000..777f3a0 --- /dev/null +++ b/src/test/resources/com/leonty/test/test2-inlined.html @@ -0,0 +1,92 @@ + + + + Cauta - + + + + + + + + + +
+
+
+
+
+ Sandale Dama Sandale Dama Quiet Beige GMIP 752 Ilpasso.ro - Ilpasso.ro +
+
+ +
+
+
+ Sandale Dama Sandale Dama Quiet Beige GMIP 752 Sandale de dama din piele naturala cu diverse finisaje care confera versatilitate oricarei tinute de... +
+
+
+
+
+
Pret: + 399 RON + +
+
+
+
+
+
+
+ +
+ +
+ + \ No newline at end of file diff --git a/src/test/resources/com/leonty/test/test2.html b/src/test/resources/com/leonty/test/test2.html new file mode 100644 index 0000000..83316f2 --- /dev/null +++ b/src/test/resources/com/leonty/test/test2.html @@ -0,0 +1,150 @@ + + + + + Cauta - + + + + + + + + + + + + + + + + +
+ +
+
+
+
+ + Sandale Dama Sandale Dama Quiet Beige GMIP 752 Ilpasso.ro - Ilpasso.ro + +
+
+ +
+
+ +

Sandale Dama Sandale Dama Quiet Beige GMIP 752 Ilpasso.ro - Ilpasso.ro

+ + +
+
+
+
+
+ Sandale Dama Sandale Dama Quiet Beige GMIP 752 Sandale de dama din piele naturala cu diverse finisaje care confera versatilitate oricarei tinute de... +
+
+
+
+
+
+ Pret: + 399 RON + +
+ + facebook + + Google+ + Twitter + Email + + Detalii + + +
+
+
+ +
+
+
+
+ +
+ + + + + +
+ +
+ + From d540a8c5478537a644870f5fc4d6559712ea11a0 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Wed, 19 Aug 2015 09:48:50 +0300 Subject: [PATCH 11/19] [maven-release-plugin] prepare release CSSInliner-1.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f206d5d..2428415 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.leonty CSSInliner - 1.2-SNAPSHOT + 1.2 Java CSS Inliner Utility to inline css styles in html document to be used in emails. ${github.url} @@ -44,7 +44,7 @@ scm:git:${github.url}.git scm:git:${github.url}.git ${github.url} - HEAD + CSSInliner-1.2 From 77724cc27473934ee6ed9ef57a70578f134f248d Mon Sep 17 00:00:00 2001 From: raisercostin Date: Wed, 19 Aug 2015 09:48:57 +0300 Subject: [PATCH 12/19] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2428415..c3ae9f4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.leonty CSSInliner - 1.2 + 1.3-SNAPSHOT Java CSS Inliner Utility to inline css styles in html document to be used in emails. ${github.url} @@ -44,7 +44,7 @@ scm:git:${github.url}.git scm:git:${github.url}.git ${github.url} - CSSInliner-1.2 + HEAD From 33bb8d65f3ca469d3be1d738b550141921af8942 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 24 Aug 2015 10:05:36 +0300 Subject: [PATCH 13/19] transform html to internal css --- README.md | 9 +- src/main/java/com/leonty/CSSInliner.java | 48 +- .../java/com/leonty/test/CSSInlinerTest.java | 11 + .../com/leonty/test/test2-inlined.html | 4 - .../com/leonty/test/test2-internal.html | 7974 +++++++++++++++++ 5 files changed, 8026 insertions(+), 20 deletions(-) create mode 100644 src/test/resources/com/leonty/test/test2-internal.html diff --git a/README.md b/README.md index 0f1e8a1..642018d 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,14 @@ If used for email, 'class' attributes can be removed: The dependency com.osbcp:cssparser:1.5 is now available in maven central. +##Other similar libraries +- CSS parsers + - [https://github.com/phax/ph-css](https://github.com/phax/ph-css) + - [http://stackoverflow.com/questions/1513587/looking-for-a-css-parser-in-java](http://stackoverflow.com/questions/1513587/looking-for-a-css-parser-in-java) + - [http://sourceforge.net/p/cssparser/](http://sourceforge.net/p/cssparser/) +- Other resources + - [inline vs internal vs external css](https://vineetgupta22.wordpress.com/2011/07/09/inline-vs-internal-vs-external-css/) + ##Changes v1.0 2012-02-05 Leonti Bielski @@ -28,4 +36,3 @@ Copyright 2012 Leonti Bielski, leonti.me Licensed under the Apache License, Version 2.0 - diff --git a/src/main/java/com/leonty/CSSInliner.java b/src/main/java/com/leonty/CSSInliner.java index 1e8cc32..1db009b 100644 --- a/src/main/java/com/leonty/CSSInliner.java +++ b/src/main/java/com/leonty/CSSInliner.java @@ -21,13 +21,14 @@ import com.osbcp.cssparser.Rule; public class CSSInliner { - public static final org.slf4j.Logger LOG = LoggerFactory + private static final org.slf4j.Logger LOG = LoggerFactory .getLogger(CSSInliner.class); public static String inlineCss(String html, String css) throws Exception { return inlineCss(html, css, false); } + /** Returns the cleaned html that will be used for inlining css. */ public static String cleanup(String html) { Document doc = Jsoup.parse(html); return doc.html(); @@ -37,12 +38,9 @@ public static String inlineCss(String html, String css, Boolean removeAttributes) throws Exception { Document doc = Jsoup.parse(html); HashMap> selected = new HashMap>(); - - css += getDocumentStyles(doc); + css += getInternalStyles(doc); extractSelectors(css, doc, selected); - mergeCss(removeAttributes, selected); - return doc.html(); } @@ -50,12 +48,21 @@ public static String inlineCss(String html, Boolean removeAttributes) throws Exception { Document doc = Jsoup.parse(html); HashMap> selected = new HashMap>(); - String css = readDocumentStyles(doc); - css += getDocumentStyles(doc); + String css = readExternalStyles(doc); + remvoeExternalStyles(doc); + css += getInternalStyles(doc); extractSelectors(css, doc, selected); - mergeCss(removeAttributes, selected); + return doc.html(); + } + public static String internalCss(String html) throws IOException { + Document doc = Jsoup.parse(html); + String css = readExternalStyles(doc); + css += getInternalStyles(doc); + remvoeExternalStyles(doc); + Element head = doc.head(); + head.append(""); return doc.html(); } @@ -132,8 +139,10 @@ private static void extractSelectors(String css, Document doc, } } } - LOG.warn("{} selectors where ignored while {} where returned. Switch to trace to get a list.",ignored.size(),selected.size()); - LOG.trace("The following selectors where ignored {}",ignored); + LOG.warn( + "{} selectors where ignored while {} where returned. Switch to trace to get a list.", + ignored.size(), selected.size()); + LOG.trace("The following selectors where ignored {}", ignored); } private static Try select(Document doc, String selector) { @@ -144,20 +153,29 @@ private static Try select(Document doc, String selector) { } } - private static String readDocumentStyles(Document doc) throws IOException { - Elements elements = doc - .select("link[rel=stylesheet],link[type=text/css]"); + private static String readExternalStyles(Document doc) throws IOException { + Elements elements = selectExternalStyle(doc); StringBuilder styles = new StringBuilder(); for (Element style : elements) { String url = style.attr("href"); LOG.info("Download external css from [{}]", url); String cssContent = Jsoup.connect(url).execute().body(); - styles.append(cssContent).append("\n"); + styles.append("/*external css from [").append(url).append("]*/\n").append(cssContent).append("\n"); } return styles.toString(); } - public static String getDocumentStyles(Document doc) throws IOException { + private static void remvoeExternalStyles(Document doc) { + Elements elements = selectExternalStyle(doc); + elements.remove(); + } + + private static Elements selectExternalStyle(Document doc) { + return doc + .select("link[rel=stylesheet],link[type=text/css]"); + } + + public static String getInternalStyles(Document doc) throws IOException { Elements elements = doc.select("style"); String styles = ""; diff --git a/src/test/java/com/leonty/test/CSSInlinerTest.java b/src/test/java/com/leonty/test/CSSInlinerTest.java index 19b7dc9..7c8cb57 100644 --- a/src/test/java/com/leonty/test/CSSInlinerTest.java +++ b/src/test/java/com/leonty/test/CSSInlinerTest.java @@ -41,6 +41,17 @@ public void test2() throws Exception { assertEquals(normalized(CSSInliner.cleanup(inlinedHtml)), normalized(CSSInliner.inlineCss(html, true))); } + @Test + public void testInternalStyle() throws Exception { + String html = readFile("test2.html"); + //String css = readFile("test.css"); + + String internalHtml = readFile("test2-internal.html"); + + //assertEquals(CSSInliner.inlineCss(html, css, true), inlinedHtml); + assertEquals(normalized(CSSInliner.cleanup(internalHtml)), normalized(CSSInliner.internalCss(html))); + } + private String normalized(String text) { return text.replaceAll("\\r\\n|\\n|\\r", "\n").replaceAll("\\t"," ").replaceAll("\\s+\\n","\n"); } diff --git a/src/test/resources/com/leonty/test/test2-inlined.html b/src/test/resources/com/leonty/test/test2-inlined.html index 777f3a0..c3f8da8 100644 --- a/src/test/resources/com/leonty/test/test2-inlined.html +++ b/src/test/resources/com/leonty/test/test2-inlined.html @@ -4,10 +4,6 @@ Cauta - - - - - diff --git a/src/test/resources/com/leonty/test/test2-internal.html b/src/test/resources/com/leonty/test/test2-internal.html new file mode 100644 index 0000000..f43659e --- /dev/null +++ b/src/test/resources/com/leonty/test/test2-internal.html @@ -0,0 +1,7974 @@ + + + + Cauta - + + + + + + +
+
+
+
+
+ Sandale Dama Sandale Dama Quiet Beige GMIP 752 Ilpasso.ro - Ilpasso.ro +
+
+
+
+

Sandale Dama Sandale Dama Quiet Beige GMIP 752 Ilpasso.ro - Ilpasso.ro

+ +
+
+
+
+
+ Sandale Dama Sandale Dama Quiet Beige GMIP 752 Sandale de dama din piele naturala cu diverse finisaje care confera versatilitate oricarei tinute de... +
+
+
+
+
+
Pret: + 399 RON +
+ facebook + Google+ + Twitter + Email + Detalii + +
+
+
+
+
+
+
+
+ +
+ +
+ + \ No newline at end of file From 9fb48404224e94124351dbcff956be9bfebbc8ab Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 24 Aug 2015 10:06:31 +0300 Subject: [PATCH 14/19] [maven-release-plugin] prepare release CSSInliner-1.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c3ae9f4..02f666b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.leonty CSSInliner - 1.3-SNAPSHOT + 1.3 Java CSS Inliner Utility to inline css styles in html document to be used in emails. ${github.url} @@ -44,7 +44,7 @@ scm:git:${github.url}.git scm:git:${github.url}.git ${github.url} - HEAD + CSSInliner-1.3 From 2c116f228e08c59560d4e5e29ce544c76fb2aa73 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 24 Aug 2015 10:06:38 +0300 Subject: [PATCH 15/19] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 02f666b..814ca63 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.leonty CSSInliner - 1.3 + 1.4-SNAPSHOT Java CSS Inliner Utility to inline css styles in html document to be used in emails. ${github.url} @@ -44,7 +44,7 @@ scm:git:${github.url}.git scm:git:${github.url}.git ${github.url} - CSSInliner-1.3 + HEAD From fedcacb1686bc9d2d97b794c6b5fc97fef38b608 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 24 Aug 2015 20:46:16 +0300 Subject: [PATCH 16/19] replaceRelativeUrls to the css file location --- src/main/java/com/leonty/CSSInliner.java | 75 ++++++++++++++++++- .../com/leonty/test/test2-internal.html | 8 +- 2 files changed, 75 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/leonty/CSSInliner.java b/src/main/java/com/leonty/CSSInliner.java index 1db009b..7f73316 100644 --- a/src/main/java/com/leonty/CSSInliner.java +++ b/src/main/java/com/leonty/CSSInliner.java @@ -1,6 +1,10 @@ package com.leonty; import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -8,6 +12,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -62,7 +68,7 @@ public static String internalCss(String html) throws IOException { css += getInternalStyles(doc); remvoeExternalStyles(doc); Element head = doc.head(); - head.append(""); + head.append(""); return doc.html(); } @@ -160,10 +166,72 @@ private static String readExternalStyles(Document doc) throws IOException { String url = style.attr("href"); LOG.info("Download external css from [{}]", url); String cssContent = Jsoup.connect(url).execute().body(); - styles.append("/*external css from [").append(url).append("]*/\n").append(cssContent).append("\n"); + cssContent = replaceRelativeUrls(cssContent, url); + styles.append("/*external css from [").append(url).append("]*/\n") + .append(cssContent).append("\n"); } return styles.toString(); } + private static final Pattern url1 = Pattern.compile("url\\([ ]*'([^']+)'[ ]*\\)"); + private static final Pattern url2 = Pattern.compile("url\\([ ]*\"([^\"]+)\"[ ]*\\)"); + + private static String replaceRelativeUrls(String cssContent, String url) { + String result = cssContent; + result = replaceUrlWithSeparator(result, url, "'", url1); + result = replaceUrlWithSeparator(result, url, "\"", url2); + return result; + } + + private static String replaceUrlWithSeparator(String cssContent, + String url, String separator, Pattern urlMatcher) { + try { + String result = cssContent; + Matcher m = urlMatcher.matcher(result); + StringBuffer sb = new StringBuffer(); + URI fullURL = new URI(url); + URI parent = fullURL.getPath().endsWith("/") ? fullURL.resolve("..") : fullURL.resolve("."); + while (m.find()) { + String foundUrl = m.group(1); + //System.out.println(foundUrl + "->" + isAbsoluteURL(foundUrl)); + String replacement = ""; + if (isAbsoluteURL(foundUrl)) + replacement = foundUrl; + else + replacement = parent.toString() + foundUrl; + m.appendReplacement(sb, "url("+separator+replacement+separator+")"); + } + m.appendTail(sb); + result = sb.toString(); + result = url2.matcher(result).replaceAll("url(\"$1\")"); + return result; + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + } + + /**@see http://stackoverflow.com/questions/10159186/how-to-get-parent-url-in-java */ + public static boolean isAbsoluteURL(String url) { + try { + final URL baseHTTP = new URL("http://example.com"); + final URL baseFILE = new URL("file:///"); + URL frelative = new URL(baseFILE, url); + URL hrelative = new URL(baseHTTP, url); + // System.err.println("DEBUG: file URL: " + frelative.toString()); + // System.err.println("DEBUG: http URL: " + hrelative.toString()); + return frelative.equals(hrelative); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + + public static boolean isAbsoluteURL2(String url) { + try { + URI u = new URI(url); + return u.isAbsolute(); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + } private static void remvoeExternalStyles(Document doc) { Elements elements = selectExternalStyle(doc); @@ -171,8 +239,7 @@ private static void remvoeExternalStyles(Document doc) { } private static Elements selectExternalStyle(Document doc) { - return doc - .select("link[rel=stylesheet],link[type=text/css]"); + return doc.select("link[rel=stylesheet],link[type=text/css]"); } public static String getInternalStyles(Document doc) throws IOException { diff --git a/src/test/resources/com/leonty/test/test2-internal.html b/src/test/resources/com/leonty/test/test2-internal.html index f43659e..7acfeff 100644 --- a/src/test/resources/com/leonty/test/test2-internal.html +++ b/src/test/resources/com/leonty/test/test2-internal.html @@ -14,8 +14,8 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../fonts/fontawesome-webfont.eot?v=4.2.0'); - src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg'); + src: url('http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/../fonts/fontawesome-webfont.eot?v=4.2.0'); + src: url('http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } @@ -1941,8 +1941,8 @@ } @font-face { font-family: 'Glyphicons Halflings'; - src: url('../fonts/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/../fonts/glyphicons-halflings-regular.eot'); + src: url('http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/../fonts/glyphicons-halflings-regular.woff') format('woff'), url('http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; From afa7a2d0975075cf3b2866cc8cdffa46d52b68b1 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 24 Aug 2015 20:53:37 +0300 Subject: [PATCH 17/19] fix javadoc error --- src/main/java/com/leonty/CSSInliner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/leonty/CSSInliner.java b/src/main/java/com/leonty/CSSInliner.java index 7f73316..6fec2c5 100644 --- a/src/main/java/com/leonty/CSSInliner.java +++ b/src/main/java/com/leonty/CSSInliner.java @@ -209,7 +209,7 @@ private static String replaceUrlWithSeparator(String cssContent, } } - /**@see http://stackoverflow.com/questions/10159186/how-to-get-parent-url-in-java */ + /*see http://stackoverflow.com/questions/10159186/how-to-get-parent-url-in-java */ public static boolean isAbsoluteURL(String url) { try { final URL baseHTTP = new URL("http://example.com"); From f588f9a9960de06898699a960d8b3024cf5701d2 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 24 Aug 2015 20:54:02 +0300 Subject: [PATCH 18/19] [maven-release-plugin] prepare release CSSInliner-1.4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 814ca63..1942a65 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.leonty CSSInliner - 1.4-SNAPSHOT + 1.4 Java CSS Inliner Utility to inline css styles in html document to be used in emails. ${github.url} @@ -44,7 +44,7 @@ scm:git:${github.url}.git scm:git:${github.url}.git ${github.url} - HEAD + CSSInliner-1.4 From 79518667e2a7bbc6872d7dc597666324da18fd64 Mon Sep 17 00:00:00 2001 From: raisercostin Date: Mon, 24 Aug 2015 20:54:09 +0300 Subject: [PATCH 19/19] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1942a65..1327883 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.leonty CSSInliner - 1.4 + 1.5-SNAPSHOT Java CSS Inliner Utility to inline css styles in html document to be used in emails. ${github.url} @@ -44,7 +44,7 @@ scm:git:${github.url}.git scm:git:${github.url}.git ${github.url} - CSSInliner-1.4 + HEAD