Merge pull request #7 from mach3/develop

(dist) 0.1.5

CHANGELOG.md

@@ -1,6 +1,10 @@
 
 # Change Log
 
+## 0.1.5
+
+- improve: let Sheet::update() to receive condition as 1st argument
+
 ## 0.1.4
 
 - improve: let client to throw exception when unexpected response is returned

README.md

@@ -63,6 +63,28 @@ $sheet->update(
 	"name", // field's name (or column number as Integer)
 	"Tom"
 );
+
+$sheet->update(
+	array(8,16,24), // row numbers
+	"name",
+	"Tom"
+);
+
+$sheet->update(
+	array(
+		"name" => "Tom" // condition to select
+	),
+	"email",
+	"[email protected]"
+);
+
+$sheet->update(
+	function($row){
+		return (int) $row["age"] > 80; // condition to select as closure
+	},
+	"active",
+	"false"
+);
 ```
 
 ### Get up-to-date table data

src/Google/Spreadsheet/Sheet.php

@@ -61,41 +61,45 @@ public function select($condition = null){
 			return array_filter($this->items, $condition);
 		}
 		if(is_array($condition)){
-			$result = array();
-			foreach($this->items as $row){
-				$invalid = false;
+			return array_filter($this->items, function($item) use ($condition){
+				$invalid = 0;
 				foreach($condition as $key => $value){
-					if($row[$key] !== $value){ $invalid = true; }
+					if($item[$key] !== $value){ $invalid ++; }
 				}
-				if($invalid){ continue; }
-				array_push($result, $row);
-			}
-			return $result;
+				return ! $invalid;
+			});
 		}
 		return $this->items;
 	}
 
 	/**
 	 * Update the value of column
-	 * @param {Integer} $row
+	 * @param {Integer|Closure|Array} $row ... Row number or condition to select
 	 * @param {Integer|String} $col ... Column number or field's name
 	 * @param {String} $value
 	 * @return {Google_Spreadsheet_Sheet} ... This
 	 */
 	public function update($row, $col, $value){
 		$col = is_string($col) ? array_search($col, array_values($this->fields), true) + 1 : $col;
-		$body = sprintf(
-			'<entry xmlns="http://www.w3.org/2005/Atom" xmlns:gs="http://schemas.google.com/spreadsheets/2006">
-            <gs:cell row="%u" col="%u" inputValue="%s"/>
-			</entry>',
-			$row, $col, htmlspecialchars($value)
-		);
-		$this->client->request(
-			$this->link["cellsfeed"],
-			"POST",
-			array("Content-Type" => "application/atom+xml"),
-			$body
-		);
+		if((is_array($row) && array_values($row) !== $row) || is_callable($row)){
+			$row = array_keys($this->select($row));
+		} else if(! is_array($row)){
+			$row = array($row);
+		}
+		foreach($row as $r){
+			$body = sprintf(
+				'<entry xmlns="http://www.w3.org/2005/Atom" xmlns:gs="http://schemas.google.com/spreadsheets/2006">'
+	            . '<gs:cell row="%u" col="%u" inputValue="%s"/>'
+				. '</entry>',
+				$r, $col, htmlspecialchars($value)
+			);
+			$this->client->request(
+				$this->link["cellsfeed"],
+				"POST",
+				array("Content-Type" => "application/atom+xml"),
+				$body
+			);
+		}
 		return $this;
 	}