Changeset 653

Timestamp:

Nov 28, 2018 1:40:13 AM (5 years ago)

Author:

anonymous

Message:

Update fancyTxt()

Location:

trunk

Files:

• lib/Prefs.inc.php (modified) (3 diffs)
• lib/Utilities.inc.php (modified) (1 diff)
• tests/EmailTest.php (modified) (1 diff)
• tests/UtilitiesTest.php (modified) (2 diffs)
• tests/run_tests.sh (modified) (2 diffs)

trunk/lib/Prefs.inc.php

@@ -518 +518 @@
         // User_id must not be empty.
         if ('' == $this->getParam('user_id')) {
-            $app->logMsg(sprintf('Cannot save prefs because user_id not set.', null), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot load prefs because user_id not set.', null), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -591 +591 @@
         // Skip this method if not using the db.
         if ('database' != $this->getParam('storagetype')) {
-            $app->logMsg('Prefs->save() does nothing unless using a database storagetype.', LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg('Prefs->save() does nothing unless using a database storagetype.', LOG_DEBUG, __FILE__, __LINE__);
             return true;
         }
@@ -597 +597 @@
         // User_id must not be empty.
         if ('' == $this->getParam('user_id')) {
-            $app->logMsg(sprintf('Cannot save prefs because user_id not set.', null), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot save prefs because user_id not set.', null), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }

trunk/lib/Utilities.inc.php

@@ -221 +221 @@
  * @return string         Cleaned text.
  */
-function fancyTxt($text)
+function fancyTxt($text, $extra_search=null, $extra_replace=null)
 {
     $search = array();
     $replace = array();
 
-    // "double quoted text"  becomes  “double quoted text”
-    $search['double_quotes']    = '/(^|[^\w=])(?:"|"|"|"|“)([^"]+?)(?:"|"|"|"|”)([^\w]|$)/ms'; // " is the same as " and " and "
-    $replace['double_quotes']   = '$1“$2”$3';
-
-    // text's apostrophes  become  text’s apostrophes
-    $search['apostrophe']       = '/(\w)(?:\'|'|')(\w)/ms';
-    $replace['apostrophe']      = '$1’$2';
-
-    // 'single quoted text'  becomes  ‘single quoted text’
-    $search['single_quotes']    = '/(^|[^\w=])(?:\'|'|‘)([^\']+?)(?:\'|'|’)([^\w]|$)/ms';
-    $replace['single_quotes']   = '$1‘$2’$3';
-
-    // plural posessives' apostrophes become posessives’
-    $search['apostrophes']      = '/(s)(?:\'|'|')(\s)/ms';
-    $replace['apostrophes']     = '$1’$2';
-
-    // em--dashes  become em—dashes
-    $search['em_dash']          = '/(\s*[^!<-])--([^>-]\s*)/';
-    $replace['em_dash']         = '$1&mdash;$2';
-
-    return preg_replace($search, $replace, $text);
+    // "double quoted text"  →  “double quoted text”
+    $search['_double_quotes']    = '/(?<=^|[^\w=(])(?:"|&quot;|&#0?34;|&#x22;|&ldquo;)([\w\'.
(—–-][^"]*?)(?:"|&quot;|&#0?34;|&#x22;|&rdquo;)(?=[^)\w]|$)/imsu'; // " is the same as &quot; and &#34; and &#034; and &#x22;
+    $replace['_double_quotes']   = '“$1”';
+
+    // text's apostrophes  →  text’s apostrophes (except foot marks: 6'3")
+    $search['_apostrophe']       = '/(?<=[a-z])(?:\'|&#0?39;)(?=\w)/imsu';
+    $replace['_apostrophe']      = '’';
+
+    // 'single quoted text'  →  ‘single quoted text’
+    $search['_single_quotes']    = '/(?<=^|[^\w=(])(?:\'|&#0?39;|&lsquo;)([\w"][^\']+?)(?:\'|&#0?39;|&rsquo;)(?=[^)\w]|$)/imsu';
+    $replace['_single_quotes']   = '‘$1’';
+
+    // plural posessives' apostrophes  →  posessives’  (except foot marks: 6')
+    $search['_apostrophes']      = '/(?<=s)(?:\'|&#0?39;|&rsquo;)(?=\s)/imsu';
+    $replace['_apostrophes']     = '’';
+
+    // double--hyphens  →  en — dashes
+    $search['_em_dash']          = '/(?<=[\w\s"\'”’)])--(?=[\w\s“”‘"\'(?])/imsu';
+    $replace['_em_dash']         = ' – ';
+
+    // ...  →  

+    $search['_elipsis']          = '/(?<=^|[^.])\.\.\.(?=[^.]|$)/imsu';
+    $replace['_elipsis']         = '
';
+
+    if (is_array($extra_search) && is_array($extra_replace) && sizeof($extra_search) == sizeof($extra_replace)) {
+        // Append additional search replacements.
+        $search = array_merge($search, $extra_search);
+        $replace = array_merge($replace, $extra_replace);
+    }
+
+    return trim(preg_replace($search, $replace, $text));
 }
 

trunk/tests/EmailTest.php

@@ -99 +99 @@
         $this->Email->setString('This is a {TEST}');
         $this->Email->replace(array(
-            'test' => '– you guessed it – a test!'
+            'test' => '– you guessed it – a test! Sent from ' . __FILE__
         ));
         $result   = $this->Email->send();

trunk/tests/UtilitiesTest.php

@@ -35 +35 @@
     function setUp()
     {
-        define('_CLI', true);
+        // define('_CLI', true);
         require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/Utilities.inc.php';
@@ -255 +255 @@
     }
 
+    function test_fancyTxt()
+    {
+        $strings = [
+            'Due to the <a href="https://en.wikipedia.org/wiki/Camp_Fire_(2018)">fires in "Paradise," CA</a> it\'s a bad day.' => '• Due to the <a href="https://en.wikipedia.org/wiki/Camp_Fire_(2018)">fires in “Paradise,” CA</a> it’s a bad day.',
+            'Simply--"\'check back\' later"--in 6\'3"...' => '• Simply – “‘check back’ later” – in 6\'3"
',
+            '"Double "double \'single\'""--?' => '• "Double “double ‘single’”" – ?',
+            '<a href="javascript:openPopup(\'/foo/bar.php\')">Click here</a>....' => '• <a href="javascript:openPopup(\'/foo/bar.php\')">Click here</a>....',
+            'If you have any questions please <a href="/contact/">contact the ants\' mailboxes</a>.' => '• If you have any questions please <a href="/contact/">contact the ants’ mailboxes</a>.',
+            'This URL: "http://䟋子.卷筒纞/?x=y&1=2#asdf"' => '• This URL: “http://䟋子.卷筒纞/?x=y&1=2#asdf”',
+            // '\'...\' and "..."' => '• ‘
’ and “
”', // FIXME: this one doesn't work.
+            '\'1...\' and "2..."' => '• ‘1
’ and “2
”',
+            '\'One\'s self...\' and "Twosome"' => '• ‘One’s self
’ and “Twosome”',
+            '"\'Well,\' said I, \'the gentleman at No. 4.\'"' => '• “‘Well,’ said I, ‘the gentleman at No. 4.’”',
+            '"...an office in Leadenhall Street--and--"
+"O\'Reilly\'s office?"
+"What!" he roared.
+"Yes, to-day."* She stood smiling.'
+=>
+'• “
an office in Leadenhall Street – and – ”
+“O’Reilly’s office?”
+“What!” he roared.
+“Yes, to-day.”* She stood smiling.',
+        ];
+        foreach ($strings as $input => $expected) {
+            $result = fancyTxt($input, ['/^/', '/^·/'], ['· ', '•']);
+            $this->assertEquals($expected, $result, sprintf('Failed with input: %s', $input));
+        }
+    }
 }

trunk/tests/run_tests.sh

@@ -7 +7 @@
 #  export DB_USER="test"
 #  export DB_PASS="..."
+
+# Run an individual test like this:
+# ./tests/run_tests.sh /Users/q/src/codebase/trunk/tests/UtilitiesTest.php
 
 function err {
@@ -38 +41 @@
 # Config options go in phpunit.xml
 # phpunit --tap | grep -v '^ok '
-../vendor/phpunit/phpunit/composer/bin/phpunit --stderr || err "\nSomething went wrong (code $?). If there is no output above, check the php_error_log";
+../vendor/phpunit/phpunit/composer/bin/phpunit --stderr "$@" || err "\nSomething went wrong (code $?). If there is no output above, check the php_error_log";