Merge branch 'dev'

green-nick · Dec 4, 2019 · 55cb5e4 · 55cb5e4
2 parents 49d919f + f13d8cd
commit 55cb5e4
Show file tree

Hide file tree

Showing 12 changed files with 128 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
 [![](https://jitpack.io/v/green-nick/properties.svg)](https://jitpack.io/#green-nick/properties)
+[![](https://jitci.com/gh/green-nick/properties/svg)](https://jitci.com/gh/green-nick/properties)
+
 # Properties
 Small, lightweight library that allows to use observable properties.  
 Written in pure Kotlin, without third-party dependencies, Kotlin oriented.  

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.21'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.50'
     id('maven')
 }
 

diff --git a/src/main/java/com/github/greennick/properties/debounce/DebouncePropertyImpl.kt b/src/main/java/com/github/greennick/properties/debounce/DebouncePropertyImpl.kt
@@ -1,6 +1,7 @@
 package com.github.greennick.properties.debounce
 
 import com.github.greennick.properties.subscriptions.ListenableSubscription
+import com.github.greennick.properties.subscriptions.SubscriptionImpl
 import java.util.concurrent.CopyOnWriteArraySet
 
 internal class DebouncePropertyImpl<T>(
@@ -28,7 +29,7 @@ internal class DebouncePropertyImpl<T>(
     override fun subscribe(onChanged: (T) -> Unit): ListenableSubscription {
         listeners += onChanged
         onChanged(value)
-        return SubscriptionImpl(this, onChanged)
+        return SubscriptionImpl(listeners, onChanged)
     }
 
     override fun forceSet(value: T) {
@@ -59,25 +60,4 @@ internal class DebouncePropertyImpl<T>(
         result = 31 * result + _value.hashCode()
         return result
     }
-
-    private class SubscriptionImpl<T>(
-        private val propertyImpl: DebouncePropertyImpl<T>,
-        private val action: (T) -> Unit
-    ) : ListenableSubscription {
-        private var onUnsubscribe: (() -> Unit)? = null
-
-        override val subscribed get() = action in propertyImpl.listeners
-
-        override fun unsubscribe() {
-            if (!subscribed) return
-
-            if (propertyImpl.listeners.remove(action)) {
-                onUnsubscribe?.invoke()
-            }
-        }
-
-        override fun onUnsubscribe(action: () -> Unit) {
-            onUnsubscribe = action
-        }
-    }
-}
+}
diff --git a/src/main/java/com/github/greennick/properties/generic/CollectionsExt.kt b/src/main/java/com/github/greennick/properties/generic/CollectionsExt.kt
@@ -36,6 +36,30 @@ operator fun <T> MutableProperty<List<T>>.minusAssign(another: Iterable<T>) {
 
 operator fun <T> Property<List<T>>.get(index: Int): T = value[index]
 
+/**
+ * Set extensions
+ */
+
+@JvmName("addToPropertyOfSet")
+operator fun <T> MutableProperty<Set<T>>.plusAssign(element: T) {
+    value = value + element
+}
+
+@JvmName("addToPropertyOfSet")
+operator fun <T> MutableProperty<Set<T>>.plusAssign(another: Iterable<T>) {
+    value = value + another
+}
+
+@JvmName("removeFromPropertyOfSet")
+operator fun <T> MutableProperty<Set<T>>.minusAssign(element: T) {
+    value = value - element
+}
+
+@JvmName("removeFromPropertyOfSet")
+operator fun <T> MutableProperty<Set<T>>.minusAssign(another: Iterable<T>) {
+    value = value - another
+}
+
 /**
  * Map extensions
  */

diff --git a/src/main/java/com/github/greennick/properties/generic/FireProperty.kt b/src/main/java/com/github/greennick/properties/generic/FireProperty.kt
@@ -20,7 +20,7 @@ internal class FireProperty<T>(initValue: T) : MutableProperty<T> {
             onChanged(value)
             consumed = true
         }
-        return SubscriptionImpl(this, onChanged)
+        return FireSubscriptionImpl(this, onChanged)
     }
 
     override fun toString() = "Fire property of [$value], consumed: $consumed"
@@ -43,7 +43,7 @@ internal class FireProperty<T>(initValue: T) : MutableProperty<T> {
         return result
     }
 
-    private class SubscriptionImpl<T>(
+    private class FireSubscriptionImpl<T>(
         private val propertyImpl: FireProperty<T>,
         private val action: (T) -> Unit
     ) : ListenableSubscription {
@@ -62,4 +62,4 @@ internal class FireProperty<T>(initValue: T) : MutableProperty<T> {
             onUnsubscribe = action
         }
     }
-}
+}
diff --git a/src/main/java/com/github/greennick/properties/generic/PropertiesExt.kt b/src/main/java/com/github/greennick/properties/generic/PropertiesExt.kt
@@ -19,10 +19,7 @@ fun <T> MutableProperty<T?>.reset() {
 fun <T> Property<T?>.subscribeNonNull(onChanged: (T) -> Unit): ListenableSubscription =
     subscribe { it?.also(onChanged) }
 
-val <T> MutableProperty<T>.memoized: MemoizeProperty<T, MutableProperty<T>>
-    get() = MemoizePropertyImpl(this)
-
-val <T> DebounceProperty<T>.memoized: MemoizeProperty<T, DebounceProperty<T>>
+val <T, P : MutableProperty<T>> P.memoized: MemoizeProperty<T, P>
     get() = MemoizePropertyImpl(this)
 
 fun MemoizeProperty<*, *>.first() {

diff --git a/src/main/java/com/github/greennick/properties/generic/PropertyImpl.kt b/src/main/java/com/github/greennick/properties/generic/PropertyImpl.kt
@@ -1,6 +1,7 @@
 package com.github.greennick.properties.generic
 
 import com.github.greennick.properties.subscriptions.ListenableSubscription
+import com.github.greennick.properties.subscriptions.SubscriptionImpl
 import java.util.concurrent.CopyOnWriteArraySet
 
 internal class PropertyImpl<T>(initValue: T) : MutableProperty<T> {
@@ -16,7 +17,7 @@ internal class PropertyImpl<T>(initValue: T) : MutableProperty<T> {
     override fun subscribe(onChanged: (T) -> Unit): ListenableSubscription {
         listeners += onChanged
         onChanged(value)
-        return SubscriptionImpl(this, onChanged)
+        return SubscriptionImpl(listeners, onChanged)
     }
 
     override fun toString() = "Property of [$value]"
@@ -33,25 +34,4 @@ internal class PropertyImpl<T>(initValue: T) : MutableProperty<T> {
     }
 
     override fun hashCode() = value.hashCode()
-
-    private class SubscriptionImpl<T>(
-        private val propertyImpl: PropertyImpl<T>,
-        private val action: (T) -> Unit
-    ) : ListenableSubscription {
-        private var onUnsubscribe: (() -> Unit)? = null
-
-        override val subscribed get() = action in propertyImpl.listeners
-
-        override fun unsubscribe() {
-            if (!subscribed) return
-
-            if (propertyImpl.listeners.remove(action)) {
-                onUnsubscribe?.invoke()
-            }
-        }
-
-        override fun onUnsubscribe(action: () -> Unit) {
-            onUnsubscribe = action
-        }
-    }
-}
+}
diff --git a/src/main/java/com/github/greennick/properties/generic/TriggeredProperty.kt b/src/main/java/com/github/greennick/properties/generic/TriggeredProperty.kt
@@ -1,6 +1,7 @@
 package com.github.greennick.properties.generic
 
 import com.github.greennick.properties.subscriptions.ListenableSubscription
+import com.github.greennick.properties.subscriptions.SubscriptionImpl
 import java.util.concurrent.CopyOnWriteArraySet
 
 internal class TriggeredProperty<T>(initValue: T) : MutableProperty<T> {
@@ -15,7 +16,7 @@ internal class TriggeredProperty<T>(initValue: T) : MutableProperty<T> {
     override fun subscribe(onChanged: (T) -> Unit): ListenableSubscription {
         listeners += onChanged
         onChanged(value)
-        return SubscriptionImpl(this, onChanged)
+        return SubscriptionImpl(listeners, onChanged)
     }
 
     override fun toString() = "Trigger property of [$value]"
@@ -32,25 +33,4 @@ internal class TriggeredProperty<T>(initValue: T) : MutableProperty<T> {
     }
 
     override fun hashCode() = value.hashCode()
-
-    private class SubscriptionImpl<T>(
-        private val propertyImpl: TriggeredProperty<T>,
-        private val action: (T) -> Unit
-    ) : ListenableSubscription {
-        private var onUnsubscribe: (() -> Unit)? = null
-
-        override val subscribed get() = action in propertyImpl.listeners
-
-        override fun unsubscribe() {
-            if (!subscribed) return
-
-            if (propertyImpl.listeners.remove(action)) {
-                onUnsubscribe?.invoke()
-            }
-        }
-
-        override fun onUnsubscribe(action: () -> Unit) {
-            onUnsubscribe = action
-        }
-    }
-}
+}
diff --git a/src/main/java/com/github/greennick/properties/memoize/CompositeMemoize.kt b/src/main/java/com/github/greennick/properties/memoize/CompositeMemoize.kt
@@ -6,6 +6,8 @@ class CompositeMemoize(first: MemoizeProperty<*, *>, vararg memos: MemoizeProper
     private val history = mutableListOf<Pair<MemoizeProperty<*, *>, Int>>()
     private val initPositions = _memos.map { it.position }
 
+    var onUpdate: () -> Unit = {}
+
     val size: Int get() = history.size + 1
 
     var position: Int = 0
@@ -37,6 +39,7 @@ class CompositeMemoize(first: MemoizeProperty<*, *>, vararg memos: MemoizeProper
 
                     history.add(memo to memo.position)
                     position = size - 1
+                    onUpdate()
                 }
             }
     }

diff --git a/src/main/java/com/github/greennick/properties/subscriptions/SubscriptionImpl.kt b/src/main/java/com/github/greennick/properties/subscriptions/SubscriptionImpl.kt
@@ -0,0 +1,22 @@
+package com.github.greennick.properties.subscriptions
+
+internal class SubscriptionImpl<T>(
+    private val listeners: MutableCollection<(T) -> Unit>,
+    private val action: (T) -> Unit
+): ListenableSubscription {
+    private var onUnsubscribe: (() -> Unit)? = null
+
+    override val subscribed get() = action in listeners
+
+    override fun unsubscribe() {
+        if (!subscribed) return
+
+        if (listeners.remove(action)) {
+            onUnsubscribe?.invoke()
+        }
+    }
+
+    override fun onUnsubscribe(action: () -> Unit) {
+        onUnsubscribe = action
+    }
+}
diff --git a/src/test/java/com/github/greennick/properties/generic/CollectionExtensionsTests.kt b/src/test/java/com/github/greennick/properties/generic/CollectionExtensionsTests.kt
@@ -99,6 +99,50 @@ class CollectionExtensionsTests {
         assert(strings[0] == property[0])
     }
 
+    @Test
+    fun `plusAssign adds new element to property of Set`() {
+        val strings = setOf("Hello", "Dratuti", "Aloha")
+        val property = propertyOf(strings)
+        val another = "Guten tag"
+
+        property += another
+
+        assert(another in property)
+    }
+
+    @Test
+    fun `plusAssign adds new elements to property of Set`() {
+        val strings = setOf("Hello", "Dratuti", "Aloha")
+        val property = propertyOf(strings)
+        val another = listOf("Guten tag", "Privit")
+
+        property += another
+
+        assert(another in property)
+    }
+
+    @Test
+    fun `minusAssign removes exist element from property of Set`() {
+        val strings = setOf("Hello", "Dratuti", "Aloha")
+        val property = propertyOf(strings)
+        val removed = strings.first()
+
+        property -= removed
+
+        assert(removed !in property)
+    }
+
+    @Test
+    fun `minusAssign removes exist elements from property of Set`() {
+        val strings = setOf("Hello", "Dratuti", "Aloha")
+        val property = propertyOf(strings)
+        val removed = setOf("Hello", "Dratuti")
+
+        property -= removed
+
+        assert(removed !in property)
+    }
+
     @Test
     fun `plusAssign adds new entry to map property`() {
         val entries = mapOf(0 to "Hello")

diff --git a/src/test/java/com/github/greennick/properties/memoize/CompositeMemoizePropertyTest.kt b/src/test/java/com/github/greennick/properties/memoize/CompositeMemoizePropertyTest.kt
@@ -1,11 +1,30 @@
 package com.github.greennick.properties.memoize
 
+import com.github.greennick.properties.firePropertyOf
 import com.github.greennick.properties.generic.memoized
 import com.github.greennick.properties.propertyOf
+import com.github.greennick.properties.triggerPropertyOf
 import org.junit.Test
 
 class CompositeMemoizePropertyTest {
 
+    @Test
+    fun `composite sends updates`() {
+        val prop1 = propertyOf("zero").memoized
+        val prop2 = firePropertyOf(20).memoized
+        val prop3 = triggerPropertyOf(30L).memoized
+
+        val composite = CompositeMemoize(prop1, prop2, prop3)
+        var called = false
+        composite.onUpdate = { called = true }
+        assert(!called)
+
+        prop1.value = "hero"
+        prop2.value = 53
+
+        assert(called)
+    }
+
     @Test
     fun `composite represents single property changes`() {
         val prop = propertyOf("zero").memoized