Add options for Google Analytics

modules/google-analytics.php

@@ -9,14 +9,12 @@
  * You can enable/disable this feature in functions.php (or lib/config.php if you're using Sage):
  * add_theme_support('soil-google-analytics', 'UA-XXXXX-Y', 'wp_footer');
  */
-list($ga_id, $hook) = $options + ['', 'wp_footer'];
-add_action($hook, function () use ($ga_id) {
-  if (!$ga_id) {
-    return;
-  }
+function load_script() {
+  $gaID = options('gaID');
+  if (!$gaID) { return; }
   $dummyGA = (defined('WP_ENV') && WP_ENV !== 'production') || current_user_can('manage_options');
   ?>
-  <script> 
+  <script>
     <?php if (apply_filters('soil/dummyGA', $dummyGA)) : ?>
       function ga() {if (window.console) {console.log('Google Analytics: ' + [].slice.call(arguments));}}
     <?php else : ?>
@@ -26,7 +24,21 @@ function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
       e.src='//www.google-analytics.com/analytics.js';
       r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
     <?php endif; ?>
-    ga('create','<?= $ga_id; ?>','auto');ga('send','pageview');
+    ga('create','<?= $gaID; ?>','auto');ga('send','pageview');
   </script>
 <?php
-}, 20);
+}
+
+function options($option = null) {
+  static $options;
+  if (!isset($options)) {
+    $options = \Roots\Soil\Options::getByFile(__FILE__) + ['', 'wp_footer'];
+    $options['gaID'] = &$options[0];
+    $options['hook'] = &$options[1];
+  }
+  return is_null($option) ? $options : $options[$option];
+}
+
+$hook = options('hook');
+
+add_action($hook, __NAMESPACE__ . '\\load_script', 20);

soil.php

@@ -13,12 +13,49 @@
 
 namespace Roots\Soil;
 
+class Options {
+  protected static $modules = [];
+  protected $options = [];
+
+  public static function init($module, $options = []) {
+    if (!isset(self::$modules[$module])) {
+      self::$modules[$module] = new static((array) $options);
+    }
+    return self::$modules[$module];
+  }
+
+  public static function getByFile($file) {
+    if (file_exists($file) || file_exists(__DIR__ . '/modules/' . $file)) {
+      return self::get('soil-' . basename($file, '.php'));
+    }
+    return [];
+  }
+
+  public static function get($module) {
+    if (isset(self::$modules[$module])) {
+      return self::$modules[$module]->options;
+    }
+    if (substr($module, 0, 5)!=='soil-') {
+      return self::get('soil-' . $module);
+    }
+    return [];
+  }
+
+  protected function __construct($options) {
+    $this->set($options);
+  }
+
+  public function set($options) {
+    $this->options = $options;
+  }
+}
+
 function load_modules() {
   global $_wp_theme_features;
   foreach (glob(__DIR__ . '/modules/*.php') as $file) {
     $feature = 'soil-' . basename($file, '.php');
     if (isset($_wp_theme_features[$feature])) {
-      $options = (array) $_wp_theme_features[$feature];
+      Options::init($feature, $_wp_theme_features[$feature]);
       require_once $file;
     }
   }