Merge pull request #65 from thinkovi/fix_terms_realistic_text

fixing product categories to include more realistic text

Author: rrennick

includes/Generator/Generator.php

@@ -57,9 +57,10 @@ protected static function init_faker() {
 	 *
 	 * @param int    $limit Number of term IDs to get.
 	 * @param string $taxonomy Taxonomy name.
+	 * @param string $name Product name to extract terms from.
 	 * @return array
 	 */
-	protected static function generate_term_ids( $limit, $taxonomy ) {
+	protected static function generate_term_ids( $limit, $taxonomy, $name = '' ) {
 		self::init_faker();
 
 		$term_ids = array();
@@ -68,29 +69,44 @@ protected static function generate_term_ids( $limit, $taxonomy ) {
 			return $term_ids;
 		}
 
-		$terms = self::$faker->words( $limit );
+		$words       = str_word_count( $name, 1 );
+		$extra_terms = str_word_count( self::$faker->department( $limit ), 1 );
+		$words       = array_merge( $words, $extra_terms );
+
+		if ( 'product_cat' === $taxonomy ) {
+			$terms = array_slice( $words, 1 );
+		} else {
+			$terms = array_merge( self::$faker->words( $limit ), array( strtolower( $words[0] ) ) );
+		}
 
 		foreach ( $terms as $term ) {
 			if ( isset( self::$term_ids[ $taxonomy ], self::$term_ids[ $taxonomy ][ $term ] ) ) {
-				$term_ids[] = self::$term_ids[ $taxonomy ][ $term ];
+				$term_id    = self::$term_ids[ $taxonomy ][ $term ];
+				$term_ids[] = $term_id;
+
 				continue;
 			}
 
-			$term_id  = 0;
-			$existing = get_term_by( 'name', $term, $taxonomy );
+			$term_id = 0;
+			$args    = array(
+				'taxonomy' => $taxonomy,
+				'name'     => $term,
+			);
+
+			$existing = get_terms( $args );
 
-			if ( $existing && ! is_wp_error( $existing ) ) {
-				$term_id = $existing->term_id;
+			if ( $existing && count( $existing ) && ! is_wp_error( $existing ) ) {
+				$term_id = $existing[0]->term_id;
 			} else {
-				$term_ob = wp_insert_term( $term, $taxonomy );
+				$term_ob = wp_insert_term( $term, $taxonomy, $args );
 
 				if ( $term_ob && ! is_wp_error( $term_ob ) ) {
 					$term_id = $term_ob['term_id'];
 				}
 			}
 
 			if ( $term_id ) {
-				$term_ids[] = $term_id;
+				$term_ids[]                           = $term_id;
 				self::$term_ids[ $taxonomy ][ $term ] = $term_id;
 			}
 		}

includes/Generator/Product.php

@@ -250,8 +250,8 @@ protected static function generate_variable_product() {
 			'upsell_ids'        => self::get_existing_product_ids(),
 			'cross_sell_ids'    => self::get_existing_product_ids(),
 			'image_id'          => self::get_image(),
-			'category_ids'      => self::generate_term_ids( self::$faker->numberBetween( 0, 5 ), 'product_cat' ),
-			'tag_ids'           => self::generate_term_ids( self::$faker->numberBetween( 0, 5 ), 'product_tag' ),
+			'category_ids'      => self::generate_term_ids( self::$faker->numberBetween( 0, 5 ), 'product_cat', $name ),
+			'tag_ids'           => self::generate_term_ids( self::$faker->numberBetween( 0, 5 ), 'product_tag', $name ),
 			'gallery_image_ids' => $gallery,
 			'reviews_allowed'   => self::$faker->boolean(),
 			'purchase_note'     => self::$faker->boolean() ? self::$faker->text() : '',
@@ -345,8 +345,8 @@ protected static function generate_simple_product() {
 			'menu_order'         => self::$faker->numberBetween( 0, 10000 ),
 			'virtual'            => $is_virtual,
 			'downloadable'       => false,
-			'category_ids'       => self::generate_term_ids( self::$faker->numberBetween( 0, 5 ), 'product_cat' ),
-			'tag_ids'            => self::generate_term_ids( self::$faker->numberBetween( 0, 5 ), 'product_tag' ),
+			'category_ids'       => self::generate_term_ids( self::$faker->numberBetween( 0, 5 ), 'product_cat', $name ),
+			'tag_ids'            => self::generate_term_ids( self::$faker->numberBetween( 0, 5 ), 'product_tag', $name ),
 			'shipping_class_id'  => 0,
 			'image_id'           => $image_id,
 			'gallery_image_ids'  => $gallery,