Updates

Author: objectivehtml

Change Log.txt

@@ -1,20 +1,38 @@
 /**
 * Channel Data
 * Author: Justin Kimbrell (Objective HTML)
-* @version 1.0.0-rc1
-* @build   2014-12-10=6
+* @version 1.0.0-rc3
+* @build   2014-03-03
 * Copyright 2013 - All rights reserved
 * http://objectivehtml.com
 */
 
-#### 2014-12-16
+#### 2014-03-03
+##### 1.0.0-rc3
+
+- Added get() method to QueryResponse
+- Added toArray() method to QueryResponse
+- Added fixedOrder parameter to entries() method in Channel Response
+- Added findByUsername() to Member
+- Added label() method to ChannelField
+- Added findByName() method to ChannelField
+- Added findByName() method to ChannelField
+- Added groupBy() method to QueryBuilder
+- Added prefix() method to ChannelData
+- Added entries() method to ChannelModel
+- Added new ChannelEntriesParser class
+- Bug fixes in QueryString class
+- Bug fixes in QueryBuilder class
+- Bug fixes in ChannelEntriesApi class
+
+#### 2013-12-16
 ##### 1.0.0-rc2
 
 - Decoupled Channel Data into it’s own “module”.
 - Added more models and helper methods
 
 
-#### 2014-12-10
+#### 2013-12-10
 ##### 1.0.0-rc1
 
 - Complete rewrite of entire API. All new docs and syntax based on Eloquent.

channel_data/libraries/Channeldata/base/ChannelModel.php

@@ -2,9 +2,11 @@
 
 use ChannelData\Base\BaseModel;
 use ChannelData\Model\Channel;
+use ChannelData\Model\ChannelField;
 use ChannelData\Component\ChannelQueryBuilder;
 use ChannelData\Component\QueryString;
 use ChannelData\Component\ChannelEntriesApi;
+use ChannelData\Component\ChannelEntriesParser;
 
 // namespace ChannelData;
 
@@ -65,7 +67,7 @@ class ChannelModel extends BaseModel {
 	public function __construct($data = array())
 	{
 		ee()->lang->loadfile('content');
-		
+
 		$this->uidField   = $this->prefix.'uid';
 		$this->required[] = $this->prefix.'uid';
 
@@ -111,6 +113,11 @@ public function hasErrors()
 
 	public function channel()
 	{
+		if(!$this->channel)
+		{
+			return FALSE;
+		}
+
 		$channel = Channel::findByName($this->channel);
 
 		if(!$channel)
@@ -137,7 +144,7 @@ public function delete()
 	}
 
 	protected function _createRecord($data = array())
-	{		
+	{
 		if(count($data))
 		{
 			$this->fill($data);
@@ -150,6 +157,10 @@ protected function _createRecord($data = array())
 		{
 			$this->errors = $this->apiResponse;
 		}
+		else
+		{
+			$this->exists = TRUE;
+		}
 
 		return $this;
 	}
@@ -160,9 +171,9 @@ protected function _updateRecord($data)
 		{
 			$this->fill($data);
 		}
-		
+
 		$this->apiResponse = ChannelEntriesApi::update_entry($this->channel_id, $this->entry_id, $this->data());
-		
+
 		if(!is_int($this->apiResponse))
 		{
 			$this->errors = $this->apiResponse;
@@ -182,10 +193,14 @@ public function data()
 			if(isset($data[$row->field_name]) && $value = $data[$row->field_name])
 			{
 				unset($data[$row->field_name]);
-
-				$data['field_id_'.$row->field_id] = $value;
-				$data['field_ft_'.$row->field_id] = $row->field_fmt;
 			}
+			else
+			{
+				$value = NULL;
+			}
+
+			$data['field_id_'.$row->field_id] = $value;
+			$data['field_ft_'.$row->field_id] = $row->field_fmt;
 		}
 
 		return $data;
@@ -206,14 +221,32 @@ public function fields()
 			return $this->fields;
 		}
 
-		foreach($this->channel()->fields()->items() as $field)
+		if($channel = $this->channel())
 		{
-			$this->fields[$field->field_id] = $field->field_name;
+			foreach($channel->fields()->items() as $field)
+			{
+				$this->fields[$field->field_id] = $field->field_name;
+			}
+		}
+		else
+		{
+			foreach(ChannelField::all()->items() as $field)
+			{
+				$this->fields[$field->field_id] = $field->field_name;
+			}
 		}
 
 		return $this->fields;
 	}
 
+	public static function findOpen($entry_id)
+	{
+		return self::where('channel_data.entry_id', '=', $entry_id)
+				   ->where('status', '=', 'open')
+				   ->get()
+				   ->first();
+	}
+
 	public static function findByAuthorId($author_id)
 	{
 		return self::where('author_id', '=', $author_id)->get();
@@ -233,6 +266,11 @@ public static function channelId()
 	{
 		$class = new static;
 
+		if(!$class->channel)
+		{
+			return FALSE;
+		}
+
 		return Channel::findByName($class->channel)->id();
 	}
 
@@ -250,28 +288,27 @@ public static function query()
 
 		$query->from('channel_titles');
 		$query->leftJoin('channel_data', 'channel_titles.entry_id', '=', 'channel_data.entry_id');
-		$query->select(array(
-			'entry_id',
-			'site_id',
-			'channel_id',
-			'author_id',
-			'title',
-			'url_title',
-			'status',
-			'entry_date',
-			'expiration_date',
-		), NULL, 'channel_titles');
+		$query->select('*', NULL, 'channel_titles');
 
 		foreach($class->fields() as $field_id => $field_name)
 		{
 			$query->select('field_id_'.$field_id, $field_name, 'channel_data');
 		}
 
-		if($class->channelId()) 
+		if($class->channelId())
 		{
 			$query->where('channel_data.channel_id', '=', $class->channelId());
 		}
 
 		return $query;
 	}
-}
+
+	public function entries()
+	{
+		$parser = new ChannelEntriesParser();
+
+		return $parser->entries(array(
+			'entry_id'    => $this->id()
+		));
+	}
+}

channel_data/libraries/Channeldata/channeldata.php

@@ -104,4 +104,45 @@ public function directories()
 
 		return $this->directories;
 	}
+
+	public static function prefix($prefix, $data, $delimeter = ':')
+	 {
+	 	$new_data = array();
+	 	
+	 	if(!empty($prefix))
+	 	{
+		 	foreach($data as $data_index => $data_value)
+		 	{
+		 		if(is_array($data_value) && preg_match('/\d/', $data_index))
+		 		{
+		 			if(isset($data_value[0]) && !is_array($data_value[0]))
+		 			{
+			 			$new_row = array();
+			 			
+			 			foreach($data_value as $inner_index => $inner_value)
+			 			{
+			 				$new_row[$prefix . $delimeter . $inner_index] = $inner_value;
+			 			}
+			 			
+			 			$new_data[$data_index] = $new_row;
+		 			}
+		 			else
+		 			{
+		 				$new_data[$data_index] = self::prefix($prefix, $data_value, $delimeter);
+		 			}
+		 			
+		 		}
+		 		else
+		 		{
+		 			$new_data[$prefix . $delimeter . $data_index] = $data_value;
+		 		}
+		 	}
+	 	}
+	 	else
+	 	{
+	 		$new_data = $data;
+	 	}
+	 	
+	 	return $new_data;	
+	 }
 }

channel_data/libraries/Channeldata/components/ChannelEntriesApi.php

@@ -43,12 +43,15 @@ public static function update_entry($channel_id, $entry_id, $data)
 	{
 		ee()->load->library('api');
 		ee()->api->instantiate('channel_entries');
+		ee()->api->instantiate('channel_fields');
 
 		$data['entry_id']   = $entry_id;
 		$data['channel_id'] = $channel_id;
 
 		ee()->session->userdata['group_id'] = 1;
 
+		ee()->api_channel_fields->setup_entry_settings($channel_id, $data);
+		
 		ee()->api_channel_entries->update_entry($entry_id, $data);
 
 		if(count(ee()->api_channel_entries->errors) > 0)