無駄な処理であるCurrent::$m17nを削除する

NetCommons3 · Nov 16, 2016 · 9062a55 · 9062a55
1 parent 4fe00d5
commit 9062a55
Show file tree

Hide file tree

Showing 4 changed files with 239 additions and 4 deletions.
diff --git a/Model/Language.php b/Model/Language.php
@@ -9,15 +9,15 @@
  * @copyright Copyright 2014, NetCommons Project
  */
 
-App::uses('AppModel', 'Model');
+App::uses('M17nAppModel', 'M17n.Model');
 
 /**
  * Language Model
  *
  * @author Shohei Nakajima <nakajimashouhei@gmail.com>
  * @package NetCommons\M17n\Model
  */
-class Language extends AppModel {
+class Language extends M17nAppModel {
 
 /**
  * Validation rules
@@ -26,6 +26,13 @@ class Language extends AppModel {
  */
 	public $validate = array();
 
+/**
+ * 言語データ
+ *
+ * @var array
+ */
+	public static $languages = array();
+
 /**
  * Called during validation operations, before validation. Please note that custom
  * validation rules can be defined in $validate.
@@ -61,13 +68,20 @@ public function beforeValidate($options = array()) {
 	}
 
 /**
- * 言語データタイプを取得
+ * 言語データを取得
  *
  * @param string $type 取得タイプ
  * @param array $options 取得オプション
  * @return array 言語データ
  */
-	public function getLanguage($type = 'all', $options = array()) {
+	public function getLanguage($type = null, $options = array()) {
+		if (! $type && ! $options) {
+			return $this->getLanguages();
+		}
+		if (! $type) {
+			$type = 'all';
+		}
+
 		if ($type === 'list' && ! isset($options['fields'])) {
 			$options['fields'] = array('id', 'code');
 		}
@@ -82,4 +96,25 @@ public function getLanguage($type = 'all', $options = array()) {
 		return $languages;
 	}
 
+/**
+ * 言語データを取得
+ *
+ * @return array
+ */
+	public function getLanguages() {
+		if (self::$languages) {
+			return self::$languages;
+		}
+
+		self::$languages = $this->find('all', array(
+			'recursive' => -1,
+			'conditions' => array(
+				'is_active' => true
+			),
+			'order' => array('weight' => 'asc')
+		));
+
+		return self::$languages;
+	}
+
 }
diff --git a/Model/M17nAppModel.php b/Model/M17nAppModel.php
@@ -1,12 +1,21 @@
 <?php
 /**
  * M17n App Model
+ *
+ * @author Noriko Arai <arai@nii.ac.jp>
+ * @author Shohei Nakajima <nakajimashouhei@gmail.com>
+ * @link http://www.netcommons.org NetCommons Project
+ * @license http://www.netcommons.org/license.txt NetCommons License
+ * @copyright Copyright 2014, NetCommons Project
  */
 
 App::uses('AppModel', 'Model');
 
 /**
  * M17n App Model
+ *
+ * @author Shohei Nakajima <nakajimashouhei@gmail.com>
+ * @package NetCommons\M17n\Model
  */
 class M17nAppModel extends AppModel {
 

diff --git a/Test/Case/Model/Language/GetLanguagesTest.php b/Test/Case/Model/Language/GetLanguagesTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Language::getLanguages()のテスト
+ *
+ * @author Noriko Arai <arai@nii.ac.jp>
+ * @author Shohei Nakajima <nakajimashouhei@gmail.com>
+ * @link http://www.netcommons.org NetCommons Project
+ * @license http://www.netcommons.org/license.txt NetCommons License
+ * @copyright Copyright 2014, NetCommons Project
+ */
+
+App::uses('M17nGetTest', 'M17n.TestSuite');
+App::uses('Language', 'M17n.Model');
+
+/**
+ * Language::getLanguages()のテスト
+ *
+ * @author Shohei Nakajima <nakajimashouhei@gmail.com>
+ * @package NetCommons\M17n\Test\Case\Model\Language
+ */
+class LanguageGetLanguagesTest extends M17nGetTest {
+
+/**
+ * Fixtures
+ *
+ * @var array
+ */
+	public $fixtures = array(
+		'plugin.m17n.language',
+	);
+
+/**
+ * Plugin name
+ *
+ * @var string
+ */
+	public $plugin = 'm17n';
+
+/**
+ * Model name
+ *
+ * @var string
+ */
+	protected $_modelName = 'Language';
+
+/**
+ * Method name
+ *
+ * @var string
+ */
+	protected $_methodName = 'getLanguages';
+
+/**
+ * getLanguages()のテスト
+ *
+ * @return void
+ */
+	public function testGetLanguages() {
+		$model = $this->_modelName;
+		$methodName = $this->_methodName;
+
+		//テスト実施
+		$result = $this->$model->$methodName();
+
+		//チェック
+		$expected = array(
+			0 => array(
+				'Language' => array(
+					'id' => '1',
+					'code' => 'en',
+					'weight' => '1',
+					'is_active' => true,
+					'created_user' => null,
+					'created' => '2014-07-03 05:00:39',
+					'modified_user' => null,
+					'modified' => '2014-07-03 05:00:39',
+				),
+			),
+			1 => array(
+				'Language' => array(
+					'id' => '2',
+					'code' => 'ja',
+					'weight' => '2',
+					'is_active' => true,
+					'created_user' => null,
+					'created' => '2014-07-03 05:00:39',
+					'modified_user' => null,
+					'modified' => '2014-07-03 05:00:39',
+				),
+			),
+		);
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * getLanguages()の既に取得済みの場合のテスト
+ *
+ * @return void
+ */
+	public function testGetLanguagesWithData() {
+		$model = $this->_modelName;
+		$methodName = $this->_methodName;
+
+		Language::$languages = array('test dummy');
+
+		//テスト実施
+		$result = $this->$model->$methodName();
+
+		//チェック
+		$expected = array('test dummy');
+		$this->assertEquals($expected, $result);
+	}
+
+}
diff --git a/TestSuite/M17nGetTest.php b/TestSuite/M17nGetTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * M17nGetTest TestCase
+ *
+ * @author Noriko Arai <arai@nii.ac.jp>
+ * @author Shohei Nakajima <nakajimashouhei@gmail.com>
+ * @link http://www.netcommons.org NetCommons Project
+ * @license http://www.netcommons.org/license.txt NetCommons License
+ * @copyright Copyright 2014, NetCommons Project
+ */
+
+//@codeCoverageIgnoreStart;
+App::uses('NetCommonsGetTest', 'NetCommons.TestSuite');
+//@codeCoverageIgnoreEnd;
+
+/**
+ * M17nGetTest TestCase
+ *
+ * @author Shohei Nakajima <nakajimashouhei@gmail.com>
+ * @package NetCommons\M17n\TestSuite
+ * @codeCoverageIgnore
+ */
+class M17nGetTest extends NetCommonsGetTest {
+
+/**
+ * Fixtures
+ *
+ * @var array
+ */
+	private $__fixtures = array();
+
+/**
+ * Plugin name
+ *
+ * @var string
+ */
+	public $plugin = 'm17n';
+
+/**
+ * Fixtures load
+ *
+ * @param string $name The name parameter on PHPUnit_Framework_TestCase::__construct()
+ * @param array  $data The data parameter on PHPUnit_Framework_TestCase::__construct()
+ * @param string $dataName The dataName parameter on PHPUnit_Framework_TestCase::__construct()
+ * @return void
+ */
+	public function __construct($name = null, array $data = array(), $dataName = '') {
+		if (! isset($this->fixtures)) {
+			$this->fixtures = array();
+		}
+		$this->fixtures = array_merge($this->__fixtures, $this->fixtures);
+		parent::__construct($name, $data, $dataName);
+	}
+
+/**
+ * setUp method
+ *
+ * @return void
+ */
+	public function setUp() {
+		parent::setUp();
+
+		Language::$languages = array();
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ */
+	public function tearDown() {
+		Language::$languages = array();
+
+		parent::tearDown();
+	}
+
+}