Merge pull request #16 from nachg/issue12

closes #12

Author: nachg

src/main/kotlin/org/nachg/xpathqs/core/selector/Block.kt

@@ -4,6 +4,7 @@ import org.nachg.xpathqs.core.reflection.freeze
 import org.nachg.xpathqs.core.reflection.setBase
 import org.nachg.xpathqs.core.selector.base.ISelector
 import org.nachg.xpathqs.core.selector.base.SelectorState
+import org.nachg.xpathqs.core.selector.extensions.clone
 import org.nachg.xpathqs.core.selector.selector.Selector
 import org.nachg.xpathqs.core.selector.selector.SelectorProps
 

src/main/kotlin/org/nachg/xpathqs/core/selector/Global.kt

@@ -0,0 +1,9 @@
+package org.nachg.xpathqs.core.selector
+
+/**
+ * Class for storing global properties
+ */
+object Global {
+    //inner text attribute for the Web-based selectors
+    var TEXT_ARG = "text()"
+}

src/main/kotlin/org/nachg/xpathqs/core/selector/XpathSelector.kt

@@ -6,7 +6,7 @@ import org.nachg.xpathqs.core.selector.base.ISelector
 import org.nachg.xpathqs.core.selector.base.SelectorState
 
 class XpathSelector(
-    val xpath: String = "",
+    private val xpath: String = "",
 
     state: SelectorState = SelectorState.INIT,
     base: ISelector = NullSelector(),

src/main/kotlin/org/nachg/xpathqs/core/selector/args/KVSelectorArg.kt

@@ -1,13 +1,15 @@
 package org.nachg.xpathqs.core.selector.args
 
 open class KVSelectorArg(
-    protected val k: String,
-    protected val v: String,
+    open val k: String,
+    open val v: String,
     joinType: JoinType = JoinType.NONE
-) : SelectorArg(
-    value = "$k=$v",
-    joinType
+) : ValueArg(
+    joinType = joinType
 ) {
+    override val value: String
+        get() = "$k=$v"
+
     override val key: String
         get() = k
-}
+}

src/main/kotlin/org/nachg/xpathqs/core/selector/args/SelectorArgs.kt

@@ -1,7 +1,7 @@
 package org.nachg.xpathqs.core.selector.args
 
 class SelectorArgs(
-    private val args: HashMap<String, SelectorArg> = HashMap()
+    private val args: HashMap<String, ValueArg> = HashMap()
 ) : Cloneable {
     fun toXpath(): String {
         if (args.isEmpty()) return ""
@@ -19,7 +19,7 @@ class SelectorArgs(
         return "[$res]"
     }
 
-    fun add(arg: SelectorArg): SelectorArgs {
+    fun add(arg: ValueArg): SelectorArgs {
         if (args.isNotEmpty() && arg.isNone) {
             arg.joinType = JoinType.AND
         }
@@ -29,6 +29,6 @@ class SelectorArgs(
 
     @Suppress("UNCHECKED_CAST")
     public override fun clone(): SelectorArgs {
-        return SelectorArgs(args.clone() as HashMap<String, SelectorArg>)
+        return SelectorArgs(args.clone() as HashMap<String, ValueArg>)
     }
 }

…pathqs/core/selector/args/SelectorArg.kt …g/xpathqs/core/selector/args/ValueArg.ktsrc/main/kotlin/org/nachg/xpathqs/core/selector/args/SelectorArg.kt renamed to src/main/kotlin/org/nachg/xpathqs/core/selector/args/ValueArg.kt src/main/kotlin/org/nachg/xpathqs/core/selector/args/SelectorArg.kt renamed to src/main/kotlin/org/nachg/xpathqs/core/selector/args/ValueArg.kt

@@ -1,7 +1,7 @@
 package org.nachg.xpathqs.core.selector.args
 
-open class SelectorArg(
-    internal val value: String,
+open class ValueArg(
+    internal open val value: String = "",
     internal var joinType: JoinType = JoinType.NONE
 ) {
     fun toXpath(): String {

src/main/kotlin/org/nachg/xpathqs/core/selector/args/decorators/CommaDecorator.kt

@@ -0,0 +1,18 @@
+package org.nachg.xpathqs.core.selector.args.decorators
+
+import org.nachg.xpathqs.core.selector.args.KVSelectorArg
+
+class CommaDecorator(private val wrapper: KVSelectorArg) : KVSelectorArg(wrapper.k, wrapper.v) {
+    override val v: String
+        get() = escape("'${wrapper.v}'")
+
+    companion object {
+        fun escape(str: String): String {
+            val value = str.removePrefix("'").removeSuffix("'")
+            if (value.contains("'")) {
+                return "concat('${value.replace("'", "',\"'\",'")}')"
+            }
+            return str
+        }
+    }
+}

src/main/kotlin/org/nachg/xpathqs/core/selector/args/decorators/ContainsDecorator.kt

@@ -0,0 +1,9 @@
+package org.nachg.xpathqs.core.selector.args.decorators
+
+import org.nachg.xpathqs.core.selector.args.KVSelectorArg
+import org.nachg.xpathqs.core.selector.args.ValueArg
+
+class ContainsDecorator(private val wrapper: KVSelectorArg) : ValueArg() {
+    override val value: String
+        get() = "contains(${wrapper.k}, ${wrapper.v})"
+}

src/main/kotlin/org/nachg/xpathqs/core/selector/args/decorators/KVNormalizeSpaceDecorator.kt

@@ -0,0 +1,8 @@
+package org.nachg.xpathqs.core.selector.args.decorators
+
+import org.nachg.xpathqs.core.selector.args.KVSelectorArg
+
+class KVNormalizeSpaceDecorator(private val wrapper: KVSelectorArg) : KVSelectorArg(wrapper.k, wrapper.v) {
+    override val v: String
+        get() = "normalize-space(${wrapper.v})"
+}

src/main/kotlin/org/nachg/xpathqs/core/selector/compose/ComposeSelectorProps.kt

@@ -3,7 +3,7 @@ package org.nachg.xpathqs.core.selector.compose
 import org.nachg.xpathqs.core.selector.args.SelectorArgs
 import org.nachg.xpathqs.core.selector.base.BaseSelectorProps
 import org.nachg.xpathqs.core.selector.base.ISelector
-import org.nachg.xpathqs.core.selector.clone
+import org.nachg.xpathqs.core.selector.extensions.clone
 
 class ComposeSelectorProps(
     internal val selectors: ArrayList<ISelector> = ArrayList(),