Rename fullTextQuery to query, close #6

Author: dethi

AlgoliaSearch-Client-Swift.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
     s.name = 'AlgoliaSearch-Client-Swift'
     s.module_name = 'AlgoliaSearch'
-    s.version = '1.2.0'
+    s.version = '1.2.1'
     s.license = 'MIT'
     s.summary = 'Algolia Search API Client for iOS & OS X written in Swift.'
     s.homepage = 'https://github.com/algolia/algoliasearch-client-swift'

ChangeLog

@@ -1,5 +1,8 @@
 CHANGELOG
 
+2015-06-09 1.2.1
+  * Rename `fullTextQuery` to `query`
+
 2015-06-08 1.2.0
   * new retry logic
   * add new parameter on the Query: setMinProximity & setHighlightingTags

Source/Info.plist

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

Source/Query.swift

@@ -128,7 +128,7 @@ public class Query : Printable {
     public var numericFilters: [String]?
 
     /// The full text query.
-    public var fullTextQuery: String?
+    public var query: String?
 
     /// How the query words are interpreted.
     public var queryType: QueryType?
@@ -178,10 +178,25 @@ public class Query : Printable {
         get { return "Query = \(buildURL())" }
     }
 
+    @availability(*, deprecated=1.2.1, message="Use the new API: Query.query: String?")
+    public var fullTextQuery: String? {
+        get {
+            return query
+        }
+        set {
+            query = newValue
+        }
+    }
+    
     // MARK: - Methods
 
-    public init(fullTextQuery: String? = nil) {
-        self.fullTextQuery = fullTextQuery
+    @availability(*, deprecated=1.2.1, message="Use the new API: Query(text: String?)")
+    public init(fullTextQuery: String) {
+        self.query = fullTextQuery
+    }
+    
+    public init(query: String? = nil) {
+        self.query = query
     }
 
     /// Search for entries around a given latitude/longitude.
@@ -349,8 +364,8 @@ public class Query : Printable {
         if aroundLatLongViaIP {
             url.append(Query.encodeForQuery(aroundLatLongViaIP, withKey: "aroundLatLngViaIP"))
         }
-        if let fullTextQuery = fullTextQuery {
-            url.append(Query.encodeForQuery(fullTextQuery, withKey: "query"))
+        if let query = query {
+            url.append(Query.encodeForQuery(query, withKey: "query"))
         }
         if let restrictSearchableAttributes = restrictSearchableAttributes {
             url.append(Query.encodeForQuery(restrictSearchableAttributes, withKey: "restrictSearchableAttributes"))