change module namespace

front-matter · Apr 22, 2024 · 62cc488 · 62cc488
1 parent 528485a
commit 62cc488
Show file tree

Hide file tree

Showing 25 changed files with 66 additions and 49 deletions.
diff --git a/cff/cff.go b/cff/cff.go
@@ -1,6 +1,6 @@
 package cff
 
-import "commonmeta/types"
+import "github.com/front-matter/commonmeta-go/types"
 
 type Content struct {
 	ID    string `json:"id"`

diff --git a/cmd/convert.go b/cmd/convert.go
@@ -4,14 +4,16 @@ Copyright © 2024 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"commonmeta/crossref"
-	"commonmeta/datacite"
-	"commonmeta/doiutils"
-	"commonmeta/types"
 	"encoding/json"
 	"fmt"
 	"strings"
 
+	"github.com/front-matter/commonmeta-go/datacite"
+	"github.com/front-matter/commonmeta-go/doiutils"
+	"github.com/front-matter/commonmeta-go/types"
+
+	"github.com/front-matter/commonmeta-go/crossref"
+
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/sample.go b/cmd/sample.go
@@ -5,13 +5,14 @@ package cmd
 
 import (
 	"bytes"
-	"commonmeta/commonmeta"
-	"commonmeta/crossref"
-	"commonmeta/datacite"
-	"commonmeta/types"
 	"encoding/json"
 	"fmt"
 
+	"github.com/front-matter/commonmeta-go/commonmeta"
+	"github.com/front-matter/commonmeta-go/crossref"
+	"github.com/front-matter/commonmeta-go/datacite"
+	"github.com/front-matter/commonmeta-go/types"
+
 	"github.com/spf13/cobra"
 )
 
@@ -63,5 +64,5 @@ var sampleCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(sampleCmd)
 
-	sampleCmd.PersistentFlags().StringP("provider", "", "", "the provider to get a sample from")
+	sampleCmd.PersistentFlags().StringP("provider", "", "crossref", "the provider to get a sample from")
 }
diff --git a/codemeta/codemeta.go b/codemeta/codemeta.go
@@ -1,6 +1,6 @@
 package codemeta
 
-import "commonmeta/types"
+import "github.com/front-matter/commonmeta-go/types"
 
 type Content struct {
 	ID    string `json:"id"`

diff --git a/commonmeta/commonmeta.go b/commonmeta/commonmeta.go
@@ -2,11 +2,12 @@ package commonmeta
 
 import (
 	"bytes"
-	"commonmeta/schemautils"
-	"commonmeta/types"
 	"encoding/json"
 	"fmt"
 
+	"github.com/front-matter/commonmeta-go/schemautils"
+	"github.com/front-matter/commonmeta-go/types"
+
 	"github.com/xeipuuv/gojsonschema"
 )
 

diff --git a/crossref/crossref.go b/crossref/crossref.go
@@ -1,10 +1,6 @@
 package crossref
 
 import (
-	"commonmeta/dateutils"
-	"commonmeta/doiutils"
-	"commonmeta/types"
-	"commonmeta/utils"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -18,6 +14,11 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/front-matter/commonmeta-go/dateutils"
+	"github.com/front-matter/commonmeta-go/doiutils"
+	"github.com/front-matter/commonmeta-go/types"
+	"github.com/front-matter/commonmeta-go/utils"
 )
 
 type Content struct {
@@ -402,7 +403,6 @@ func ReadCrossref(content Content) (types.Data, error) {
 				ContributorRoles: []string{"Author"},
 				Affiliations:     affiliations,
 			})
-
 		}
 	}
 

diff --git a/crossref/crossref_test.go b/crossref/crossref_test.go
@@ -1,15 +1,16 @@
 package crossref_test
 
 import (
-	"commonmeta/crossref"
-	"commonmeta/doiutils"
-	"commonmeta/types"
 	"encoding/json"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 
+	"github.com/front-matter/commonmeta-go/crossref"
+	"github.com/front-matter/commonmeta-go/doiutils"
+	"github.com/front-matter/commonmeta-go/types"
+
 	"github.com/google/go-cmp/cmp"
 )
 

diff --git a/crossrefxml/crossrefxml.go b/crossrefxml/crossrefxml.go
@@ -1,7 +1,7 @@
 package crossrefxml
 
 import (
-	"commonmeta/types"
+	"github.com/front-matter/commonmeta-go/types"
 )
 
 type Content struct {

diff --git a/csl/csl.go b/csl/csl.go
@@ -1,6 +1,6 @@
 package csl
 
-import "commonmeta/types"
+import "github.com/front-matter/commonmeta-go/types"
 
 type Content struct {
 	ID    string `json:"id"`

diff --git a/datacite/datacite.go b/datacite/datacite.go
@@ -1,10 +1,6 @@
 package datacite
 
 import (
-	"commonmeta/constants"
-	"commonmeta/doiutils"
-	"commonmeta/types"
-	"commonmeta/utils"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -15,6 +11,11 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/front-matter/commonmeta-go/constants"
+	"github.com/front-matter/commonmeta-go/doiutils"
+	"github.com/front-matter/commonmeta-go/types"
+	"github.com/front-matter/commonmeta-go/utils"
 )
 
 type Content struct {

diff --git a/datacite/datacite_test.go b/datacite/datacite_test.go
@@ -1,16 +1,17 @@
 package datacite_test
 
 import (
-	"commonmeta/datacite"
-	"commonmeta/doiutils"
-	"commonmeta/types"
 	"encoding/json"
 	"errors"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 
+	"github.com/front-matter/commonmeta-go/datacite"
+	"github.com/front-matter/commonmeta-go/doiutils"
+	"github.com/front-matter/commonmeta-go/types"
+
 	"github.com/google/go-cmp/cmp"
 )
 

diff --git a/dateutils/dateutils_test.go b/dateutils/dateutils_test.go
@@ -1,8 +1,9 @@
 package dateutils_test
 
 import (
-	"commonmeta/dateutils"
 	"testing"
+
+	"github.com/front-matter/commonmeta-go/dateutils"
 )
 
 // func TestGetDateParts(t *testing.T) {

diff --git a/doiutils/doiutils_test.go b/doiutils/doiutils_test.go
@@ -1,8 +1,9 @@
 package doiutils_test
 
 import (
-	"commonmeta/doiutils"
 	"testing"
+
+	"github.com/front-matter/commonmeta-go/doiutils"
 )
 
 func TestValidateDOI(t *testing.T) {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/front-matter/commonmeta
+module github.com/front-matter/commonmeta-go
 
 go 1.22.2
 

diff --git a/inveniordm/inveniordm.go b/inveniordm/inveniordm.go
@@ -1,12 +1,13 @@
 package inveniordm
 
 import (
-	"commonmeta/types"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"time"
+
+	"github.com/front-matter/commonmeta-go/types"
 )
 
 type Content struct {

diff --git a/inveniordm/inveniordm_test.go b/inveniordm/inveniordm_test.go
@@ -1,8 +1,9 @@
 package inveniordm_test
 
 import (
-	"commonmeta/inveniordm"
 	"testing"
+
+	"github.com/front-matter/commonmeta-go/inveniordm"
 )
 
 func TestGetInvenioRDM(t *testing.T) {

diff --git a/jsonfeed/jsonfeed.go b/jsonfeed/jsonfeed.go
@@ -1,12 +1,13 @@
 package jsonfeed
 
 import (
-	"commonmeta/types"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"time"
+
+	"github.com/front-matter/commonmeta-go/types"
 )
 
 type Content struct {

diff --git a/jsonfeed/jsonfeed_test.go b/jsonfeed/jsonfeed_test.go
@@ -1,8 +1,9 @@
 package jsonfeed_test
 
 import (
-	"commonmeta/jsonfeed"
 	"testing"
+
+	"github.com/front-matter/commonmeta-go/jsonfeed"
 )
 
 func TestGetJsonFeedItem(t *testing.T) {

diff --git a/main.go b/main.go
@@ -4,7 +4,7 @@ Copyright © 2024 Front Matter <[email protected]>
 package main
 
 import (
-	"commonmeta/cmd"
+	"github.com/front-matter/commonmeta-go/cmd"
 )
 
 func main() {

diff --git a/schemaorg/schemaorg.go b/schemaorg/schemaorg.go
@@ -1,6 +1,6 @@
 package schemaorg
 
-import "commonmeta/types"
+import "github.com/front-matter/commonmeta-go/types"
 
 type Content struct {
 	ID    string `json:"id"`

diff --git a/schemautils/schemautils_test.go b/schemautils/schemautils_test.go
@@ -1,11 +1,12 @@
 package schemautils_test
 
 import (
-	"commonmeta/schemautils"
-	"commonmeta/types"
 	"encoding/json"
 	"path/filepath"
 
+	"github.com/front-matter/commonmeta-go/schemautils"
+	"github.com/front-matter/commonmeta-go/types"
+
 	"fmt"
 	"log"
 	"os"
@@ -38,9 +39,9 @@ func TestJSONSchemaErrors(t *testing.T) {
 	}
 
 	testCases := []testCase{
-		{meta: m, want: 1},
-		{meta: n, want: 2},
-		{meta: o, want: 2},
+		{meta: m, want: 0},
+		{meta: n, want: 1},
+		{meta: o, want: 1},
 	}
 	for _, tc := range testCases {
 		documentJSON, err := json.Marshal(tc.meta)

diff --git a/types/types.go b/types/types.go
@@ -9,7 +9,7 @@ type Data struct {
 	AdditionalType    string             `db:"additional_type" json:"additionalType,omitempty"`
 	ArchiveLocations  []string           `db:"archive_locations" json:"archiveLocations,omitempty"`
 	Container         Container          `db:"container" json:"container,omitempty"`
-	Contributors      []Contributor      `db:"contributors" json:"contributors"`
+	Contributors      []Contributor      `db:"contributors" json:"contributors,omitempty"`
 	Date              Date               `db:"date" json:"date,omitempty"`
 	Descriptions      []Description      `db:"descriptions" json:"descriptions,omitempty"`
 	Files             []File             `db:"files" json:"files,omitempty"`
@@ -46,7 +46,7 @@ type Container struct {
 
 type Contributor struct {
 	ID               string        `json:"id,omitempty"`
-	Type             string        `json:"type"`
+	Type             string        `json:"type,omitempty"`
 	Name             string        `json:"name,omitempty"`
 	GivenName        string        `json:"givenName,omitempty"`
 	FamilyName       string        `json:"familyName,omitempty"`

diff --git a/types/types_test.go b/types/types_test.go
@@ -1,8 +1,9 @@
 package types_test
 
 import (
-	"commonmeta/types"
 	"testing"
+
+	"github.com/front-matter/commonmeta-go/types"
 )
 
 func TestMetadata(t *testing.T) {

diff --git a/utils/utils.go b/utils/utils.go
@@ -1,14 +1,15 @@
 package utils
 
 import (
-	"commonmeta/doiutils"
 	"encoding/json"
 	"fmt"
 	"log"
 	"net/url"
 	"regexp"
 	"strings"
 
+	"github.com/front-matter/commonmeta-go/doiutils"
+
 	"github.com/microcosm-cc/bluemonday"
 )
 

diff --git a/utils/utils_test.go b/utils/utils_test.go
@@ -1,8 +1,9 @@
 package utils_test
 
 import (
-	"commonmeta/utils"
 	"testing"
+
+	"github.com/front-matter/commonmeta-go/utils"
 )
 
 func TestNormalizeUrl(t *testing.T) {