Merge pull request #143 from caltechlibrary/v2

V2 merge

Author: rsdoiel

CITATION.cff

@@ -25,12 +25,11 @@ contacts:
     email: tmorrell@caltech.edu
 
 repository-code: "https://github.com/caltechlibrary/dataset"
-version: 2.2.4
-date-released: 2025-04-18
+version: 2.2.6
+date-released: 2025-06-02
 
 license-url: "https://caltechlibrary.github.io/dataset/LICENSE"
 keywords:
-  - GitHub
   - metadata
   - data
   - software

about.html

@@ -24,15 +24,9 @@
 
 <section>
 <h1 id="about-this-software">About this software</h1>
-<h2 id="dataset-2.2.4">dataset 2.2.4</h2>
-<p>Added the following functions to the dataset package</p>
-<ul>
-<li>(c *Collection) KeysJSON</li>
-<li>(c *Collection) UpdatedKeysJSON</li>
-<li>(c *Collection) QueryJSON</li>
-</ul>
-<p>These provide JSON encoded object support for their base
-functions.</p>
+<h2 id="dataset-2.2.6">dataset 2.2.6</h2>
+<p>Fix runtime error, issue 142. Added cors setting when serving
+JavaScript files.</p>
 <h3 id="authors">Authors</h3>
 <ul>
 <li>R. S. Doiel, <a href="https://orcid.org/0000-0003-0900-6903"
@@ -60,11 +54,12 @@ <h3 id="maintainers">Maintainers</h3>
 <h3 id="programming-languages">Programming languages</h3>
 <ul>
 <li>Go</li>
+<li>SQL</li>
 </ul>
 <h3 id="software-requirements">Software Requirements</h3>
 <ul>
-<li>Golang &gt;= 1.24.2</li>
-<li>CMTOlls &gt;= 0.0.20</li>
+<li>Golang &gt;= 1.24.3</li>
+<li>CMTools &gt;= 0.0.29</li>
 <li>Pandoc &gt;= 3.1</li>
 <li>GNU Make &gt;= 3.8</li>
 </ul>

about.md

@@ -19,34 +19,28 @@ maintainer:
     id: https://orcid.org/0000-0001-9266-5146
 
 repository_code: https://github.com/caltechlibrary/dataset
-version: 2.2.4
+version: 2.2.6
 license_url: https://caltechlibrary.github.io/dataset/LICENSE
 
 programming_language:
   - Go
+  - SQL
 
 keywords:
-  - GitHub
   - metadata
   - data
   - software
   - json
 
-date_released: 2025-04-18
+date_released: 2025-06-02
 ---
 
 About this software
 ===================
 
-## dataset 2.2.4
+## dataset 2.2.6
 
-Added the following functions to the dataset package
-
-- (c *Collection) KeysJSON
-- (c *Collection) UpdatedKeysJSON
-- (c *Collection) QueryJSON
-
-These provide JSON encoded object support for their base functions.
+Fix runtime error, issue 142. Added cors setting when serving JavaScript files.
 
 ### Authors
 
@@ -71,14 +65,15 @@ Tools for working with JSON documents as a collection hosted on the file system
 ### Programming languages
 
 - Go
+- SQL
 
 
 
 
 ### Software Requirements
 
-- Golang >= 1.24.2
-- CMTOlls >= 0.0.20
+- Golang >= 1.24.3
+- CMTools >= 0.0.29
 - Pandoc >= 3.1
 - GNU Make >= 3.8
 

api.go

@@ -73,6 +73,7 @@ type API struct {
 
 var (
 	settings *Settings
+	debug bool
 )
 
 // hasDotPath checks to see if a path is requested with a dot file (e.g. docs/.git/* or docs/.htaccess)
@@ -119,9 +120,19 @@ func staticRouter(next http.Handler) http.Handler {
 		}
 		// See if we need to set a header of JavaScript or TypeScript files.
 		if strings.HasSuffix(r.URL.Path, ".js") || strings.HasSuffix(r.URL.Path, ".mjs") {
+			if (debug) {
+				log.Printf("DEBUG Response Header %s = %q", "Content-Type", "application/javascript; charset=utf-8")
+			}
+			w.Header().Set("Referrer-Policy", "no-referrer-when-downgrade") // or any other value you prefer
+			w.Header().Set("Access-Control-Allow-Origin", "*")
 			w.Header().Add("Content-Type", "application/javascript; charset=utf-8")
 		}
 		if strings.HasSuffix(r.URL.Path, ".ts") {
+			if (debug) {
+				log.Printf("DEBUG Response Header  %s = %q", "Content-Type", "application/typescript; charset=utf-8")
+			}
+			w.Header().Set("Referrer-Policy", "no-referrer-when-downgrade") // or any other value you prefer
+			w.Header().Set("Access-Control-Allow-Origin", "*")
 			w.Header().Add("Content-Type", "application/typescript; charset=utf-8")
 		}
 		// If we make it this far, fall back to the default handler
@@ -179,6 +190,7 @@ func (api *API) WebService() error {
 		api.Router(w, r)
 	})
 	if api.Settings.Htdocs != "" {
+		debug = api.Debug
 		mux.Handle("/", staticRouter(http.FileServer(http.Dir(api.Settings.Htdocs))))
 	}
 	log.Printf("%s start, listening on %s", api.AppName, api.Settings.Host)

api_routes.go

@@ -408,7 +408,6 @@ func Create(w http.ResponseWriter, r *http.Request, api *API, cName string, verb
 		default:
 			//NOTE: Need to know the form field names, this is in .Model
 			r.ParseForm()
-			idName = c.Model.GetPrimaryId()
 			if c.Model == nil {
 				if api.Debug {
 					log.Printf("DEBUG c.Model is nil, accept all fields without validation")
@@ -418,6 +417,7 @@ func Create(w http.ResponseWriter, r *http.Request, api *API, cName string, verb
 				}
 			} else {
 				// NOTE: We only want to grab the fields defined in the model!!
+				idName = c.Model.GetPrimaryId()
 				if api.Debug {
 					log.Printf("DEBUG c.Model is populated, validating model's fields")
 				}

codemeta.json

@@ -50,8 +50,9 @@
       "email": "tmorrell@caltech.edu"
     }
   ],
-  "dateModified": "2025-04-18",
-  "datePublished": "2025-04-18",
+  "dateCreated": "2016-09-12",
+  "dateModified": "2025-06-02",
+  "datePublished": "2025-06-02",
   "description": "Tools for working with JSON documents as a collection hosted on the file system or SQL JSON store",
   "funder": [
     {
@@ -61,7 +62,6 @@
     }
   ],
   "keywords": [
-    "GitHub",
     "metadata",
     "data",
     "software",
@@ -70,17 +70,20 @@
   "name": "dataset",
   "license": "https://caltechlibrary.github.io/dataset/LICENSE",
   "programmingLanguage": [
-    "Go"
+    "Go",
+    "SQL"
   ],
   "softwareRequirements": [
-    "Golang >= 1.24.2",
-    "CMTOlls >= 0.0.20",
+    "Golang >= 1.24.3",
+    "CMTools >= 0.0.29",
     "Pandoc >= 3.1",
     "GNU Make >= 3.8"
   ],
-  "version": "2.2.4",
+  "version": "2.2.6",
   "developmentStatus": "active",
   "issueTracker": "https://github.com/caltechlibrary/dataset/issues",
   "downloadUrl": "https://github.com/caltechlibrary/dataset/archives/main.zip",
-  "releaseNotes": "Added the following functions to the dataset package\n\n- (c *Collection) KeysJSON\n- (c *Collection) UpdatedKeysJSON\n- (c *Collection) QueryJSON\n\nThese provide JSON encoded object support for their base functions."
+  "releaseNotes": "Fix runtime error, issue 142. Added cors setting when serving JavaScript files.",
+  "copyrightYear": 2025,
+  "copyrightHolder": "California Institute of Technology"
 }

dataset.1.html

@@ -242,7 +242,7 @@ <h1 id="examples">EXAMPLES</h1>
 and DB_NAME is used for the Postgres database name. The sslmode option
 was specified because Postgres in this example was restricted to
 localhost on a single user machine.</p>
-<p>dataset 2.2.4</p>
+<p>dataset 2.2.6</p>
 </section>
 
 <footer>

dataset.1.md

@@ -1,6 +1,6 @@
-%dataset(1) user manual | version 2.2.4 0f027f2
+%dataset(1) user manual | version 2.2.6 5fd165d
 % R. S. Doiel and Tom Morrell
-% 2025-04-18
+% 2025-06-02
 
 # NAME
 
@@ -218,6 +218,6 @@ database name.  The sslmode option was specified because Postgres
 in this example was restricted to localhost on a single user machine.
 
 
-dataset 2.2.4
+dataset 2.2.6
 
 

datasetd.1.html

@@ -233,7 +233,7 @@ <h1 id="examples">EXAMPLES</h1>
 <pre><code>    curl http://localhost:8485/api/t1.ds/keys</code></pre>
 <p>In the shell session where datasetd is running press “ctr-C” to
 terminate the service.</p>
-<p>datasetd 2.2.4</p>
+<p>datasetd 2.2.6</p>
 </section>
 
 <footer>

datasetd.1.md

@@ -1,6 +1,6 @@
-%datasetd(1) user manual | version 2.2.4 0f027f2
+%datasetd(1) user manual | version 2.2.6 5fd165d
 % R. S. Doiel
-% 2025-04-18
+% 2025-06-02
 
 # NAME
 
@@ -222,6 +222,6 @@ In the shell session where datasetd is running press "ctr-C"
 to terminate the service.
 
 
-datasetd 2.2.4
+datasetd 2.2.6