CloudSearch deprecated. CloudQuery Search added

Author: randhir051

CloudBoost.xcodeproj/xcuserdata/randhirsingh.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,4 +2,36 @@
 <Bucket
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../../../var/folders/_f/_g5lhxxn12jg3g95l6_4b4fc0000gn/T/XcodeMergeSession-2526848c8e894ddc6fa7205b80be64694ddd0d42/MergeDocument-CloudUserTest.swift"
+            timestampString = "486567704.737252"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "18"
+            endingLineNumber = "18">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "CloudBoostTests/CloudSearchTest.swift"
+            timestampString = "486656062.941383"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "629"
+            endingLineNumber = "629"
+            landmarkName = "testPhraseSearch()"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

CloudBoost/CloudQuery.swift

@@ -149,7 +149,25 @@ public class CloudQuery{
     }
 
     /**
+     * CloudQuery Search, caseSensitive and diacriticSensitive defaults to false
      *
+     * @param search
+     * @param language
+     * @param caseSensitive
+     * @param diacriticSensitive
+     */
+    public func search(search: String, language: String? = "en", caseSensitive: Bool? = nil, diacriticSensitive: Bool? = nil) {
+        let textFields = NSMutableDictionary()
+        
+        textFields["$search"] = search
+        textFields["$language"] = language
+        textFields["$caseSensitive"] = caseSensitive
+        textFields["$diacriticSensitive"] = diacriticSensitive
+        
+        self.query["$text"] = textFields
+    }
+    
+    /**
      * CloudQuery Or
      *
      *
@@ -602,7 +620,7 @@ public class CloudQuery{
         query[columnName] = [ "$geoWithin" : [ "$centerSphere": [ geoPoint.getCoordinates(), radius/3963.2] ] ]
     }
 
-    public func find(callback: (response: CloudBoostResponse)->Void) throws {
+    public func find(callback: (response: CloudBoostResponse)->Void) {
 
         let params = NSMutableDictionary()
         params["query"] = query

CloudBoost/CloudSearch.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public class CloudSearch {
+@available(*,deprecated=0.2) public class CloudSearch {
     var collectionName: String?
     var collectionArray = [String]()
     var query = NSMutableDictionary()

CloudBoost/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

CloudBoostTests/CloudObjectTest.swift

@@ -921,6 +921,7 @@ class CloudObjectTest: XCTestCase {
         let exp = expectationWithDescription("test fetch")
         let obj = CloudObject(tableName: "Student")
         obj.set("name", value: "RT bathula")
+                
 
         obj.save({resp in
             if resp.success {

CloudBoostTests/CloudSearchTest.swift

@@ -13,16 +13,19 @@ class CloudSearchTest: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        let app = CloudApp.init(appID: "xckzjbmtsbfb", appKey: "345f3324-c73c-4b15-94b5-9e89356c1b4e")
+        let app = CloudApp.init(appID: "zbzgfbmhvnzf", appKey: "d9c4cdef-7586-4fa2-822b-cb815424d2c8")
         app.setIsLogging(true)
-        app.setMasterKey("f5cc5cb3-ba0d-446d-9e51-e09be23c540d")
+        app.setMasterKey("2df6d3e7-a695-4ab0-b18a-d37a90af4dc9")
     }
 
     override func tearDown() {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
         super.tearDown()
     }
 
+    // DEPRECATED SINCE V0.2
+    /// SCROLL DOWN FOR THE NEW CloudQuery+Search tests
+    
     // should get data from server for near function
     func testGetNear(){
         let exp = expectationWithDescription("should get data from server for near function")
@@ -595,5 +598,135 @@ class CloudSearchTest: XCTestCase {
         waitForExpectationsWithTimeout(30, handler: nil)
     }
 
+
+    
+    /// MARK
+    /// NEW un-deprecated tests
+    
+    /// Saving data for tests
+    func testSaveData(){
+        
+    }
+    
+    // Basic search
+    func testBasicSearch(){
+        let exp = expectationWithDescription("basic search")
+        let query = CloudQuery(tableName: "Table")
+        query.search("dog")
+        query.find({ resp in
+            if let results = resp.object as? [CloudObject] {
+                print(results)
+                //returns CloudObjects of fields having string 'dog'
+            }else{
+                resp.log()
+            }
+            exp.fulfill()
+        })
+        waitForExpectationsWithTimeout(30, handler: nil)
+    }
+    
+    // Phrases search
+    func testPhraseSearch(){
+        let exp = expectationWithDescription("phrases search")
+        let query = CloudQuery(tableName: "Table")
+        query.search("three flowers honeybee")
+        query.find({ resp in
+            if let results = resp.object as? [CloudObject] {
+                print(results)
+                // returns CloudObjects of fields having keywords either of  tree OR flowers OR honeybees keywords
+            }else{
+                resp.log()
+            }
+            exp.fulfill()
+        })
+        waitForExpectationsWithTimeout(30, handler: nil)
+    }
+    
+    // Exact phrases search
+    func testExactPhraseSearch(){
+        let exp = expectationWithDescription("exact phrase search")
+        let query = CloudQuery(tableName: "Table")
+        query.search("\"three flowers\"")
+        query.find({ resp in
+            if let results = resp.object as? [CloudObject] {
+                print(results)
+                // returns CloudObjects of fields having exact phrase "tree flowers"
+            }else{
+                resp.log()
+            }
+            exp.fulfill()
+        })
+        waitForExpectationsWithTimeout(30, handler: nil)
+    }
+    
+    // Negation search
+    func testNegation(){
+        let exp = expectationWithDescription("negation search")
+        let query = CloudQuery(tableName: "Table")
+        query.search("three flowers -honeybee")
+        query.find({ resp in
+            if let results = resp.object as? [CloudObject] {
+                print(results)
+                // returns CloudObjects of fields having keyword "three" and "flowers"  but not "honeybee"
+            }else{
+                resp.log()
+            }
+            exp.fulfill()
+        })
+        waitForExpectationsWithTimeout(30, handler: nil)
+    }
+    
+    // Case sensitive search
+    func testCaseSensitive(){
+        let exp = expectationWithDescription("case sensitive search")
+        let query = CloudQuery(tableName: "Table")
+        query.search("Dog", caseSensitive: true)
+        query.find({ resp in
+            if let results = resp.object as? [CloudObject] {
+                print(results)
+                // returns appropriate result matching case sensitive words
+            }else{
+                resp.log()
+            }
+            exp.fulfill()
+        })
+        waitForExpectationsWithTimeout(30, handler: nil)
+    }
+    
+    // Diacritic Sensitive
+    // è will not be equal to e
+    func testDiacriticSensitive(){
+        let exp = expectationWithDescription("diacritic sensitive search")
+        let query = CloudQuery(tableName: "Table")
+        query.search("dôg", diacriticSensitive: true)
+        query.find({ resp in
+            if let results = resp.object as? [CloudObject] {
+                print(results)
+                // returns []
+            }else{
+                resp.log()
+            }
+            exp.fulfill()
+        })
+        waitForExpectationsWithTimeout(30, handler: nil)
+    }
+    
+    // language
+    func testLanguage(){
+        let exp = expectationWithDescription("language specific search")
+        let query = CloudQuery(tableName: "Table")
+        query.search("algunas", language: "es")
+        query.find({ resp in
+            if let results = resp.object as? [CloudObject] {
+                print(results)
+                // returns []
+            }else{
+                resp.log()
+            }
+            exp.fulfill()
+        })
+        waitForExpectationsWithTimeout(30, handler: nil)
+    }
+    
 
 }