add html annotation

Author: Francesco Cannizzaro

README.md

@@ -68,9 +68,15 @@ class Content {
 String title;
 ```
 
+## @Html(String: query)
+```java
+@Html("div.inner")
+String html;
+```
+
 ## @Attr(String: query, String: attr)
 ```java
-@Attr(value="a", attr="href")
+@Attr(query="a", attr="href")
 String href;
 ```
 

app/src/main/java/com/fcannizzaro/jsoup/sample/model/Package.java

@@ -24,7 +24,7 @@ public static class Info {
 
     }
 
-    @Attr(value = "h3 a", attr = "href")
+    @Attr(query = "h3 a", attr = "href")
     public String link;
 
     @Text("h3")
@@ -33,7 +33,7 @@ public static class Info {
     @Text("p.type-ellipsis")
     public String description;
 
-    @Attr(value = "img.mts", attr = "src")
+    @Attr(query = "img.mts", attr = "src")
     public String icon;
 
     @Child

library/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 10
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.1"
     }
     buildTypes {
         release {

library/src/main/java/com/fcannizzaro/jsoup/annotations/JsoupProcessor.java

@@ -3,6 +3,7 @@
 import com.fcannizzaro.jsoup.annotations.interfaces.Attr;
 import com.fcannizzaro.jsoup.annotations.interfaces.Child;
 import com.fcannizzaro.jsoup.annotations.interfaces.ForEach;
+import com.fcannizzaro.jsoup.annotations.interfaces.Html;
 import com.fcannizzaro.jsoup.annotations.interfaces.Items;
 import com.fcannizzaro.jsoup.annotations.interfaces.Selector;
 import com.fcannizzaro.jsoup.annotations.interfaces.Text;
@@ -48,17 +49,18 @@ public static <T> T from(Element container, Class<T> clazz) {
                 Text text = field.getAnnotation(Text.class);
                 Child child = field.getAnnotation(Child.class);
                 Items items = field.getAnnotation(Items.class);
+                Html html = field.getAnnotation(Html.class);
                 Attr attr = field.getAnnotation(Attr.class);
 
                 Object value = null;
 
                 if (items != null) {
+
                     ParameterizedType type = (ParameterizedType) field.getGenericType();
                     Class<?> cz = (Class<?>) type.getActualTypeArguments()[0];
                     value = fromList(container, cz);
-                }
 
-                if (child != null) {
+                } else if (child != null) {
 
                     Class cz = field.getType();
                     Selector sel = (Selector) cz.getAnnotation(Selector.class);
@@ -67,25 +69,29 @@ public static <T> T from(Element container, Class<T> clazz) {
                         value = from(element(container, sel.value()), cz);
                     }
 
-                }
+                } else if (selector != null) {
 
-                if (selector != null) {
                     value = element(container, selector.value());
-                }
 
-                if (text != null) {
+                } else if (text != null) {
 
                     Element el = element(container, text.value());
 
                     if (el != null) {
                         value = el.text();
                     }
 
-                }
+                } else if (html != null) {
+
+                    Element el = element(container, html.value());
+
+                    if (el != null) {
+                        value = el.html();
+                    }
 
-                if (attr != null) {
+                } else if (attr != null) {
 
-                    Element el = element(container, attr.value());
+                    Element el = element(container, attr.query());
 
                     if (el != null) {
                         value = el.attr(attr.attr());

library/src/main/java/com/fcannizzaro/jsoup/annotations/interfaces/Attr.java

@@ -12,6 +12,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 public @interface Attr {
-    String value();
+    String query();
     String attr();
 }

library/src/main/java/com/fcannizzaro/jsoup/annotations/interfaces/Html.java

@@ -0,0 +1,16 @@
+package com.fcannizzaro.jsoup.annotations.interfaces;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Created by Francesco Cannizzaro (fcannizzaro)
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Html {
+    String value();
+}

library/src/main/java/com/fcannizzaro/jsoup/annotations/interfaces/Text.java

@@ -11,6 +11,6 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
-public @interface Text{
+public @interface Text {
     String value();
 }