continued work on 3.3.0

README.md

@@ -12,7 +12,8 @@ Generally the trunk is pretty stable, but it's not guaranteed. If you're downloa
 tag: https://github.com/benkeen/generatedata/releases
 
 ## Requirements
-- PHP 5.3 or any later version of PHP 5. *Doesn't currently support PHP 7. 3.3.0 is currently in dev that will support it.* 
+- PHP 5.3 or any later version of PHP 5. *Uses mysqli_* which is disabled in default installations of PHP 7. Version 
+3.3.0 is currently in dev that moves the DB connection layer to PDO.* 
 - MySQL 4.1.3 or later
 
 ## How to Install / Documentation
@@ -80,7 +81,7 @@ In addition to the many fine folk who submit bug reports, a big thanks to the fo
 ## Changelog
 
 3.3.0 - April 2017 *In development*
-- moving to use PDO for database connection for PHP7 support.
+- moving to use PDO for database connection.
 
 3.2.6 - Apr 17, 2017
 - misc bug fixes: https://github.com/benkeen/generatedata/milestone/20?closed=1

gruntfile.js

@@ -28,6 +28,17 @@ module.exports = function(grunt) {
 			}
 		},
 
+        sass: {
+            options: {
+                sourceMap: true
+            },
+            dist: {
+                files: {
+                    'resources/themes/classic/compiled/styles.css': 'resources/themes/classic/sass/styles.scss'
+                }
+            }
+        },
+
 		cssmin: {
 			target: {
 				files: {
@@ -93,11 +104,23 @@ module.exports = function(grunt) {
 					failOnMatch: true
 				}
 			}
-		}
+		},
+
+        watch: {
+            scripts: {
+                files: ['**/*.scss'],
+                tasks: ['sass'],
+                options: {
+                    spawn: false
+                }
+            }
+        }
 	};
 
 	grunt.initConfig(config);
 
+    grunt.loadNpmTasks('grunt-sass');
+    grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-contrib-requirejs');
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-md5');
@@ -106,13 +129,14 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-search');
 
 	/**
-	 * The default - and only - Grunt task simply recreates all the bundled resources. It doesn't alter the actual
+	 * The default Grunt task simply recreates all the bundled resources. It doesn't alter the actual
 	 * script at all. To use these bundled resources you need to add a $useMinifiedResources = true; var to your
 	 * settings.php file.
 	 */
 	grunt.registerTask('default', [
 
 		// uglify the core CSS + JS
+		'sass',
 		'uglify',
 		'cssmin',
 
@@ -125,4 +149,10 @@ module.exports = function(grunt) {
 		// with the latest file mapping
 		'md5'
 	]);
+
+    /**
+	 * For local dev work. Watches the sass files and regenerates the CSS.
+     */
+    grunt.registerTask('local', ['watch']);
+
 };

package.json

@@ -21,13 +21,15 @@
     "url": "https://github.com/benkeen/generatedata/issues"
   },
   "devDependencies": {
-    "grunt-cli": "~0.1.9",
     "grunt": "~0.4.1",
+    "grunt-cli": "~0.1.9",
+    "grunt-contrib-cssmin": "~0.6.1",
     "grunt-contrib-requirejs": "~0.4.1",
     "grunt-contrib-uglify": "~0.2.4",
+    "grunt-contrib-watch": "^1.0.0",
     "grunt-md5": "~0.1.11",
-    "grunt-template": "~0.2.0",
-    "grunt-contrib-cssmin": "~0.6.1",
-    "grunt-search": "~0.1.2"
+    "grunt-sass": "^2.0.0",
+    "grunt-search": "~0.1.2",
+    "grunt-template": "~0.2.0"
   }
 }

plugins/dataTypes/City/City.class.php

@@ -87,10 +87,9 @@ public function generate($generator, $generationContextData) {
 	 * $citiesByCountryRegion private var.
 	 */
 	private function initCityList() {
-		$prefix = Core::getDbTablePrefix();
 		$response = Core::$db->query("
 			SELECT *
-			FROM {$prefix}cities
+			FROM {PREFIX}cities
 		");
 
 		if (!$response["success"]) {

plugins/dataTypes/Country/Country.class.php

@@ -166,10 +166,9 @@ public function getCountries($countrySlugs) {
 			$whereClause .= "AND $slugClause";
 		}
 
-		$prefix = Core::getDbTablePrefix();
 		$response = Core::$db->query("
 			SELECT *
-			FROM   {$prefix}countries
+			FROM   {PREFIX}countries
 			$whereClause
 		");
 
@@ -185,10 +184,9 @@ public function getCountries($countrySlugs) {
 	}
 
 	function getRegions($countryID) {
-		$prefix = Core::getDbTablePrefix();
 		$response = Core::$db->query("
 			SELECT *
-			FROM  {$prefix}regions
+			FROM  {PREFIX}regions
 			WHERE country_id = $countryID
 		");