update assignment, transient

fcannizzaro · Sep 2, 2017 · 89e34f2 · 89e34f2
1 parent f6cbbd4
commit 89e34f2
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 19 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,9 +24,9 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:26.0.1'
+    implementation 'com.android.support:appcompat-v7:26.0.2'
     implementation 'org.jsoup:jsoup:1.10.3'
-    implementation 'com.android.support:recyclerview-v7:26.0.1'
+    implementation 'com.android.support:recyclerview-v7:26.0.2'
     implementation 'net.idik:slimadapter:2.1.2'
     implementation 'com.squareup.picasso:picasso:2.5.2'
     compile project(path: ':library')

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 
 buildscript {
-    ext.kotlin_version = '1.1.4-2'
+    ext.kotlin_version = '1.1.4-3'
     repositories {
         google()
         jcenter()

diff --git a/library/build.gradle b/library/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 4
-        versionName "1.0.4"
+        versionCode 5
+        versionName "1.0.5"
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/com/fcannizzaro/ksoup/IKsoup.kt b/library/src/main/java/com/fcannizzaro/ksoup/IKsoup.kt
@@ -9,7 +9,8 @@ import kotlin.properties.Delegates
 
 open class IKsoup(var query: String = "") {
 
-    var element by Delegates.notNull<Element>()
+    @Transient
+    var element: Element? = null
 
     open fun afterBind() {
         // called after element is bound.

diff --git a/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindAttr.kt b/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindAttr.kt
@@ -18,9 +18,9 @@ class bindAttr(private val query: String, private val attr: String, private val
 
     operator fun getValue(ref: IKsoup, property: KProperty<*>): String? {
 
-        if (!assigned) {
+        if (!assigned && ref.element != null)  {
             assigned = true
-            value = extractAttr(ref.element, query, attr, trim)
+            value = extractAttr(ref.element!!, query, attr, trim)
         }
 
         return value

diff --git a/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindClass.kt b/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindClass.kt
@@ -24,8 +24,8 @@ class bindClass(private val instance: IKsoup, private val parent: IKsoup) {
 
                 element = parent.element
 
-                if (query.isNotEmpty()) {
-                    element = element.select(query).first()
+                if (query.isNotEmpty() && element != null) {
+                    element = element!!.select(query).first()
                 }
 
             }

diff --git a/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindImage.kt b/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindImage.kt
@@ -15,9 +15,9 @@ class bindImage(private val query: String, private val trim: Boolean = true) {
 
     operator fun getValue(ref: IKsoup, property: KProperty<*>): String? {
 
-        if (!assigned) {
+        if (!assigned && ref.element != null) {
             assigned = true
-            value = extractImage(ref.element, query, trim)
+            value = extractImage(ref.element!!, query, trim)
         }
 
         return value

diff --git a/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindLink.kt b/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindLink.kt
@@ -15,9 +15,9 @@ class bindLink(private val query: String, private val trim: Boolean = true) {
 
     operator fun getValue(ref: IKsoup, property: KProperty<*>): String? {
 
-        if (!assigned) {
+        if (!assigned && ref.element != null) {
             assigned = true
-            value = extractLink(ref.element, query, trim)
+            value = extractLink(ref.element!!, query, trim)
         }
 
         return value

diff --git a/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindList.kt b/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindList.kt
@@ -17,9 +17,9 @@ class bindList(private val clazz: IKsoup) {
 
     operator fun <T> getValue(ref: IKsoup, property: KProperty<*>): List<T> {
 
-        if (!assigned) {
+        if (!assigned && ref.element != null) {
             assigned = true
-            value = extractList(ref.element, clazz)
+            value = extractList(ref.element!!, clazz)
         }
 
         return value as List<T>

diff --git a/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindText.kt b/library/src/main/java/com/fcannizzaro/ksoup/delegates/bindText.kt
@@ -15,9 +15,9 @@ class bindText(private var query: String, private val trim: Boolean = true) {
 
     operator fun getValue(ref: IKsoup, property: KProperty<*>): String? {
 
-        if (!assigned) {
+        if (!assigned && ref.element != null) {
             assigned = true
-            value = extractText(ref.element, query, trim)
+            value = extractText(ref.element!!, query, trim)
         }
 
         return value