Fix Hepburn styles, add Nihon-shiki and Kunrei-shiki romanji styles.

.travis.yml

@@ -15,7 +15,4 @@ before_script:
 script:
   - ./install-php-mecab.sh
 
-install: composer install
-
-env:
-  - DIC_DIRECTORY=
+install: composer install

README.md

@@ -34,8 +34,6 @@ Install Limelight.
 composer require nihongodera/limelight
 ```
 
-Copy the **.env.example** file to **.env**. If your MeCab install requires a dictionary directory, set **DIC_DIRECTORY** to your MeCab dictionary directory path.  Otherwise, leave it as it is.
-
 Make a Limelight instance.
 ```php
 $limelight = new Limelight();
@@ -89,7 +87,7 @@ Once installed and working, install Limelight through composer.
 composer require nihongodera/limelight
 ```
 
-After installation, copy the **.env.example** file to **.env**. If your MeCab install requires a dictionary directory, set **DIC_DIRECTORY** to your MeCab dictionary directory path.  Otherwise, leave it as it is. 
+If your install of MeCab requires a dictionary directory, set the dictionary directory path in config.php under options->PhpMecab->dictionary.
 
 ## Usage  
   - [Parsing Strings](#parsing-strings)
@@ -603,6 +601,10 @@ A plugin template with some example code can be found in Limelight/Plugins.
 [Top](#contents)
 
 ## Change Log  
+
+Nov. 2, 2015: Version 1.2.1
+  - Added Modified Hepburn Romanji
+  - Rewrote romanji plugin engine
 
 Nov. 1, 2015: Version 1.2.0
   - Added Romanji plugin

composer.json

@@ -29,6 +29,6 @@
         }
     },
     "require": {
-        "vlucas/phpdotenv": "~1.0"
+
     }
 }

limelight_console

@@ -7,7 +7,3 @@ use Limelight\Limelight;
 require __DIR__ . '/vendor/autoload.php';
 
 $limelight = new Limelight();
-
-$results = $limelight->parse('東京に行きます');
-
-var_dump($results);

src/Classes/LimelightResults.php

@@ -43,11 +43,11 @@ public function __construct($text, array $words, $pluginData)
     /**
      * Call generator if invoked as function.
      *
-     * @return generator
+     * @return function
      */
     public function __invoke()
     {
-        return $this->next();
+        return $this->getNext();
     }
 
     /**
@@ -94,8 +94,8 @@ public function getResultString()
 
     /**
      * Get all lemmas combined as a string.
-     * 
-     * @return [type] [description]
+     *
+     * @return string
      */
     public function getLemmaString()
     {
@@ -133,7 +133,7 @@ public function getNext()
     }
 
     /**
-     * Get single word by word.
+     * Get single word, by word.
      *
      * @param string $string
      *
@@ -153,7 +153,7 @@ public function getByWord($string)
     /**
      * Get single word by index.
      *
-     * @param int $position
+     * @param int $index
      *
      * @return Limelight\Classes\LimelightWord
      */

src/Classes/LimelightWord.php

@@ -102,10 +102,10 @@ public function __get($name)
 
     /**
      * Call methods for plugin items.
-     * 
-     * @param  string $name
-     * @param  array $arguments
-     * 
+     *
+     * @param string $name
+     * @param array  $arguments
+     *
      * @return $this
      */
     public function __call($name, $arguments)
@@ -269,13 +269,6 @@ public function toKatakana()
         return $this;
     }
 
-    public function toRomanji()
-    {
-
-
-        return $this;
-    }
-
     /**
      * Append value to end of property.
      *

src/Config/Config.php

@@ -8,6 +8,8 @@
 class Config
 {
     /**
+     * config.php
+     * 
      * @var array
      */
     private $configFile;
@@ -94,6 +96,34 @@ public function make($interface)
         }
     }
 
+    /**
+     * Reset config values to those defined in config file.
+     */
+    public function resetConfig()
+    {
+        $this->configFile = include dirname(__DIR__).'/config.php';
+    }
+
+    /**
+     * Dynamically set config values.
+     *
+     * @param string $value
+     * @param string $key1
+     * @param string $key1
+     *
+     * @return bool
+     */
+    public function set($value, $key1, $key2)
+    {
+        if (isset($this->configFile[$key1]) && isset($this->configFile[$key1][$key2])) {
+            $this->configFile[$key1][$key2] = $value;
+
+            return true;
+        }
+
+        throw new LimelightInvalidInputException('Key not found in config file.');
+    }
+
     /**
      * Get full class namespace from bindings array.
      *

src/Limelight.php

@@ -2,7 +2,6 @@
 
 namespace Limelight;
 
-use Limelight\Config\Setup;
 use Limelight\Parse\Parser;
 use Limelight\Config\Config;
 use Limelight\Parse\Tokenizer;
@@ -11,7 +10,7 @@
 class Limelight
 {
     /**
-     * @var implements Limelight\Mecab\Mecab
+     * @var Limelight\Mecab\Mecab
      */
     private $mecab;
 
@@ -20,10 +19,6 @@ class Limelight
      */
     public function __construct()
     {
-        $setup = new Setup();
-
-        $setup->boot();
-
         $config = Config::getInstance();
 
         $this->mecab = $config->make('Limelight\Mecab\Mecab');
@@ -94,4 +89,20 @@ public function mecabSplit($string)
     {
         return $this->mecab->split($string);
     }
+
+    /**
+     * Dynamically set config values.
+     *
+     * @param string $value
+     * @param string $key1
+     * @param string $key1
+     *
+     * @return bool
+     */
+    public function setConfig($value, $key1, $key2)
+    {
+        $config = Config::getInstance();
+
+        $config->set($value, $key1, $key2);
+    }
 }

src/Mecab/PhpMecab/PhpMecab.php

@@ -7,11 +7,15 @@
 class PhpMecab implements Mecab
 {
     /**
-     * @var implements Limelight\Mecab\Mecab
+     * MeCab.
+     * 
+     * @var Limelight\Mecab\Mecab
      */
     private $mecab;
 
     /**
+     * Options array pulled from config.php.
+     * 
      * @var array
      */
     private $options;
@@ -27,6 +31,8 @@ class PhpMecab implements Mecab
 
     /**
      * Construct.
+     *
+     * @param  array $options
      */
     public function __construct($options)
     {

src/Plugins/Library/Furigana/Furigana.php

@@ -2,6 +2,7 @@
 
 namespace Limelight\Plugins\Library\Furigana;
 
+use Limelight\Config\Config;
 use Limelight\Plugins\Plugin;
 
 class Furigana extends Plugin
@@ -335,7 +336,9 @@ private function addToWord($wordObject, $word)
      */
     private function setTags()
     {
-        $tags = $this->config->get('Furigana');
+        $config = Config::getInstance();
+
+        $tags = $config->get('Furigana');
 
         foreach ($tags as $name => $tag) {
             $openClose = explode('{{}}', $tag);