Merge pull request #56 from saertna/Refactoring-Unit-Test

Publish for mobile and Refactoring unit test

.gitignore

@@ -19,27 +19,9 @@ main.js
 data.json
 
 # Exclude macOS Finder (System Explorer) View States
+coverage/
 .DS_Store
 /cp-js2cortex.bat
 ncryption
-data_bkp_231023.json
-
-# Ignore Test Data
 *.html
 *.xml
-coverage/lcov.info
-coverage/lcov-report/badges.ts.html
-coverage/lcov-report/constants.ts.html
-coverage/lcov-report/creatmodchartcalculation.ts.html
-coverage/lcov-report/index.html
-coverage/lcov-report/levels.ts.html
-coverage/lcov-report/main.ts.html
-coverage/lcov-report/majuritycalculation.ts.html
-coverage/lcov-report/randomNotificationText.ts.html
-coverage/lcov-report/utils.ts.html
-coverage/clover.xml
-coverage/coverage-final.json
-coverage/lcov-report/encryption.ts.html
-coverage/lcov-report/ModalBooster.ts.html
-coverage/lcov-report/ModalInformationbox.ts.html
-coverage/lcov-report/MultiSelectModal.ts.html

README.md

@@ -52,7 +52,7 @@ In some cases the same vault is used vor other activities as well an the knowled
 
 ### initialise game
 
-When not already done during installation, hit `CTRL+P` and run command `Initialize gamification ratings`. This command will create you profile, rate you existing notes and give you a starting level. On the profile you can get informations to you current level, points, badges and see the distribution of you note maturitys. 
+When not already done during installation, hit `CTRL+P` and run command `Initialize gamification ratings`. This command will create you profile, rate you existing notes and give you a starting level. On the profile you can get informations to you current level, points, badges and see the distribution of you note maturitys.
 
 ![Gamification Initialization Command](/docs/images/GamificationInitializationCommand.png)
 

jest.config.js

@@ -1,11 +1,14 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  collectCoverage: true,
+	preset: 'ts-jest',
+	testEnvironment: 'node',
+	moduleNameMapper: {
+		'^obsidian$': 'obsidian',
+	},
+	collectCoverage: true,
 	collectCoverageFrom: ["./src/**"],
 	coverageThreshold: {
-		"global": {
-		"lines": 4
-	}},
-};
+		global: {
+			lines: 4,
+		},
+	},
+};

manifest.json

@@ -1,11 +1,11 @@
 {
   "id": "gamified-pkm",
   "name": "Gamificate your PKM",
-  "version": "0.0.85",
+  "version": "0.0.86",
   "minAppVersion": "0.15.0",
   "description": "Enhance your Personal Knowledge Management with gamification elements. Boost motivation and achieve growth as you engage with your PKM.",
   "author": "Andreas Trebing",
   "authorUrl": "https://github.com/saertna",
   "fundingUrl": "https://ko-fi.com/andreastrebing",
-  "isDesktopOnly": true
+  "isDesktopOnly": false
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-gamified-pkm",
-  "version": "0.0.85",
+  "version": "0.0.86",
   "description": "Enhance your Personal Knowledge Management with gamification elements. Boost motivation and achieve growth as you engage with your PKM.",
   "main": "main.js",
   "scripts": {
@@ -29,7 +29,7 @@
     "jest-mock-extended": "^3.0.5",
     "lint": "^1.1.2",
     "markdownlint": "^0.30.0",
-    "obsidian": "^1.3.5",
+    "obsidian": "^1.4.11",
     "ts-jest": "^29.1.1",
     "tslib": "2.4.0",
     "typescript": "4.7.4"

preprelease.py

@@ -2,6 +2,7 @@
 import json
 import shutil
 import zipfile
+import subprocess
 from urllib.parse import urlparse
 
 
@@ -66,11 +67,22 @@ def update_json_version(file_path, new_version):
 #                arcname = os.path.relpath(file_path, source_folder)
 #                zip_file.write(file_path, arcname=arcname)
 
+def update_constants(constants_path):
+    with open(constants_path, 'r', encoding='utf-8') as constants_file:
+        constants_content = constants_file.read()
+
+    updated_constants_content = constants_content.replace('export const debugLogs = true;', 'export const debugLogs = false;')
+
+    with open(constants_path, 'w', encoding='utf-8') as constants_file:
+        constants_file.write(updated_constants_content)
+
 def main(new_version):
     plugin_folder = '.'
     readme_path = os.path.join(plugin_folder, 'README.md')
     manifest_path = os.path.join(plugin_folder, 'manifest.json')
     package_path = os.path.join(plugin_folder, 'package.json')
+    constants_path = os.path.join(plugin_folder, 'src', 'constants.ts')
+
 
     # Update README.md
     update_readme_version(readme_path, new_version)
@@ -80,6 +92,16 @@ def main(new_version):
 
     # Update package.json
     update_json_version(package_path, new_version)
+
+    # Update constants.ts
+    update_constants(constants_path)
+
+    # Run npm build commands
+    try:
+        subprocess.run(["npm", "install"], check=True, cwd=plugin_folder, shell=True)
+        subprocess.run(["npm", "run", "build"], check=True, cwd=plugin_folder, shell=True)
+    except subprocess.CalledProcessError as e:
+        print(f"Error running npm commands: {e}")
 
     # Zip files
     files_to_zip = ['main.js', 'manifest.json', 'styles.css']

src/main.ts

@@ -30,8 +30,8 @@ import {
 	rateNoteLength,
 	rateOutlinks,
 	rateProgressiveSummarization
-} from './majuritycalculation'
-import {Badge, checkIfReceiveABadge, getBadgeForInitLevel, getBadgeForLevel, getBadgeDetails, getBadge} from './badges'
+} from './maturitycalculation'
+import {Badge, checkIfReceiveABadge, getBadgeForInitLevel, getBadgeForLevel , getBadgeDetails , getBadge } from './badges'
 import {getLevelForPoints, statusPointsForLevel} from './levels'
 import type {Moment} from 'moment';
 import {
@@ -464,7 +464,12 @@ export default class gamification extends Plugin {
 		// get file content length
 		const activeView = this.app.workspace.getActiveViewOfType(MarkdownView);
 		const fileContents = activeView?.editor.getValue();
-		const fileName = activeView?.file.basename;
+		//const fileName = activeView?.file.basename;
+		const fileName = activeView?.file?.basename;
+		if (fileName === null || fileName === undefined) {
+			console.error("File name is null or undefined. Stopping further processing.");
+			return;
+		}
 
 
 		let rateFileLength = 0;