Skip to content

Commit

Permalink
Update import paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@lestrrat
lestrrat committed Feb 21, 2018
1 parent b69a644 commit 1c95ea0
Show file tree
Hide file tree
Showing 32 changed files with 84 additions and 83 deletions.
27 changes: 14 additions & 13 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# go-libxml2
# libxml2

[![Build Status](https://travis-ci.org/lestrrat/go-libxml2.svg?branch=master)](https://travis-ci.org/lestrrat/go-libxml2)
Interface to libxml2, with DOM interface.

[![GoDoc](https://godoc.org/github.com/lestrrat/go-libxml2?status.svg)](https://godoc.org/github.com/lestrrat/go-libxml2)
[![Build Status](https://travis-ci.org/lestrrat-go/libxml2.svg?branch=master)](https://travis-ci.org/lestrrat-go/libxml2)

[![GoDoc](https://godoc.org/github.com/lestrrat-go/libxml2?status.svg)](https://godoc.org/github.com/lestrrat-go/libxml2)

Interface to libxml2, with DOM interface.

## Why?

I needed to write [go-xmlsec](https://github.com/lestrrat/go-xmlsec). This means we need to build trees using libxml2, and then muck with it in xmlsec: Two separate packages in Go means we cannot (safely) pass around `C.xmlFooPtr` objects (also, you pay a penalty for pointer types). This package carefully avoid references to `C.xmlFooPtr` types and uses uintptr to pass data around, so other libraries that needs to interact with libxml2 can safely interact with it.
I needed to write [go-xmlsec](https://github.com/lestrrat-go/xmlsec). This means we need to build trees using libxml2, and then muck with it in xmlsec: Two separate packages in Go means we cannot (safely) pass around `C.xmlFooPtr` objects (also, you pay a penalty for pointer types). This package carefully avoid references to `C.xmlFooPtr` types and uses uintptr to pass data around, so other libraries that needs to interact with libxml2 can safely interact with it.

## Status

Expand Down Expand Up @@ -67,10 +68,10 @@ import (
"log"
"net/http"

"github.com/lestrrat/go-libxml2"
"github.com/lestrrat/go-libxml2/parser"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat/go-libxml2/xpath"
"github.com/lestrrat-go/libxml2"
"github.com/lestrrat-go/libxml2/parser"
"github.com/lestrrat-go/libxml2/types"
"github.com/lestrrat-go/libxml2/xpath"
)

func ExampleXML() {
Expand Down Expand Up @@ -148,8 +149,8 @@ import (
"os"
"path/filepath"

"github.com/lestrrat/go-libxml2"
"github.com/lestrrat/go-libxml2/xsd"
"github.com/lestrrat-go/libxml2"
"github.com/lestrrat-go/libxml2/xsd"
)

func ExampleXSD() {
Expand Down Expand Up @@ -206,12 +207,12 @@ BenchmarkXmlpathXmlpath-4 500000 11737 ns/op 721 B/op
BenchmarkLibxml2Xmlpath-4 1000000 7627 ns/op 368 B/op 15 allocs/op
BenchmarkEncodingXMLDOM-4 2000000 4079 ns/op 4560 B/op 9 allocs/op
BenchmarkLibxml2DOM-4 1000000 11454 ns/op 264 B/op 7 allocs/op
ok github.com/lestrrat/go-libxml2 37.597s
ok github.com/lestrrat-go/libxml2 37.597s
```

## See Also

* https://github.com/lestrrat/go-xmlsec
* https://github.com/lestrrat-go/xmlsec

## Credits

Expand Down
2 changes: 1 addition & 1 deletion clib/clib.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ import (
"unicode/utf8"
"unsafe"

"github.com/lestrrat/go-libxml2/internal/debug"
"github.com/lestrrat-go/libxml2/internal/debug"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions dom/c14n_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package dom_test
import (
"testing"

"github.com/lestrrat/go-libxml2"
"github.com/lestrrat/go-libxml2/dom"
"github.com/lestrrat-go/libxml2"
"github.com/lestrrat-go/libxml2/dom"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions dom/document_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package dom_test
import (
"testing"

"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/dom"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/dom"
"github.com/lestrrat-go/libxml2/types"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion dom/dom.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package dom
import (
"sync"

"github.com/lestrrat/go-libxml2/xpath"
"github.com/lestrrat-go/libxml2/xpath"
)

var docPool sync.Pool
Expand Down
2 changes: 1 addition & 1 deletion dom/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package dom
import (
"errors"

"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat-go/libxml2/clib"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions dom/node.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package dom

import (
"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat/go-libxml2/xpath"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/types"
"github.com/lestrrat-go/libxml2/xpath"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion dom/node_attr.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dom

import (
"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat-go/libxml2/clib"
)

// Free releases the underlying C struct
Expand Down
4 changes: 2 additions & 2 deletions dom/node_document.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package dom

import (
"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/types"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions dom/node_element.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"errors"
"strings"

"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/types"
)

// SetNamespace sets up a new namespace on the given node.
Expand Down
2 changes: 1 addition & 1 deletion dom/node_namespace.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dom

import (
"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat-go/libxml2/clib"
)

// URI returns the namespace URL
Expand Down
4 changes: 2 additions & 2 deletions dom/node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/types"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion dom/node_text.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dom

import (
"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat-go/libxml2/clib"
)

func (n *CDataSection) Literal() (string, error) {
Expand Down
4 changes: 2 additions & 2 deletions dom/node_wrap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package dom
import (
"fmt"

"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/types"
)

func wrapNamespaceNode(ptr uintptr) *Namespace {
Expand Down
4 changes: 2 additions & 2 deletions dom/serialize.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package dom

import (
"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/types"
)

// Serialize produces serialization of the document, canonicalized.
Expand Down
8 changes: 4 additions & 4 deletions html.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"bytes"
"io"

"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/dom"
"github.com/lestrrat/go-libxml2/parser"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/dom"
"github.com/lestrrat-go/libxml2/parser"
"github.com/lestrrat-go/libxml2/types"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions html_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package libxml2_test
import (
"testing"

"github.com/lestrrat/go-libxml2"
"github.com/lestrrat/go-libxml2/xpath"
"github.com/lestrrat-go/libxml2"
"github.com/lestrrat-go/libxml2/xpath"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/genwrapnode/genwrapnode.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func _main() error {
buf.WriteString("\n\n// Auto-generated by internal/cmd/genwrapnode/genwrapnode.go. DO NOT EDIT!")
buf.WriteString("\n\nimport (")
buf.WriteString("\n\"fmt\"\n")
for _, lib := range []string{"github.com/lestrrat/go-libxml2/clib", "github.com/lestrrat/go-libxml2/types"} {
for _, lib := range []string{"github.com/lestrrat-go/libxml2/clib", "github.com/lestrrat-go/libxml2/types"} {
fmt.Fprintf(&buf, "\n%s", strconv.Quote(lib))
}
buf.WriteString("\n)")
Expand Down
10 changes: 5 additions & 5 deletions libxml2_bench_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"path/filepath"
"testing"

"github.com/lestrrat/go-libxml2"
"github.com/lestrrat/go-libxml2/dom"
"github.com/lestrrat/go-libxml2/xpath"
"github.com/lestrrat-go/libxml2"
"github.com/lestrrat-go/libxml2/dom"
"github.com/lestrrat-go/libxml2/xpath"
"github.com/stretchr/testify/assert"
"gopkg.in/xmlpath.v1"
)
Expand Down Expand Up @@ -108,7 +108,7 @@ func BenchmarkLibxml2Xmlpath(b *testing.B) {
}

type Foo struct {
XMLName xml.Name `xml:"https://github.com/lestrrat/go-libxml2/foo foo:foo"`
XMLName xml.Name `xml:"https://github.com/lestrrat-go/libxml2/foo foo:foo"`
Field1 string
Field2 string `xml:",attr"`
}
Expand All @@ -128,7 +128,7 @@ func BenchmarkEncodingXMLDOM(b *testing.B) {

func BenchmarkLibxml2DOM(b *testing.B) {
var buf bytes.Buffer
const nsuri = `https://github.com/lestrrat/go-libxml2/foo`
const nsuri = `https://github.com/lestrrat-go/libxml2/foo`
f := Foo{
Field1: "Hello, World!",
Field2: "Hello, Attribute!",
Expand Down
8 changes: 4 additions & 4 deletions libxml2_example_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"log"
"net/http"

"github.com/lestrrat/go-libxml2"
"github.com/lestrrat/go-libxml2/parser"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat/go-libxml2/xpath"
"github.com/lestrrat-go/libxml2"
"github.com/lestrrat-go/libxml2/parser"
"github.com/lestrrat-go/libxml2/types"
"github.com/lestrrat-go/libxml2/xpath"
)

func ExampleXML() {
Expand Down
4 changes: 2 additions & 2 deletions parser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package libxml2
import (
"io"

"github.com/lestrrat/go-libxml2/parser"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/parser"
"github.com/lestrrat-go/libxml2/types"
)

// Parse parses the given buffer and returns a Document.
Expand Down
6 changes: 3 additions & 3 deletions parser/parser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"bytes"
"io"

"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/dom"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/dom"
"github.com/lestrrat-go/libxml2/types"
"github.com/pkg/errors"
)

Expand Down
8 changes: 4 additions & 4 deletions parser_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"regexp"
"testing"

"github.com/lestrrat/go-libxml2/dom"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/dom"
"github.com/lestrrat-go/libxml2/types"

"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/parser"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/parser"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion types/interface.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package types

import "github.com/lestrrat/go-libxml2/clib"
import "github.com/lestrrat-go/libxml2/clib"

// PtrSource defines the interface for things that is backed by
// a C backend
Expand Down
8 changes: 4 additions & 4 deletions xml_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"os"
"testing"

"github.com/lestrrat/go-libxml2/dom"
"github.com/lestrrat/go-libxml2/parser"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat/go-libxml2/xpath"
"github.com/lestrrat-go/libxml2/dom"
"github.com/lestrrat-go/libxml2/parser"
"github.com/lestrrat-go/libxml2/types"
"github.com/lestrrat-go/libxml2/xpath"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions xpath/interface.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package xpath

import (
"github.com/lestrrat/go-libxml2/clib"
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/clib"
"github.com/lestrrat-go/libxml2/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion xpath/iterator.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package xpath

import (
"github.com/lestrrat/go-libxml2/types"
"github.com/lestrrat-go/libxml2/types"
)

// NodeIterator is a way to get at a list of nodes returned
Expand Down
2 changes: 1 addition & 1 deletion xpath/util.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package xpath

import "github.com/lestrrat/go-libxml2/types"
import "github.com/lestrrat-go/libxml2/types"

// String returns the string component of the result, and as a side effect
// releases the Result by calling Free() on it. Use this if you do not
Expand Down
Loading

0 comments on commit 1c95ea0

Please sign in to comment.