Allow binded fields to match more than one selector

Author: miere

pom.xml

@@ -10,7 +10,7 @@
 
 	<groupId>io.skullabs.stalkr</groupId>
 	<artifactId>stalkr-parent</artifactId>
-	<version>0.1.0</version>
+	<version>0.2.1</version>
 	<name>Stalkr: The crawler took kit for Java</name>
 	<packaging>pom</packaging>
 

stalkr-binder/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.skullabs.stalkr</groupId>
 		<artifactId>stalkr-parent</artifactId>
-		<version>0.1.0</version>
+		<version>0.2.1</version>
 	</parent>
 
 	<artifactId>stalkr-binder</artifactId>

stalkr-binder/src/main/java/stalkr/html/BindableAttribute.java

@@ -1,15 +1,16 @@
 package stalkr.html;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@Repeatable( BindableAttributes.class )
 @Retention( RetentionPolicy.RUNTIME )
 @Target( ElementType.FIELD )
 public @interface BindableAttribute {
 
 	String selector();
-
 	String attribute();
 }

stalkr-binder/src/main/java/stalkr/html/BindableAttributes.java

@@ -0,0 +1,13 @@
+package stalkr.html;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention( RetentionPolicy.RUNTIME )
+@Target( ElementType.FIELD )
+public @interface BindableAttributes {
+
+	BindableAttribute[] value();
+}

stalkr-binder/src/main/java/stalkr/html/BindableClassFactory.java

@@ -1,10 +1,12 @@
 package stalkr.html;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@Repeatable( BindableTexts.class )
 @Retention( RetentionPolicy.RUNTIME )
 @Target( ElementType.FIELD )
 public @interface BindableText {

stalkr-binder/src/main/java/stalkr/html/BindableText.java

@@ -0,0 +1,13 @@
+package stalkr.html;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention( RetentionPolicy.RUNTIME )
+@Target( ElementType.FIELD )
+public @interface BindableTexts {
+
+	BindableText[] value();
+}

stalkr-binder/src/main/java/stalkr/html/BindableTexts.java

@@ -9,6 +9,8 @@
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
+import stalkr.html.parser.BindableClass;
+import stalkr.html.parser.BindableClassFactory;
 import trip.spi.Provided;
 import trip.spi.Singleton;
 

stalkr-binder/src/main/java/stalkr/html/HtmlBinder.java

@@ -1,8 +1,9 @@
-package stalkr.html;
+package stalkr.html.parser;
 
 import java.lang.reflect.Field;
 
 import lombok.RequiredArgsConstructor;
+import lombok.val;
 
 import org.jsoup.nodes.Element;
 
@@ -16,8 +17,9 @@ public class AttributeElementSetter implements Setter {
 	@Override
 	public void bind( final Element document, final Object instance ) {
 		try {
-			final Element element = document.select( selector ).first();
-			field.set( instance, element.attr( attribute ) );
+			val element = document.select( selector ).first();
+			if ( element != null )
+				field.set( instance, element.attr( attribute ) );
 		} catch ( IllegalArgumentException | IllegalAccessException e ) {
 			throw new RuntimeException( e );
 		}

…/stalkr/html/AttributeElementSetter.java …/html/parser/AttributeElementSetter.javastalkr-binder/src/main/java/stalkr/html/AttributeElementSetter.java renamed to stalkr-binder/src/main/java/stalkr/html/parser/AttributeElementSetter.java stalkr-binder/src/main/java/stalkr/html/AttributeElementSetter.java renamed to stalkr-binder/src/main/java/stalkr/html/parser/AttributeElementSetter.java

@@ -1,4 +1,4 @@
-package stalkr.html;
+package stalkr.html.parser;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -14,7 +14,7 @@
  * @author Miere Teixeira
  */
 @RequiredArgsConstructor
-class BindableClass {
+public class BindableClass {
 
 	final Class<?> type;
 	final List<Setter> values;