Merge pull request #3 from haruncpi/dev

v1.0.3

Author: haruncpi

ajax.php

@@ -3,7 +3,7 @@
  * Plugin Name: Ajax
  * Description: Ajax request testing
  * Author: haruncpi
- * Version: 1.0.1
+ * Version: 1.0.3
  * Author URI: https://github.com/haruncpi
  * Requires PHP: 7.4
  * Requires at least: 5.3
@@ -13,13 +13,10 @@
  * @package Ajax
  */
 
-use Ajax\Plugin;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/bootstrap.php';
 
-define( 'AJAX_VERSION', '1.0.1' );
-define( 'AJAX_FILE', __DIR__ );
-define( 'AJAX_DIR', plugin_dir_path( __FILE__ ) );
-define( 'AJAX_URL', plugin_dir_url( __FILE__ ) );
-
-Plugin::get_instance();
+Ajax\Plugin::get_instance();

bootstrap.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Plugin bootstrap
+ *
+ * @package Ajax
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+require_once __DIR__ . '/vendor/autoload.php';
+
+if ( ! function_exists( 'get_plugin_data' ) ) {
+	require_once ABSPATH . 'wp-admin/includes/plugin.php';
+}
+
+define( 'AJAX_FILE', __DIR__ . '/ajax.php' );
+define( 'AJAX_VERSION', get_plugin_data( AJAX_FILE )['Version'] );
+define( 'AJAX_DIR', plugin_dir_path( AJAX_FILE ) );
+define( 'AJAX_URL', plugin_dir_url( AJAX_FILE ) );

gulpfile.js

@@ -17,6 +17,7 @@ try {
 
 const zipName = `${pluginName}-${versionNumber}.zip`;
 const buildDest = './build';
+
 const buildFiles = [
     './**/*',
     '!./build/**',
@@ -71,7 +72,7 @@ const makePod = (cb) => {
     }
 }
 
-const build = cb => src(buildFiles).pipe(dest(buildDest))
+const build = cb => src(buildFiles).pipe(dest(`${buildDest}/${pluginName}`))
 const buildZip = cb => src(`${buildDest}/**/*`).pipe(zip(zipName)).pipe(dest('./'))
 
 

src/Plugin.php

@@ -55,11 +55,10 @@ private function bootstrap() {
 		new Ajax();
 
 		$config = array(
-			'update_url'      => 'https://raw.githubusercontent.com/haruncpi/wp-ajax/master/src/Updater/plugin.json',
-			'plugin_file'     => AJAX_FILE,
-			'current_version' => AJAX_VERSION,
+			'plugin_file' => AJAX_FILE,
+			'update_url'  => 'https://raw.githubusercontent.com/haruncpi/wp-ajax/master/src/Updater/plugin.json',
 		);
 
-		Updater::setup( $config );
+		Updater::configure( $config );
 	}
 }

src/Updater/Updater.php

@@ -1,6 +1,8 @@
 <?php
 /**
  * Manage Plugin Update
+ * Plugin update transient: _site_transient_update_plugins
+ * Theme update transient: _site_transient_update_themes
  *
  * @package Ajax
  * @author Harun <harun.cox@gmail.com>
@@ -63,9 +65,8 @@ class Updater {
 	 */
 	private function __construct( $config ) {
 		$required_keys = array(
-			'update_url',
 			'plugin_file',
-			'current_version',
+			'update_url',
 		);
 
 		foreach ( $required_keys as $key ) {
@@ -74,9 +75,21 @@ private function __construct( $config ) {
 			}
 		}
 
+		$plugin_file = $config['plugin_file'];
+
+		if ( ! is_file( $plugin_file ) ) {
+			wp_die( esc_html( "Plugin file not found: $plugin_file" ) );
+		}
+
+		if ( ! function_exists( 'get_plugin_data' ) ) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+
+		$plugin_data = get_plugin_data( $plugin_file );
+
 		$this->update_url    = $config['update_url'];
 		$this->plugin_slug   = plugin_basename( $config['plugin_file'] );
-		$this->version       = $config['current_version'];
+		$this->version       = $plugin_data['Version'];
 		$this->cache_key     = "{$this->plugin_slug}_update";
 		$this->cache_allowed = true;
 
@@ -91,7 +104,7 @@ private function __construct( $config ) {
 	 *
 	 * @return self
 	 */
-	public static function setup( $config ) {
+	public static function configure( $config ) {
 		if ( isset( self::$instance ) ) {
 			return self::$instance;
 		}
@@ -138,6 +151,15 @@ public function request() {
 
 	}
 
+	/**
+	 * Clear request cache.
+	 *
+	 * @return void
+	 */
+	public function clear_request_cache() {
+		delete_transient( $this->cache_key );
+	}
+
 	/**
 	 * Plugin info
 	 *

src/Updater/plugin.json

@@ -1,14 +1,14 @@
 {
 	"name" : "Ajax",
 	"slug" : "ajax",
-	"version" : "1.0.1",
+	"version" : "1.0.3",
+	"download_url" : "https://github.com/haruncpi/wp-ajax/releases/download/v1.0.3/ajax-1.0.3.zip",
 	"author" : "<a href='https://github.com/haruncpi'>Harun</a>",
 	"author_profile" : "https://github.com/haruncpi",
-	"download_url" : "https://github.com/haruncpi/wp-ajax/releases/download/v1.0.1/ajax-1.0.1.zip",
-	"requires" : "3.0",
+	"requires" : "5.0",
 	"tested" : "6.6",
 	"requires_php" : "7.4",
-	"last_updated" : "2024-08-09 12:00:00",
+	"last_updated" : "2024-08-14 00:00:00",
 	"sections" : {
 		"description" : "This simple plugin does nothing, only gets updates from a custom server",
 		"installation" : "Click the activate button and that's it.",